added contributors

Author: jeffreyaven

README.md

@@ -37,3 +37,16 @@ cargo run -- build --env prod --provider aws --region us-east-1
 ./target/release/stackql-deploy shell
 
 ./target/release/stackql-deploy upgrade
+
+# Using built-in provider template
+./target/release/stackql-deploy init my-project --provider aws
+
+# Using relative path to template in GitHub
+./target/release/stackql-deploy init my-project --template google/starter
+
+# Using full GitHub URL
+./target/release/stackql-deploy init my-project --template https://github.com/stackql/stackql-deploy-rust/tree/main/template-hub/azure/starter
+
+./target/release/stackql-deploy init my-project --template https://raw.githubusercontent.com/stackql/stackql-deploy-rust/main/template-hub/azure/starter
+
+./target/release/stackql-deploy init my-project --template https://raw.githubusercontent.com/stackql/stackql-deploy-rust/main/template-hub/azure/fred

ci-scripts/build.sh

@@ -6,9 +6,12 @@ echo "==============================================="
 echo "  Building stackql-deploy"
 echo "==============================================="
 
-# Build in release mode
-echo "Building in release mode..."
-cargo build --release
+# Read contributors into a comma-separated string
+CONTRIBS=$(paste -sd, contributors.csv | sed 's/,$//')
+
+# Build in release mode with env var for contributors
+echo "Building in release mode with contributors..."
+CONTRIBUTORS="$CONTRIBS" cargo rustc --release -- -C link-arg=-s
 
 # Check if build was successful
 if [ $? -eq 0 ]; then
@@ -19,22 +22,19 @@ else
     exit 1
 fi
 
-# Create binaries for different platforms if cross-compilation tools are available
+# Optional: Cross compile
 if command -v cross &> /dev/null; then
     echo -e "\nCross-compiling for multiple platforms..."
-    
-    # Build for Windows
+
     echo "Building for Windows..."
     cross build --release --target x86_64-pc-windows-gnu
-    
-    # Build for macOS
+
     echo "Building for macOS..."
     cross build --release --target x86_64-apple-darwin
-    
-    # Build for Linux
+
     echo "Building for Linux..."
     cross build --release --target x86_64-unknown-linux-gnu
-    
+
     echo -e "\n✅ Cross-compilation completed!"
     echo "Binaries located in ./target/{target}/release/"
-fi
+fi

contributors.csv

@@ -0,0 +1,3 @@
+derek10cloud
+general-kroll-4-life
+jeffreyaven

get-contributors.sh

@@ -0,0 +1 @@
+./stackql exec --output csv -f contributors.csv -H "SELECT a.login FROM github.activity.repo_stargazers AS a JOIN github.repos.contributors AS c ON a.login = c.login WHERE a.owner = 'stackql' AND a.repo IN ('stackql','stackql-deploy') AND c.owner = 'stackql' AND c.repo = 'stackql-deploy' GROUP BY a.login HAVING COUNT(DISTINCT a.repo) = 2"

src/commands/info.rs

@@ -71,4 +71,19 @@ pub fn execute() {
             println!("  {} {}", provider.name.bold(), provider.version);
         }
     }
+
+    // Display contributors
+    let raw_contributors = option_env!("CONTRIBUTORS").unwrap_or("");
+    let contributors: Vec<&str> = raw_contributors
+        .split(',')
+        .filter(|s| !s.trim().is_empty())
+        .collect();
+
+    if !contributors.is_empty() {
+        println!("\n{}", "Special thanks to:".green().bold());
+
+        for chunk in contributors.chunks(5) {
+            println!("  {}", chunk.join(", "));
+        }
+    }
 }

src/commands/init.rs

@@ -2,6 +2,7 @@ use crate::utils::display::print_unicode_box;
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use colored::*;
 use reqwest::blocking::Client;
+use reqwest::StatusCode;
 use std::collections::HashSet;
 use std::fs;
 use std::io::Write;
@@ -173,10 +174,25 @@ fn validate_provider(provider: Option<&str>) -> String {
 // Function to fetch template content from URL
 fn fetch_template(url: &str) -> Result<String, String> {
     let client = Client::new();
-    client
+    let response = client
         .get(url)
         .send()
-        .map_err(|e| format!("Failed to fetch template: {}", e))?
+        .map_err(|e| format!("Failed to fetch template: {}", e))?;
+
+    // Check if response is successful (status code 200-299)
+    if !response.status().is_success() {
+        // Handle 404 and other error status codes
+        if response.status() == StatusCode::NOT_FOUND {
+            return Err(format!("Template not found at URL: {}", url));
+        } else {
+            return Err(format!(
+                "Failed to fetch template: HTTP status {}",
+                response.status()
+            ));
+        }
+    }
+
+    response
         .text()
         .map_err(|e| format!("Failed to read template content: {}", e))
 }
@@ -269,11 +285,6 @@ fn create_project_structure(
         return Err(format!("Directory '{}' already exists", stack_name));
     }
 
-    // Create necessary directories
-    let resource_dir = base_path.join("resources");
-    fs::create_dir_all(&resource_dir)
-        .map_err(|e| format!("Failed to create directories: {}", e))?;
-
     // Determine sample resource name based on provider
     let sample_res_name = template_source.get_sample_res_name();
 
@@ -282,25 +293,32 @@ fn create_project_structure(
     context.insert("stack_name", stack_name);
     context.insert("stack_env", env);
 
+    // First validate that all templates can be fetched before creating any directories
+    let manifest_template = get_template_content(template_source, "manifest", "")?;
+    let readme_template = get_template_content(template_source, "readme", "")?;
+    let resource_template = get_template_content(template_source, "resource", sample_res_name)?;
+
+    // Now create directories
+    let resource_dir = base_path.join("resources");
+    fs::create_dir_all(&resource_dir)
+        .map_err(|e| format!("Failed to create directories: {}", e))?;
+
     // Create files
-    create_manifest_file(&base_path, template_source, &context)?;
-    create_readme_file(&base_path, template_source, &context)?;
-    create_resource_file(&resource_dir, sample_res_name, template_source, &context)?;
+    create_manifest_file(&base_path, &manifest_template, &context)?;
+    create_readme_file(&base_path, &readme_template, &context)?;
+    create_resource_file(&resource_dir, sample_res_name, &resource_template, &context)?;
 
     Ok(())
 }
 
 fn create_resource_file(
     resource_dir: &Path,
     sample_res_name: &str,
-    template_source: &TemplateSource,
+    template_str: &str,
     context: &Context,
 ) -> Result<(), String> {
-    // Get template content
-    let template_str = get_template_content(template_source, "resource", sample_res_name)?;
-
     // Render template with Tera
-    let resource_content = render_template(&template_str, context)
+    let resource_content = render_template(template_str, context)
         .map_err(|e| format!("Template rendering error: {}", e))?;
 
     let resource_path = resource_dir.join(format!("{}.iql", sample_res_name));
@@ -315,14 +333,11 @@ fn create_resource_file(
 
 fn create_manifest_file(
     base_path: &Path,
-    template_source: &TemplateSource,
+    template_str: &str,
     context: &Context,
 ) -> Result<(), String> {
-    // Get template content
-    let template_str = get_template_content(template_source, "manifest", "")?;
-
     // Render template with Tera
-    let manifest_content = render_template(&template_str, context)
+    let manifest_content = render_template(template_str, context)
         .map_err(|e| format!("Template rendering error: {}", e))?;
 
     let manifest_path = base_path.join("stackql_manifest.yml");
@@ -337,14 +352,11 @@ fn create_manifest_file(
 
 fn create_readme_file(
     base_path: &Path,
-    template_source: &TemplateSource,
+    template_str: &str,
     context: &Context,
 ) -> Result<(), String> {
-    // Get template content
-    let template_str = get_template_content(template_source, "readme", "")?;
-
     // Render template with Tera
-    let readme_content = render_template(&template_str, context)
+    let readme_content = render_template(template_str, context)
         .map_err(|e| format!("Template rendering error: {}", e))?;
 
     let readme_path = base_path.join("README.md");

src/commands/shell.rs

@@ -1,6 +1,6 @@
 use crate::utils::display::print_unicode_box;
+use crate::utils::query::{execute_query, QueryResult};
 use crate::utils::server::{is_server_running, start_server, ServerOptions};
-use crate::utils::stackql::{execute_query_with_pg, QueryResult};
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use colored::*;
 use postgres::Client;
@@ -42,7 +42,6 @@ pub fn execute(matches: &ArgMatches) {
     let localhost = String::from("localhost");
     let host = matches.get_one::<String>("host").unwrap_or(&localhost);
 
-    // Check if server is running, start if not
     if host == "localhost" && !is_server_running(port) {
         println!("{}", "Server not running. Starting server...".yellow());
         let options = ServerOptions {
@@ -61,7 +60,6 @@ pub fn execute(matches: &ArgMatches) {
         }
     }
 
-    // Connect to the server
     let connection_string = format!(
         "host={} port={} user=postgres dbname=stackql application_name=stackql",
         host, port
@@ -78,11 +76,9 @@ pub fn execute(matches: &ArgMatches) {
     println!("Type 'exit' to quit the shell");
     println!("---");
 
-    // Set up command history with rustyline
     let mut rl = Editor::<()>::new().unwrap();
-    let _ = rl.load_history("stackql_history.txt"); // Silently load history, ignore errors
+    let _ = rl.load_history("stackql_history.txt");
 
-    // REPL loop
     loop {
         let prompt = format!("stackql ({}:{})=> ", host, port);
         let readline = rl.readline(&prompt);
@@ -94,22 +90,24 @@ pub fn execute(matches: &ArgMatches) {
                     continue;
                 }
 
-                // Add to history
                 rl.add_history_entry(input);
 
                 if input.eq_ignore_ascii_case("exit") || input.eq_ignore_ascii_case("quit") {
                     println!("Goodbye");
                     break;
                 }
 
-                // Execute the query
-                match execute_query_with_pg(input, port) {
+                match execute_query(input, port) {
                     Ok(result) => match result {
-                        QueryResult::Data { columns, rows } => {
+                        QueryResult::Data {
+                            columns,
+                            rows,
+                            notices: _,
+                        } => {
                             print_table(columns, rows);
                         }
                         QueryResult::Command(cmd) => {
-                            println!("{}", format!("Command completed: {}", cmd).green());
+                            println!("{}", cmd.green());
                         }
                         QueryResult::Empty => {
                             println!("{}", "Query executed successfully. No results.".green());
@@ -135,19 +133,15 @@ pub fn execute(matches: &ArgMatches) {
         }
     }
 
-    // Save history
-    let _ = rl.save_history("stackql_history.txt"); // Silently save history, ignore errors
+    let _ = rl.save_history("stackql_history.txt");
 }
 
-// Function to print a formatted table
 fn print_table(
-    columns: Vec<crate::utils::stackql::QueryResultColumn>,
-    rows: Vec<crate::utils::stackql::QueryResultRow>,
+    columns: Vec<crate::utils::query::QueryResultColumn>,
+    rows: Vec<crate::utils::query::QueryResultRow>,
 ) {
-    // Calculate column widths
     let mut column_widths: Vec<usize> = columns.iter().map(|col| col.name.len()).collect();
 
-    // Update widths based on data
     for row in &rows {
         for (i, value) in row.values.iter().enumerate() {
             if i < column_widths.len() && value.len() > column_widths[i] {
@@ -156,7 +150,7 @@ fn print_table(
         }
     }
 
-    // Print top border
+    // Print header border
     print!("+");
     for width in &column_widths {
         print!("{}+", "-".repeat(width + 2));
@@ -174,14 +168,14 @@ fn print_table(
     }
     println!();
 
-    // Print header separator
+    // Print border after header
     print!("+");
     for width in &column_widths {
         print!("{}+", "-".repeat(width + 2));
     }
     println!();
 
-    // Print row data
+    // Print each row with a border after it
     let row_count = rows.len();
     for row in rows {
         print!("|");
@@ -191,16 +185,15 @@ fn print_table(
             }
         }
         println!();
-    }
 
-    // Print bottom border
-    print!("+");
-    for width in &column_widths {
-        print!("{}+", "-".repeat(width + 2));
+        // Print border after each row
+        print!("+");
+        for width in &column_widths {
+            print!("{}+", "-".repeat(width + 2));
+        }
+        println!();
     }
-    println!();
 
-    // Print row count
     if row_count > 0 {
         println!("{} rows returned", row_count);
     }

src/utils/binary.rs

@@ -2,17 +2,6 @@ use std::env;
 use std::path::PathBuf;
 use std::process::Command;
 
-// /// Check if the stackql binary exists in the current directory
-// pub fn binary_exists_in_current_dir() -> bool {
-//     if let Ok(current_dir) = env::current_dir() {
-//         let binary_name = super::platform::get_binary_name();
-//         let binary_path = current_dir.join(&binary_name);
-//         binary_path.exists() && binary_path.is_file()
-//     } else {
-//         false
-//     }
-// }
-
 /// Check if the stackql binary exists in PATH
 pub fn binary_exists_in_path() -> bool {
     let binary_name = super::platform::get_binary_name();

src/utils/mod.rs

@@ -2,5 +2,6 @@ pub mod binary;
 pub mod display;
 pub mod download;
 pub mod platform;
+pub mod query;
 pub mod server;
 pub mod stackql;