strata-cli 0.1.15 → 0.1.16

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

@@ -5,6 +5,7 @@ require_relative "../terminal"
 require_relative "../output"
 require_relative "../helpers/project_helper"
 require_relative "../helpers/description_helper"
+require_relative "../helpers/browser_auth"
 require_relative "../agent_mode"
 require_relative "../api/client"
 require_relative "../credentials"
@@ -25,6 +26,7 @@ module Strata
         include Terminal
         include Output
         include AgentMode
+        include Helpers::BrowserAuth
         extend Helpers::DescriptionHelper
 
         default_command :deploy
@@ -37,6 +39,9 @@ module Strata
         desc "deploy", "Deploy project to Strata server for the current branch"
         long_desc_from_file "deploy/deploy"
         def deploy
+          # Before anything that prompts, signs in, or hits the server.
+          ensure_working_tree_clean
+
           config = load_deployment_configuration
           validate_deployment_configuration(config)
           run_pre_deploy_checks unless options[:skip_audit]
@@ -128,8 +133,9 @@ module Strata
         end
 
         def validate_deployment_configuration(config)
-          ensure_api_key(config)
+          # Server first: browser sign-in needs its URL to build the auth link
           ensure_server(config)
+          ensure_api_key(config)
           ensure_git_url_populated
           ensure_project_id(config)
         end
@@ -139,7 +145,7 @@ module Strata
             return
           end
 
-          config["api_key"] = collect_api_key_interactively
+          config["api_key"] = collect_api_key_interactively(config["server"])
         end
 
         def ensure_server(config)
@@ -149,8 +155,6 @@ module Strata
         end
 
         def collect_server_interactively
-          prompt = TTY::Prompt.new
-
           say "\nServer URL not found (not in project.yml)", :yellow
           say "You can add it to project.yml or enter it now here\n", :cyan
 
@@ -199,16 +203,24 @@ module Strata
           persist_project_id(project_id)
         end
 
-        def collect_api_key_interactively
-          prompt = TTY::Prompt.new
-
+        def collect_api_key_interactively(server)
           say "\nAPI key not found in .strata file", :yellow
-          say "\nTo deploy to Strata, you need an API key.\nYou can get your API key from:", :white
-          say "  • Your Strata server dashboard (Settings → API Keys)\n  • Your Strata administrator\n", :cyan
 
-          api_key = prompt.mask("Enter your Strata API key:") do |q|
-            q.required true
-            q.validate(/\S+/, "API key cannot be empty")
+          choice = prompt.select("How would you like to authenticate?") do |menu|
+            menu.choice "Sign in via browser (recommended)", :browser
+            menu.choice "Paste an API key", :manual
+          end
+
+          api_key = if choice == :browser
+            fetch_api_key_via_browser(server)
+          else
+            say "\nYou can get your API key from:", :white
+            say "  • Your Strata server dashboard (Settings → API Keys)\n  • Your Strata administrator\n", :cyan
+
+            prompt.mask("Enter your Strata API key:") do |q|
+              q.required true
+              q.validate(/\S+/, "API key cannot be empty")
+            end
           end
 
           # Save API key to .strata file
@@ -272,15 +284,15 @@ module Strata
           raise Strata::CommandError, "Audit checks failed. Fix errors before deploying." if e.status != 0
         end
 
-        def run_git_status_checks(branch_name)
+        def ensure_working_tree_clean
           return unless Utils::Git.git_repo?
+          return unless Utils::Git.uncommitted_changes?
 
-          with_spinner("Checking git repository status") do
-            # Check for uncommitted changes
-            if Utils::Git.uncommitted_changes?
-              raise Strata::CommandError, "You have uncommitted changes. Please commit or stash them before deploying."
-            end
-          end
+          raise Strata::CommandError, "You have uncommitted changes. Please commit or stash them before deploying."
+        end
+
+        def run_git_status_checks(branch_name)
+          return unless Utils::Git.git_repo?
 
           # Fetch from remote
           with_spinner("Fetching latest changes from remote") do
@@ -309,10 +321,16 @@ module Strata
           commit_info = Utils::Git.commit_info
           committer_info = Utils::Git.committer_info
 
-          # Get file modifications since last deployment or since HEAD~1
+          # Get file modifications since the last deployment. Without a valid baseline
+          # commit we can't compute an incremental diff, so send the full file list
+          # rather than silently narrowing to the last commit.
           file_modifications = if last_deployment_commit
             Utils::Git.changed_files_since(last_deployment_commit)
           else
+            print_warning(
+              "No valid previous deployment commit to diff against — sending all files. " \
+              "Renames can't be auto-detected this deploy; verify renamed tables afterward or use a rename migration."
+            )
             Utils::Git.file_modifications
           end
 
@@ -411,7 +429,6 @@ module Strata
           production_branch = get_production_branch(config)
           return unless branch_id == production_branch
 
-          prompt = TTY::Prompt.new
           message = "Deploying to production branch '#{branch_id}'. Continue? [y/N]"
           return if prompt.yes?(message, default: false)
 
@@ -440,7 +457,10 @@ module Strata
 
             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")
+              print_warning(
+                "Last deployment commit #{commit_hash.inspect} is not a valid git SHA " \
+                "(likely a non-git deploy). Can't compute an incremental diff; falling back to a full-file deploy.\n"
+              )
               return nil
             end
             print_info("Found last successful deployment at commit: #{commit_hash[0..7]}...\n")

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

@@ -4,15 +4,12 @@ require_relative "../guard"
 require_relative "../terminal"
 require_relative "../output"
 require_relative "../helpers/project_helper"
+require_relative "../helpers/browser_auth"
 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
@@ -22,12 +19,12 @@ module Strata
         include Terminal
         include Output
         include AgentMode
+        include Helpers::BrowserAuth
 
         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)"
@@ -37,7 +34,6 @@ module Strata
             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
@@ -68,42 +64,6 @@ module Strata
           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/utils/git.rb

@@ -88,12 +88,17 @@ module Strata
           }
         end
 
+        # The file-modifications payload to send when there is no valid baseline
+        # commit to diff against: the full list of tracked YAML model files, so no
+        # added/modified file is silently dropped. NOTE: renames cannot be detected
+        # without a baseline — in this mode a rename appears as add + delete.
         def file_modifications
-          diff_output = run_git_command("diff", "--name-status", "HEAD~1")
-          return [] unless diff_output
+          return [] unless git_repo?
 
-          modifications = parse_diff_output(diff_output)
-          filter_yml_files(modifications)
+          output = run_git_command("ls-files", "*.yml", "*.yaml")
+          return [] unless output
+
+          output.lines.map(&:strip).reject(&:empty?).map { |path| ["M", path] }
         end
 
         def changed_files_since(commit_hash)
@@ -108,8 +113,9 @@ module Strata
           _, _, status = Open3.capture3("git", "rev-parse", "--verify", "#{commit_hash}^{commit}")
           return [] unless status.success?
 
-          # Get all changed files since that commit (including added, modified, deleted, renamed)
-          diff_output = run_git_command("diff", "--name-status", commit_hash, "HEAD")
+          # Get all changed files since that commit (including added, modified, deleted, renamed).
+          # --find-renames makes rename (R) detection explicit rather than relying on git config.
+          diff_output = run_git_command("diff", "--name-status", "--find-renames", commit_hash, "HEAD")
           return [] unless diff_output
 
           modifications = parse_diff_output(diff_output)
@@ -130,7 +136,7 @@ module Strata
 
           # Get file paths that changed (for added and modified files only, exclude deleted)
           # --diff-filter=ACMR: Added, Copied, Modified, Renamed (excludes Deleted)
-          diff_output = run_git_command("diff", "--name-status", "--diff-filter=ACMR", commit_hash, "HEAD")
+          diff_output = run_git_command("diff", "--name-status", "--find-renames", "--diff-filter=ACMR", commit_hash, "HEAD")
           return [] unless diff_output
 
           paths = []
@@ -228,9 +234,9 @@ module Strata
         end
 
         def parse_diff_output(output)
-          output.lines.map do |line|
+          output.lines.filter_map do |line|
             parse_diff_status(line.strip)
-          end.compact
+          end
         end
 
         def parse_diff_status(line)
@@ -314,6 +320,22 @@ module Strata
           end
         end
 
+        # Commits everything in a freshly initialized repo. Skips a repo that already
+        # has history, so running this inside an existing project never touches it.
+        # Returns :committed, :skipped or :failed (usually an unset user.name/email).
+        def initial_commit(message)
+          return :skipped unless git_repo?
+
+          _, _, head = Open3.capture3("git", "rev-parse", "--verify", "HEAD")
+          return :skipped if head.success?
+
+          _, _, add = Open3.capture3("git", "add", "-A")
+          return :failed unless add.success?
+
+          _, _, commit = Open3.capture3("git", "commit", "-m", message)
+          commit.success? ? :committed : :failed
+        end
+
         def commit_file(file_path, commit_message, project_path = Dir.pwd)
           return false unless git_repo?
 

data/lib/strata/cli/utils/sql_expression_parser.rb

@@ -0,0 +1,153 @@
+# Vendored from strata (server) lib/sql/expression_parser.rb, restyled to standard — keep the logic in sync.
+module Strata
+  module CLI
+    module Sql
+      class ExpressionParser
+        attr_reader :expression, :columns, :field_refs, :measure_refs, :dimension_refs, :functions
+
+        def initialize(expression, reserved: DWH.reserved_keywords, aggregates: DWH.aggregate_functions)
+          @expression = expression.downcase
+          @reserved = reserved
+          @aggregates = aggregates
+          @columns = []
+          @field_refs = []
+          @measure_refs = []
+          @dimension_refs = []
+          @functions = []
+          @wild = false
+          parse
+        end
+
+        def wild?
+          @wild
+        end
+
+        # Does this expression apply an aggregate function (sum, max, count, ...)?
+        # Used to decide whether a calculation behaves as a measure.
+        def has_aggregate_functions?
+          @functions.any? { |f| @aggregates.include?(f) }
+        end
+
+        # Does the expression carry a window (`... over (...)`)? Windows are valid wherever the
+        # expression evaluates over final rows — including a non-grouped query — but can never
+        # sit inside a GROUP BY.
+        def has_window_functions?
+          !!@windowed
+        end
+
+        # The @d dimension references that sit outside every aggregate call. In an
+        # aggregating expression these are what SQL demands be grouped: a dimension
+        # inside sum(case when [Region]@d = 'x' …) is fine, one in
+        # case when [Region]@d is null then null else sum(…) end is not unless
+        # the query groups by Region.
+        def unaggregated_dimension_refs
+          @unaggregated_dimension_refs ||= begin
+            refs = []
+            stack = [] # one entry per open paren: is it an aggregate call?
+            # Bracketed references are consumed atomically FIRST, so a parenthesis inside a
+            # reference name ([Month(Date)]) cannot unbalance the stack.
+            remove_string_literals(@expression).scan(/\[([^\]]+)\]@d|\[[^\]]+\](?:@m)?|([a-z_][a-z0-9_]*)?\(|\)/) do
+              token = Regexp.last_match(0)
+              if Regexp.last_match(1)
+                ref = Regexp.last_match(1).strip
+                refs << ref unless stack.any? || refs.include?(ref)
+              elsif token.start_with?("[")
+                next # an @m or alias reference: opaque
+              elsif token == ")"
+                stack.pop
+              else
+                stack << @aggregates.include?(Regexp.last_match(2).to_s)
+              end
+            end
+            refs
+          end
+        end
+
+        class << self
+          # Can this (resolved) SQL expression legally appear in a GROUP BY? Aggregates and
+          # windows evaluate over the grouped rows, so an expression carrying either cannot —
+          # the binder rejects it ("GROUP BY clause cannot contain aggregates").
+          def ungroupable?(sql)
+            parsed = parse(sql)
+            parsed.has_aggregate_functions? || parsed.has_window_functions?
+          end
+
+          def entity_gsub(sql, entity_name, replacement)
+            sql.gsub(/\[\s*#{Regexp.quote(entity_name)}\s*\](@[mdMD])?/i, replacement)
+          end
+
+          # Qualify a column reference within sql with table_alias and adapter quoting.
+          # Handles both double-quoted identifiers ("limit") and bare identifiers (amount).
+          # The quoted form is replaced first; negative lookarounds on the bare-word pass
+          # prevent re-matching col that now appears inside the qualified replacement.
+          def column_gsub(sql, col, adapter, table_alias)
+            qualified = "#{table_alias}.#{adapter.quote(col)}"
+            sql = sql.gsub("\"#{col}\"", qualified)
+            sql.gsub(/(?<!")\b#{Regexp.quote(col)}\b(?!")/i, qualified)
+          end
+
+          def parse(expression, reserved: DWH.reserved_keywords, aggregates: DWH.aggregate_functions)
+            new(expression, reserved: reserved, aggregates: aggregates)
+          end
+        end
+
+        private
+
+        def parse
+          # Sanitize the expression first
+          sanitized = remove_string_literals(@expression)
+
+          matched_refs = []
+          # Extract field references in bracketed notation — BEFORE scanning functions, so a
+          # parenthesis inside a reference name ([Month(Date)]) cannot masquerade as a call.
+          sanitized.scan(/\[([^\]]+)\](@[md])?/).each do |ref, type|
+            matched_refs << "[#{ref}]#{type}"
+            case type
+            when "@m"
+              @measure_refs << ref.strip unless @measure_refs.include?(ref)
+            when "@d"
+              @dimension_refs << ref.strip unless @dimension_refs.include?(ref)
+            else
+              @field_refs << ref.strip unless @field_refs.include?(ref)
+            end
+          end
+
+          sanitized = remove_matched_refs(sanitized, matched_refs)
+
+          # Extract functions
+          sanitized.scan(/\b([a-zA-Z_][a-zA-Z0-9_]*)\(/).each do |func|
+            @functions << func.first
+          end
+
+          # A window clause marks the expression as computed over the final rows — after any
+          # grouping — which is what has_window_functions? reports.
+          @windowed = sanitized.match?(/\bover\s*\(/)
+
+          # Extract quoted columns
+          @expression.scan(/"([^"]+)"/).flatten.each do |col|
+            @columns << col
+          end
+
+          # Extract column references (alphanumeric with optional underscores)
+          sanitized.scan(/\b([a-zA-Z_][a-zA-Z0-9_]*)\b/).flatten.each do |col|
+            @columns << col unless @reserved.include?(col) || @functions.include?(col) || @columns.include?(col)
+          end
+
+          @wild = true if sanitized.match?(/\w+\(\s?\*\s?\)/)
+        end
+
+        def remove_string_literals(expr)
+          expr.gsub(/'[^']*'/, "'__str__'")
+        end
+
+        def remove_matched_refs(sanitized, matched_refs)
+          l = sanitized
+          matched_refs.each do |ref|
+            l.gsub!(ref, "")
+          end
+          l
+        end
+      end
+    end
+  end
+end

data/lib/strata/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strata-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Ajo Abraham
@@ -293,11 +293,13 @@ files:
 - lib/strata/cli/generators/templates/test.yml
 - lib/strata/cli/generators/test.rb
 - lib/strata/cli/guard.rb
+- lib/strata/cli/helpers/browser_auth.rb
 - lib/strata/cli/helpers/command_context.rb
 - lib/strata/cli/helpers/datasource_helper.rb
 - lib/strata/cli/helpers/description_helper.rb
 - lib/strata/cli/helpers/project_helper.rb
 - lib/strata/cli/helpers/prompts.rb
+- lib/strata/cli/helpers/semantic_audit_checks.rb
 - lib/strata/cli/helpers/table_filter.rb
 - lib/strata/cli/main.rb
 - lib/strata/cli/output.rb
@@ -316,6 +318,7 @@ files:
 - lib/strata/cli/utils/deployment_monitor.rb
 - lib/strata/cli/utils/git.rb
 - lib/strata/cli/utils/import_manager.rb
+- lib/strata/cli/utils/sql_expression_parser.rb
 - lib/strata/cli/utils/test_reporter.rb
 - lib/strata/cli/utils/version_checker.rb
 - lib/strata/cli/utils/yaml_import_resolver.rb
@@ -340,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Command-line interface for the Strata Semantic Analytics System
 test_files: []