strata-cli 0.1.7 → 0.1.9

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

@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+require_relative "../guard"
+require_relative "../output"
+require_relative "../api/client"
+require_relative "../utils/git"
+require "time"
+require "tty-prompt"
+
+module Strata
+  module CLI
+    module SubCommands
+      class Branch < Thor
+        include Guard
+        include Output
+
+        default_command :list
+        class_option :environment, aliases: ["e"], type: :string
+
+        desc "list", "List local and Strata server branches"
+        def list
+          config = CLI.config.get_for_environment(options[:environment])
+          local_branch_names = Utils::Git.local_branches
+          server_branches = fetch_server_branches(config)
+
+          rows = branch_rows(local_branch_names, server_branches)
+          if rows.empty?
+            print_info("No local or Strata server branches found.")
+          else
+            rows.each { |row| print_info(row) }
+          end
+        end
+
+        desc "create BRANCH", "Create and checkout a local git branch"
+        def create(branch_name)
+          branch_name = Utils::Git.create_and_checkout_branch(branch_name)
+          print_success("Created and checked out branch '#{branch_name}'.")
+        end
+
+        desc "checkout BRANCH", "Checkout a local git branch"
+        def checkout(branch_name)
+          branch_name = Utils::Git.checkout_branch(branch_name)
+          print_success("Checked out branch '#{branch_name}'.")
+        end
+
+        desc "delete", "Delete a branch from Strata server"
+        method_option :branch, aliases: ["b"], type: :string, desc: "Branch to delete. Defaults to current git branch."
+        def delete
+          branch_id = branch_to_delete
+          config = CLI.config.get_for_environment(options[:environment])
+          validate_delete_configuration(config)
+
+          return unless confirm_branch_deletion(branch_id)
+
+          client = API::Client.new(config["server"], config["api_key"])
+          server_deleted = client.delete_branch(config["project_id"], branch_id)
+          print_warning("Branch '#{branch_id}' was not found on Strata server. Deleting local branch only.") unless server_deleted
+
+          delete_local_branch(branch_id)
+
+          print_success("Deleted branch '#{branch_id}'.")
+        end
+
+        private
+
+        def branch_to_delete
+          explicit_branch = options[:branch].to_s.strip
+          branch_id = explicit_branch.empty? ? Utils::Git.current_branch.to_s.strip : explicit_branch
+
+          if branch_id.empty?
+            raise Strata::CommandError, "Branch name is required. Use -b BRANCH to specify one."
+          end
+
+          if branch_id == "HEAD"
+            raise Strata::CommandError, "Cannot determine current branch while in detached HEAD. Use -b BRANCH to specify one."
+          end
+
+          branch_id
+        end
+
+        def validate_delete_configuration(config)
+          ensure_config_present(config, "server")
+          ensure_config_present(config, "api_key")
+          ensure_config_present(config, "project_id")
+        end
+
+        def ensure_config_present(config, key)
+          return if config[key] && !config[key].to_s.strip.empty?
+
+          raise Strata::CommandError, "Missing required configuration: #{key}. Check your project.yml or .strata file."
+        end
+
+        def confirm_branch_deletion(branch_id)
+          prompt = TTY::Prompt.new
+          answer = prompt.ask("Type '#{branch_id}' to delete this branch from Strata:")
+          return true if answer.to_s == branch_id
+
+          print_warning("Branch deletion cancelled.")
+          false
+        end
+
+        def fetch_server_branches(config)
+          unless server_configured?(config)
+            print_warning("Server configuration is incomplete. Showing local branches only.")
+            return []
+          end
+
+          API::Client.new(config["server"], config["api_key"]).branches(config["project_id"])
+        end
+
+        def server_configured?(config)
+          %w[server api_key project_id].all? { |key| config[key] && !config[key].to_s.strip.empty? }
+        end
+
+        def branch_rows(local_branch_names, server_branches)
+          local_names = local_branch_names.to_h { |name| [name, true] }
+          server_by_uid = server_branches.to_h { |branch| [branch["uid"], branch] }
+          current_branch = Utils::Git.git_repo? ? Utils::Git.current_branch : nil
+
+          (local_names.keys | server_by_uid.keys).sort.map do |branch_name|
+            server_branch = server_by_uid[branch_name]
+            "#{current_branch_marker(branch_name, current_branch)}(#{branch_location(local_names.key?(branch_name), server_branch)}) - last deployed at: #{format_last_deployed_at(server_branch && server_branch["last_deployed_at"])}"
+          end
+        end
+
+        def current_branch_marker(branch_name, current_branch)
+          (current_branch == branch_name) ? "* #{branch_name}" : branch_name
+        end
+
+        def branch_location(local, server_branch)
+          tags = []
+          tags << "local" if local
+          tags << "server" if server_branch
+          tags.empty? ? "unknown" : tags.join(", ")
+        end
+
+        def format_last_deployed_at(value)
+          return "" if value.nil? || value.to_s.strip.empty?
+
+          Time.parse(value.to_s).strftime("%Y-%m-%d %H:%M:%S")
+        rescue ArgumentError
+          value.to_s
+        end
+
+        def delete_local_branch(branch_id)
+          case Utils::Git.delete_local_branch(branch_id, fallback_branches: local_delete_fallback_branches)
+          when :deleted
+            print_info("Deleted local git branch '#{branch_id}'.")
+          when :not_found
+            print_warning("Local git branch '#{branch_id}' was not found.")
+          when :not_git_repo
+            print_warning("No local git repository found. Skipped local branch deletion.")
+          end
+        end
+
+        def local_delete_fallback_branches
+          production_branch = CLI.config["production_branch"].to_s.strip
+          ([production_branch] + %w[main master]).reject(&:empty?).uniq
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,6 @@ require_relative "../ui/field_editor"
 require_relative "../credentials"
 require_relative "../helpers/table_filter"
 require_relative "../ai/services/table_generator"
-require_relative "../helpers/color_helper"
 require_relative "../helpers/prompts"
 require_relative "../helpers/description_helper"
 require_relative "../helpers/command_context"
@@ -406,7 +405,7 @@ module Strata
 
           return unless from.strip == to.strip
 
-          say "Warning: --from and --to have the same value. Migration will have no effect.", ColorHelper.warning
+          print_warning("Warning: --from and --to have the same value. Migration will have no effect.")
         end
 
         def prompt_migration_hook(operation)

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

@@ -3,6 +3,7 @@
 require_relative "../guard"
 require_relative "../credentials"
 require_relative "../terminal"
+require_relative "../output"
 require_relative "../utils/git"
 require "tty-prompt"
 require_relative "../helpers/datasource_helper"
@@ -15,6 +16,7 @@ module Strata
         include Thor::Actions
         include Guard
         include Terminal
+        include Output
         include DatasourceHelper
         extend Helpers::DescriptionHelper
 
@@ -86,7 +88,7 @@ module Strata
           # Collect adapter-specific fields
           adapter_fields(adapter).each do |field, default_value|
             config[field] = if field == "auth_mode"
-              prompt.select("  Authentication mode:", %w[pat kp oauth], default: default_value)
+              default_value
             elsif %w[ssl azure].include?(field)
               prompt.yes?("  #{field.tr("_", " ").capitalize}?", default: default_value)
             elsif field == "port"
@@ -103,11 +105,14 @@ module Strata
           say "\n✔ Added #{adapter} config to datasources.yml", :green
 
           # Automatically collect credentials if required
-          creds = Credentials.new(adapter)
+          creds = Credentials.new(adapter, datasource_config: config)
           if creds.required?
             say "\n  Now let's set up credentials:\n", :yellow
             say "  Note: Credentials are stored securely in the local .strata file", :cyan
             say "  and are NOT committed to the repository (ensured by .gitignore).", :cyan
+            if adapter == "databricks"
+              say "  Databricks uses OAuth M2M with service principal credentials (client ID + client secret).", :cyan
+            end
             say ""
             creds.collect
             creds.write_local(ds_key, self)
@@ -137,7 +142,7 @@ module Strata
           end
 
           adapter = datasources[ds_key]["adapter"]
-          creds = Credentials.new(adapter)
+          creds = Credentials.new(adapter, datasource_config: datasources[ds_key])
 
           unless creds.required?
             say "Credentials not required for #{adapter} adapter.", :yellow
@@ -147,6 +152,9 @@ module Strata
           say "\nEnter credentials for #{ds_key}", :red
           say "  Note: Credentials are stored securely in the local .strata file", :cyan
           say "  and are NOT committed to the repository (ensured by .gitignore).", :cyan
+          if adapter == "databricks"
+            say "  Databricks uses OAuth M2M with service principal credentials (client ID + client secret).", :cyan
+          end
           say ""
           creds.collect
           creds.write_local(ds_key, self)
@@ -343,7 +351,8 @@ module Strata
               "host" => "workspace-id.cloud.databricks.com",
               "warehouse" => "warehouse_id",
               "catalog" => "main",
-              "schema" => "default"
+              "schema" => "default",
+              "auth_mode" => "oauth_m2m"
             }
           else
             {}

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

@@ -2,7 +2,7 @@
 
 require_relative "../guard"
 require_relative "../terminal"
-require_relative "../helpers/color_helper"
+require_relative "../output"
 require_relative "../helpers/project_helper"
 require_relative "../helpers/description_helper"
 require_relative "../api/client"
@@ -22,6 +22,7 @@ module Strata
       class Deploy < Thor
         include Guard
         include Terminal
+        include Output
         extend Helpers::DescriptionHelper
 
         default_command :deploy
@@ -57,7 +58,7 @@ module Strata
           # If only external imports changed, generate synthetic commit identifier
           if refreshed_imports.any? && local_file_changes.empty?
             import_commit_hash = Utils::ImportManager.generate_import_commit_hash(project_path)
-            say "\nExternal imports change found. Proceeding with deployment", ColorHelper.info
+            print_info("\nExternal imports change found. Proceeding with deployment")
             metadata[:commit] = "imports-#{import_commit_hash}"
             metadata[:commit_message] = "External imports updated: #{refreshed_imports.map do |c|
               File.basename(c[:source])
@@ -68,7 +69,7 @@ module Strata
 
           env_display = options[:environment] ? " (#{options[:environment]} environment)" : ""
           server_info = config["server"] ? " (#{config["server"]})" : ""
-          say "\nDeploying to branch '#{branch_id}' on Strata server#{env_display}#{server_info}\n", ColorHelper.info
+          print_info("\nDeploying to branch '#{branch_id}' on Strata server#{env_display}#{server_info}\n")
 
           deployment = submit_deployment(config, branch_id, archive_path, metadata)
 
@@ -87,7 +88,7 @@ module Strata
           deployment = client.latest_deployment(config["project_id"], branch_id)
 
           unless deployment
-            say "No deployments found for branch '#{branch_id}'.\n", ColorHelper.info
+            print_info("No deployments found for branch '#{branch_id}'.\n")
             return
           end
 
@@ -331,8 +332,8 @@ module Strata
 
             if changed_paths.empty? && refreshed_imports.empty?
               unless options[:force]
-                say "\nNo files changed since last deployment.", ColorHelper.warning
-                say "To force deploy, run command with --force or -f flag.\n", ColorHelper.info
+                print_warning("\nNo files changed since last deployment.")
+                print_info("To force deploy, run command with --force or -f flag.\n")
                 exit(0)
               end
               Utils::Archive.create(project_path, file_overrides: file_overrides)
@@ -345,7 +346,7 @@ module Strata
               change_count = files_to_include.length
               change_count += refreshed_imports.length if refreshed_imports.any?
 
-              say "Including #{change_count} changed file(s) in archive...\n", ColorHelper.info
+              print_info("Including #{change_count} changed file(s) in archive...\n")
               Utils::Archive.create(project_path, files_to_include: files_to_include, file_overrides: file_overrides)
             end
           else
@@ -412,7 +413,7 @@ module Strata
           message = "Deploying to production branch '#{branch_id}'. Continue? [y/N]"
           return if prompt.yes?(message, default: false)
 
-          say "Deployment cancelled.", ColorHelper.warning
+          print_warning("Deployment cancelled.")
           exit(0)
         end
 
@@ -422,7 +423,7 @@ module Strata
           project_config = YAML.safe_load_file("project.yml", permitted_classes: [Date, Time], aliases: true) || {}
           project_config["production_branch"] || "main"
         rescue => e
-          warn "Failed to load project.yml: #{e.message}" if ENV["DEBUG"]
+          print_warning("Failed to load project.yml: #{e.message}") if ENV["DEBUG"]
           "main"
         end
 
@@ -436,11 +437,11 @@ module Strata
             return nil unless last_deployment && last_deployment["commit"]
 
             commit_hash = last_deployment["commit"]
-            say "Found last successful deployment at commit: #{commit_hash[0..7]}...\n", ColorHelper.info
+            print_info("Found last successful deployment at commit: #{commit_hash[0..7]}...\n")
             commit_hash
           rescue Strata::CommandError
             # If we can't get last deployment (e.g., first deployment), continue with all files
-            say "No previous deployment found. Including all files.\n", ColorHelper.info
+            print_info("No previous deployment found. Including all files.\n")
             nil
           end
         end
@@ -477,10 +478,10 @@ module Strata
           refreshed = Utils::ImportManager.refresh_external_imports(project_path)
 
           if refreshed.any?
-            say "\n Skimmed #{refreshed.length} external import(s):", ColorHelper.info
+            print_info("\n Skimmed #{refreshed.length} external import(s):")
             refreshed.each do |import|
               filename = File.basename(import[:source])
-              say "  • #{filename}", ColorHelper.info
+              print_info("  • #{filename}")
             end
           end
 

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

@@ -2,7 +2,7 @@
 
 require_relative "../guard"
 require_relative "../terminal"
-require_relative "../helpers/color_helper"
+require_relative "../output"
 require_relative "../helpers/project_helper"
 require_relative "../api/client"
 require "yaml"
@@ -13,6 +13,7 @@ module Strata
       class Project < Thor
         include Guard
         include Terminal
+        include Output
 
         desc "link PROJECT_ID", "Link local project to an existing project on the server"
         def link(project_id)
@@ -22,13 +23,13 @@ module Strata
           project_config = YAML.safe_load_file(project_yml_path, permitted_classes: [Date, Time], aliases: true) || {}
 
           if project_config["project_id"] && !project_config["project_id"].to_s.strip.empty?
-            say "Project is already linked to project_id: #{project_config["project_id"]}", ColorHelper.warning
+            print_warning("Project is already linked to project_id: #{project_config["project_id"]}")
             return
           end
 
           return unless Helpers::ProjectHelper.persist_project_id_to_yml(project_id, project_yml_path: project_yml_path)
 
-          say "✓ Project linked successfully. project_id: #{project_id}", ColorHelper.info
+          print_info("✓ Project linked successfully. project_id: #{project_id}")
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "../helpers/color_helper"
 require_relative "../helpers/prompts"
 require_relative "../helpers/command_context"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -10,6 +10,7 @@ module Strata
       class Table < Thor
         include Guard
         include Terminal
+        include Output
         include Prompts
         include Thor::Actions
         include Helpers::CommandContext
@@ -18,24 +19,24 @@ module Strata
         desc "list", "List all semantic models in the project"
         def list
           unless Dir.exist?("models")
-            say MSG_NO_MODELS_DIR, :yellow
+            print_warning(MSG_NO_MODELS_DIR)
             return
           end
 
-          model_files = Dir.glob("models/tbl[._]*.yml").sort
+          model_files = Dir.glob("models/**/tbl[._]*.yml").sort
 
           if model_files.empty?
-            say MSG_NO_MODELS_FOUND, :yellow
+            print_warning(MSG_NO_MODELS_FOUND)
             return
           end
 
-          say MSG_MODELS_LIST_HEADER, :cyan
+          print_info(MSG_MODELS_LIST_HEADER)
 
           model_files.each do |file|
             display_model_item(file)
           end
 
-          say MSG_MODELS_COUNT % model_files.length, :cyan
+          print_info(MSG_MODELS_COUNT % model_files.length)
         end
 
         private
@@ -47,9 +48,9 @@ module Strata
           desc = "#{desc[0..50]}..." if desc.length > 50
 
           if desc.empty?
-            say "    #{name}", :white
+            print_info("    #{name}")
           else
-            say "    #{name.ljust(25)} #{desc}", :white
+            print_info("    #{name.ljust(25)} #{desc}")
           end
         end
       end

data/lib/strata/cli/terminal.rb

@@ -4,6 +4,7 @@ require "tty-spinner"
 require "pastel"
 require "tty-table"
 require "io/console"
+require_relative "output"
 
 module Strata
   module CLI
@@ -23,13 +24,15 @@ module Strata
 
       # Shows a loader while running IO tasks
       # Uses consistent format matching deployment monitor: cyan spinner that transitions to checkmark
-      def with_spinner(message = "Loading...",
+      def with_spinner(
+        message = "Loading...",
         success_message: "",
         failed_message: "",
         clear: false,
         message_color: :cyan,
         spinner_color: :cyan,
-        format: :dots)
+        format: :dots
+      )
         spinner = create_spinner(message,
           message_color: message_color,
           spinner_color: spinner_color,
@@ -39,10 +42,10 @@ module Strata
 
         begin
           result = yield
-          spinner.success(success_message.empty? ? "" : Pastel.new.green(success_message))
+          spinner.success(success_message.empty? ? "" : Output.format(:success, success_message))
           result
         rescue => e
-          spinner.error(failed_message.empty? ? "" : Pastel.new.red(failed_message))
+          spinner.error(failed_message.empty? ? "" : Output.format(:error, failed_message))
           raise e
         end
       end

data/lib/strata/cli/ui/field_editor.rb

@@ -3,7 +3,7 @@
 require "tty-prompt"
 require "tty-table"
 require "pastel"
-require_relative "../helpers/color_helper"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -77,21 +77,19 @@ module Strata
       end
 
       def display_table
-        colors = ColorHelper
-        puts colors.highlight("\n  Field Editor - Review & Edit Generated Fields\n")
+        puts Output.format(:highlight, "\n  Field Editor - Review & Edit Generated Fields\n")
 
         rows = @fields.each_with_index.map do |field, idx|
-          indicator = (idx == @selected_index) ? colors.selected("❯") : " "
-          status = field[:skipped] ? colors.disabled("[SKIP]") : ""
+          indicator = (idx == @selected_index) ? Output.format(:selected, "❯") : " "
+          status = field[:skipped] ? Output.format(:disabled, "[SKIP]") : ""
 
-          name_cell = field[:skipped] ? colors.disabled(field[:name]) : field[:name]
+          name_cell = field[:skipped] ? Output.format(:disabled, field[:name]) : field[:name]
           desc_cell = if field[:skipped]
-            colors.disabled(truncate(field[:description],
-              25))
+            Output.format(:disabled, truncate(field[:description], 25))
           else
             truncate(field[:description], 25)
           end
-          expr_cell = field[:skipped] ? colors.disabled(field[:expression]) : field[:expression]
+          expr_cell = field[:skipped] ? Output.format(:disabled, field[:expression]) : field[:expression]
 
           [
             "#{indicator} #{status}",
@@ -112,14 +110,13 @@ module Strata
       end
 
       def display_help
-        colors = ColorHelper
         puts ""
-        puts "  #{colors.info("↑/↓")} Navigate  " \
-             "#{colors.success("[Enter]")} Edit  " \
-             "#{colors.warning("[S]")}kip  " \
-             "#{colors.primary("[P]")}rompt  " \
-             "#{colors.secondary("[C]")}onfirm  " \
-             "#{colors.error("[Q/Esc]")}uit"
+        puts "  #{Output.format(:info, "↑/↓")} Navigate  " \
+             "#{Output.format(:success, "[Enter]")} Edit  " \
+             "#{Output.format(:warning, "[S]")}kip  " \
+             "#{Output.format(:primary, "[P]")}rompt  " \
+             "#{Output.format(:secondary, "[C]")}onfirm  " \
+             "#{Output.format(:error, "[Q/Esc]")}uit"
         puts ""
       end
 
@@ -129,10 +126,9 @@ module Strata
 
       def edit_current_field
         field = @fields[@selected_index]
-        colors = ColorHelper
 
-        puts colors.highlight("\n  Editing: #{field[:name]}\n")
-        puts colors.dim("  (Press Ctrl+C or type 'back' to go back without saving)\n")
+        puts Output.format(:highlight, "\n  Editing: #{field[:name]}\n")
+        puts Output.format(:dim, "  (Press Ctrl+C or type 'back' to go back without saving)\n")
 
         begin
           field[:name] = prompt.ask("  Field Name:", default: field[:name])
@@ -170,20 +166,18 @@ module Strata
       end
 
       def handle_prompt_mode
-        require_relative "../ai/services/model_generator"
+        require_relative "../ai/services/table_generator"
         require_relative "../terminal"
-        generator = AI::Services::ModelGenerator.new
-
-        colors = ColorHelper
+        generator = AI::Services::TableGenerator.new
 
         unless generator.ai_available?
-          puts colors.warning("\n  AI is not available. Configure AI in .strata file.")
+          puts Output.format(:warning, "\n  AI is not available. Configure AI in .strata file.")
           sleep 1.5
           return
         end
 
         unless @table_context
-          puts colors.warning("\n  Prompt mode requires table context.")
+          puts Output.format(:warning, "\n  Prompt mode requires table context.")
           sleep 1.5
           return
         end
@@ -208,11 +202,11 @@ module Strata
             @selected_index = 0
             # No message needed - table will refresh and show new fields
           else
-            puts colors.warning("  No changes - keeping current fields")
+            puts Output.format(:warning, "  No changes - keeping current fields")
             sleep 1
           end
         rescue => e
-          puts colors.error("\n  Error: #{e.message}")
+          puts Output.format(:error, "\n  Error: #{e.message}")
           sleep 2
         end
       end