strata-cli 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b0fdc6cf6a28080152c9b0237d54e206740477d196178a2e6d5aa5642720135
-  data.tar.gz: d049c71dd05982f8a52b786ae59ffdf590056dc3bdb5cadd7045227dbe9de867
+  metadata.gz: 6965d8ee9c44a37f7de1a11c0d2654d05c44aa352f38442456e77814deb411e1
+  data.tar.gz: af24ef90657a2c2d32d6493d00b1b40eab52a290c3f3c2c35fb69bf73cc7c448
 SHA512:
-  metadata.gz: f7c7aa4945d149bff16578ca52f99a005b3c9d4c3b5897b52929bf9bfffb140883457f60d52552fa551faee5ef6d0472069c368125653bf784078378a7065dbe
-  data.tar.gz: 48a81467d16e8b489bdce4f177dd1b158ac09344c07d1944d804a679afc0ed47e52047b6a478781ba245c291a4d9bb8512f8159b1d09ecf41e1f537b5873e52b
+  metadata.gz: b9d03dcd92e8364ef2c5e3558c1f1e049227c394b36f75148f4f08e4d4b62ca9ddd3c11bd9e636c5c7324bba43e9d40f8ba554b7d4436fcb1ad4a07af3c001ee
+  data.tar.gz: 455a627b5dfebd40b48f45ec70ea362438ed0c526db7c69941685987aea3a3fed10cf2c4a3b4fcaba33620e11dbda90540ce1c54de814bc74c10fac2cef36d98

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [Unreleased]
 
+## [0.1.15] - 2026-07-27
+
+### Added
+
+- **Sample project command**: `strata project sample` now uses a browser-based auth flow — opens the Strata sign-in page, waits for authentication, and writes the API key to `.strata` automatically. No flags required.
+- **CLI auth endpoints**: New server endpoints (`/cli/auth` and `/api/v1/cli/auth/:state`) support the browser-based API key retrieval flow.
+
+### Changed
+
+- **Repo rename**: Sample project now clones `tpc-ds-retail-sample` (previously `strata-tutorial-project`).
+- **Sample project setup**: Server URL is prompted interactively with `http://localhost:8080` as default. `--api-key` and `--server` flags retained as optional overrides for scripting.
+- **Audit — tutorial project**: Connection check now silently passes for the `tpc-ds-retail-sample` project (datasource lives in the Strata Docker container, not locally). All other audit checks run normally.
+- **Project template**: `project.yml` no longer assumes `http://localhost:8080` as the default server — prompted at first deploy instead.
+
+### Fixed
+
+- **Deploy — manual commit hash**: Deployments previously triggered via the web UI stored a `manual-<timestamp>` commit reference. The CLI now treats these as non-git baselines and falls back to a full deploy instead of erroring.
+
 ## [0.1.14] - 2026-07-17
 
 ### Added

data/README.md

@@ -308,18 +308,27 @@ project_id: 123  # Auto-populated after first deployment
 
 **Multi-Environment Configuration:**
 
+`project.yml` — server URL per environment (safe to commit):
 ```yaml
-# Default environment
-server: http://localhost:3000
+# Default environment (set on first deploy if omitted)
+server: https://dev.strata.example.com
 
-# Environment-specific configs
 staging:
   server: https://staging.strata.com
-  api_key: staging-key
 
 production:
   server: https://app.strata.com
-  api_key: prod-key
+```
+
+`.strata` — API keys per environment (**never committed**):
+```yaml
+api_key: your-default-api-key
+
+staging:
+  api_key: your-staging-api-key
+
+production:
+  api_key: your-production-api-key
 ```
 
 ### Local Configuration (`.strata`)
@@ -436,7 +445,7 @@ Ensure you have write permissions in the project directory. The `.strata` file p
 
 ### "Server URL not configured"
 
-Add the `server` field to your `project.yml`:
+Run `strata deploy` — you will be prompted to enter the server URL, which is then saved to `project.yml` automatically for future deploys. Or add it manually:
 
 ```yaml
 server: https://your-strata-server.com

data/lib/strata/cli/generators/project.rb

@@ -17,8 +17,6 @@ module Strata
         include API::ConnectionErrorHandler
         include API::ResponseErrorHandler
 
-        BASE_SERVER_URL = "http://localhost:3000"
-
         argument :name, type: :string, required: false, desc: "The name of the project. Optional when using --source."
         class_option :datasource, type: :string, repeatable: true
         class_option :source, type: :string
@@ -205,12 +203,6 @@ module Strata
           @name
         end
 
-        def server_url
-          return options[:source] if options.key?(:source)
-
-          BASE_SERVER_URL
-        end
-
         def description
           return @project_info["description"] if options.key?(:source) && @project_info
 

data/lib/strata/cli/generators/templates/project.yml

@@ -10,14 +10,14 @@ uid: <%= uid %>
 description: Your projects description
 
 # Target Strata server (default environment, typically dev)
-server: <%= options[:source] || "http://localhost:3000" %>
+server: <%= options[:source] %>
 
 # Alternatively, you can configure multiple environments (different Strata server instances).
 # Each environment represents a separate Strata cluster (dev, staging, production).
 # Use -e [ENVIRONMENT] flag when deploying to select the environment.
 # Example:
 # dev:
-#   server: http://localhost:3000
+#   server: http://localhost:8080
 # prod:
 #   server: https://app.strata.com
 

data/lib/strata/cli/guard.rb

@@ -14,6 +14,8 @@ module Strata
         version
         deploy
         branch
+        project
+        sample
       ].freeze
 
       def invoke_command(command, *args)

data/lib/strata/cli/main.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "generators/project"
-require_relative "generators/tutorial"
 require_relative "sub_commands/datasource"
 require_relative "sub_commands/deploy"
 require_relative "sub_commands/branch"
@@ -48,13 +47,6 @@ module Strata
         invoke Generators::Project, [project_name], options
       end
 
-      desc "tutorial", "Set up the Strata TPC-DS tutorial project"
-      long_desc_from_file "tutorial"
-      option :api_key, aliases: ["a"], type: :string, desc: "Strata API key"
-      def tutorial
-        invoke Generators::Tutorial, [], options
-      end
-
       desc "adapters", "Lists supported data warehouse adapters"
       def adapters
         out = " SUPPORTED ADAPTERS: \n\t#{DWH.adapters.keys.join("\n\t")}"

data/lib/strata/cli/sub_commands/audit.rb

@@ -329,6 +329,8 @@ module Strata
         end
 
         def audit_connections
+          return [] if CLI.config.get("git").to_s.include?("tpc-ds-retail-sample")
+
           failures = []
 
           unless File.exist?("datasources.yml")

data/lib/strata/cli/sub_commands/deploy.rb

@@ -439,6 +439,10 @@ module Strata
             return nil unless last_deployment && last_deployment["commit"]
 
             commit_hash = last_deployment["commit"]
+            unless Utils::Git.validate_commit_hash(commit_hash)
+              print_info("No previous git-based deployment found. Including all files.\n")
+              return nil
+            end
             print_info("Found last successful deployment at commit: #{commit_hash[0..7]}...\n")
             commit_hash
           rescue Strata::CommandError

data/lib/strata/cli/sub_commands/project.rb

@@ -7,6 +7,12 @@ require_relative "../helpers/project_helper"
 require_relative "../agent_mode"
 require_relative "../api/client"
 require "yaml"
+require "fileutils"
+require "tty-prompt"
+require "net/http"
+require "json"
+require "securerandom"
+require "rbconfig"
 
 module Strata
   module CLI
@@ -17,6 +23,87 @@ module Strata
         include Output
         include AgentMode
 
+        SAMPLE_REPO = "https://github.com/stratasite/tpc-ds-retail-sample"
+        SAMPLE_DIR = "tpc-ds-retail-sample"
+        SAMPLE_PROJECT_UID = "tpc-ds-retail-sample"
+        DEFAULT_SERVER = "http://localhost:8080"
+        AUTH_TIMEOUT_SECONDS = 300
+
+        desc "sample", "Clone the Strata sample project and set it up interactively"
+        option :api_key, aliases: ["a"], type: :string, desc: "Strata API key (optional — skip browser auth)"
+        option :server, aliases: ["s"], type: :string, desc: "Strata server URL (optional — prompted if omitted)"
+        def sample
+          if options[:api_key] && options[:server]
+            server = options[:server].delete_suffix("/")
+            api_key = options[:api_key]
+          else
+            prompt = TTY::Prompt.new
+            server = (options[:server] || prompt.ask("Strata server URL:", default: DEFAULT_SERVER) { |q| q.modify :strip }).delete_suffix("/")
+            api_key = fetch_api_key_via_browser(server)
+          end
+
+          if File.directory?(SAMPLE_DIR)
+            print_info("Directory '#{SAMPLE_DIR}' already exists — re-using it")
+          else
+            print_info("Cloning sample project from #{SAMPLE_REPO}...")
+            system("git clone #{SAMPLE_REPO} #{SAMPLE_DIR}", exception: true)
+          end
+
+          Dir.chdir(SAMPLE_DIR) do
+            FileUtils.rm_rf(".git")
+            system("git init -b main", exception: true)
+            File.write(".gitignore", ".strata\n.strata_cli/\n")
+
+            strata_path = ".strata"
+            File.write(strata_path, "api_key: #{api_key}\nserver: #{server}\n")
+            File.chmod(0o600, strata_path)
+
+            Helpers::ProjectHelper.persist_project_id_to_yml(SAMPLE_PROJECT_UID)
+
+            system("git add -A", exception: true)
+            system('git commit -m "Initial sample project setup"', exception: true)
+          end
+
+          print_success("✔ Sample project '#{SAMPLE_DIR}' is ready!")
+          print_info("  Next: cd #{SAMPLE_DIR} && strata deploy")
+        end
+
+        no_commands do
+          def fetch_api_key_via_browser(server)
+            state = SecureRandom.hex(16)
+            auth_url = "#{server}/cli/auth?state=#{state}"
+            poll_url = "#{server}/api/v1/cli/auth/#{state}"
+
+            say "\nOpening your browser to sign in to Strata...", :cyan
+            open_browser(auth_url)
+            say "Waiting for authentication (you may close the browser tab once done)", :white
+
+            deadline = Time.now + AUTH_TIMEOUT_SECONDS
+            loop do
+              raise Strata::CommandError, "Authentication timed out. Run `strata project sample` to try again." if Time.now > deadline
+
+              begin
+                response = Net::HTTP.get_response(URI(poll_url))
+                return JSON.parse(response.body)["api_key"] if response.code == "200"
+              rescue Errno::ECONNREFUSED
+                raise Strata::CommandError, "Cannot reach server at #{server}. Is it running?"
+              end
+
+              print "."
+              $stdout.flush
+              sleep 1
+            end
+          end
+
+          def open_browser(url)
+            case RbConfig::CONFIG["host_os"]
+            when /darwin/ then system("open", url)
+            when /linux/ then system("xdg-open", url)
+            when /mswin|mingw/ then system("start", "", url)
+            end
+          end
+        end
+
         desc "link PROJECT_ID", "Link local project to an existing project on the server"
         def link(project_id)
           raise Strata::CommandError, "Project ID is required." unless project_id && !project_id.to_s.strip.empty?

data/lib/strata/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Strata
   module CLI
-    VERSION = "0.1.14"
+    VERSION = "0.1.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strata-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Ajo Abraham
@@ -264,7 +264,6 @@ files:
 - lib/strata/cli/descriptions/deploy/deploy.txt
 - lib/strata/cli/descriptions/deploy/status.txt
 - lib/strata/cli/descriptions/init.txt
-- lib/strata/cli/descriptions/tutorial.txt
 - lib/strata/cli/error_reporter.rb
 - lib/strata/cli/generators/datasource.rb
 - lib/strata/cli/generators/group.rb
@@ -293,7 +292,6 @@ files:
 - lib/strata/cli/generators/templates/table.table_name.yml
 - lib/strata/cli/generators/templates/test.yml
 - lib/strata/cli/generators/test.rb
-- lib/strata/cli/generators/tutorial.rb
 - lib/strata/cli/guard.rb
 - lib/strata/cli/helpers/command_context.rb
 - lib/strata/cli/helpers/datasource_helper.rb

data/lib/strata/cli/descriptions/tutorial.txt

@@ -1,13 +0,0 @@
-Sets up the Strata tutorial project locally by cloning the tutorial repo,
-wiring it to your Strata instance, and preparing it for `strata deploy`.
-
-The --api-key value is shown on the tutorial setup page
-in your Strata instance. Copy-paste them directly from there.
-
-After running this command, `cd` into the project directory and run
-`strata deploy` to deploy the tutorial to your Strata instance.
-
-Example:
-  strata tutorial -a your_api_key
-  cd tutorial
-  strata deploy

data/lib/strata/cli/generators/tutorial.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "group"
-require_relative "../helpers/project_helper"
-require_relative "../output"
-require "yaml"
-require "fileutils"
-
-module Strata
-  module CLI
-    module Generators
-      class Tutorial < Group
-        TUTORIAL_REPO = "https://github.com/stratasite/strata-tutorial-project"
-        DEFAULT_SERVER = "http://localhost:8080"
-        TUTORIAL_PROJECT = "strata-tutorial-project"
-
-        class_option :api_key, aliases: ["a"], type: :string, desc: "Strata API key"
-
-        desc "Sets up the Strata tutorial project locally."
-
-        def validate_options
-          raise Strata::CommandError, "--api-key (-a) is required." unless options[:api_key]
-          @uid = TUTORIAL_PROJECT
-          @project_id = 1
-        end
-
-        def clone_tutorial_repo
-          if File.directory?(@uid)
-            Output.print_status(:skip, "Directory '#{@uid}' already exists — re-using it", type: :info, context: self)
-            return
-          end
-          Output.print_status(:clone, "Cloning tutorial from #{TUTORIAL_REPO}", type: :success, context: self)
-          run "git clone #{TUTORIAL_REPO} #{@uid}", verbose: false, capture: true
-          raise Strata::CommandError, "Failed to clone tutorial repo." unless File.directory?(@uid)
-        end
-
-        def reinitialize_git
-          inside @uid do
-            FileUtils.rm_rf(".git")
-            run "git init -b main", verbose: false, capture: true
-            create_file ".gitignore", ".strata\n.strata_cli/\n", force: true
-          end
-        end
-
-        def write_strata_config
-          strata_path = File.join(@uid, ".strata")
-          File.write(strata_path, "api_key: #{options[:api_key]}\nserver: #{DEFAULT_SERVER}\n")
-          File.chmod(0o600, strata_path)
-        end
-
-        def update_project_yml
-          project_yml = File.join(@uid, "project.yml")
-          return unless File.exist?(project_yml)
-
-          Helpers::ProjectHelper.persist_project_id_to_yml(@project_id, project_yml_path: project_yml)
-        end
-
-        def initial_commit
-          inside @uid do
-            run "git add -A", verbose: false, capture: true
-            run 'git commit -m "Initial tutorial project setup"', verbose: false, capture: true
-          end
-        end
-
-        def completion_message
-          Output.print_success("\n✔ Tutorial project '#{@uid}' is ready!\n", context: self)
-          Output.print_info("  Next: cd #{@uid} && strata deploy --skip-audit\n", context: self)
-        end
-      end
-    end
-  end
-end