strata-cli 0.1.8 → 0.1.9

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

@@ -2,6 +2,7 @@
 
 require_relative "group"
 require "yaml"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -23,7 +24,7 @@ module Strata
           # Write the updated template
           create_file output_path, updated_content
 
-          say_status :created, output_path, :green
+          Output.print_status(:created, output_path, type: :success, context: self)
         end
 
         private

data/lib/strata/cli/guard.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "utils"
+require_relative "output"
+
 module Strata
   module CLI
     module Guard
@@ -10,13 +12,14 @@ module Strata
         adapters
         version
         deploy
+        branch
       ].freeze
 
       def invoke_command(command, *args)
         Utils.exit_error_if_not_strata! unless ALLOWED_COMMANDS.include?(command.name)
         super
       rescue Strata::CommandError => e
-        shell.say_error "ERROR: #{e.message}", :red
+        Output.print_error("ERROR: #{e.message}", context: self)
         exit 1
       end
     end

data/lib/strata/cli/helpers/command_context.rb

@@ -2,7 +2,7 @@
 
 require "tty-prompt"
 require_relative "datasource_helper"
-require_relative "color_helper"
+require_relative "../output"
 require_relative "prompts"
 require_relative "../error_reporter"
 
@@ -10,6 +10,7 @@ module Strata
   module CLI
     module Helpers
       module CommandContext
+        include Output
         include DatasourceHelper
 
         def adapter
@@ -28,8 +29,7 @@ module Strata
           @table_fetch_result ||= begin
             tables = with_spinner("Fetching tables from #{datasource_key}...") { adapter.tables }
             if tables.empty?
-              # Assuming Prompts and ColorHelper are available in the class or via module
-              say Prompts::MSG_NO_TABLES_FOUND % datasource_key, ColorHelper.warning
+              say(Output.format(:warning, Prompts::MSG_NO_TABLES_FOUND % datasource_key), nil) if respond_to?(:say)
               {tables: [], failed: false}
             else
               {tables: tables, failed: false}
@@ -38,15 +38,14 @@ module Strata
             ErrorReporter.log_error(e, context: "create table: failed fetching tables for '#{datasource_key}'")
 
             if ErrorReporter.connection_error?(e)
-              say "Could not connect to datasource '#{datasource_key}'.", ColorHelper.warning
+              say(Output.format(:warning, "Could not connect to datasource '#{datasource_key}'."), nil) if respond_to?(:say)
             else
-              say "Could not fetch tables from datasource '#{datasource_key}'.", ColorHelper.warning
-              say "Reason: #{ErrorReporter.user_message_for(e)}", ColorHelper.warning
+              say(Output.format(:warning, "Could not fetch tables from datasource '#{datasource_key}'."), nil) if respond_to?(:say)
+              say(Output.format(:warning, "Reason: #{ErrorReporter.user_message_for(e)}"), nil) if respond_to?(:say)
             end
 
-            say "Hint: verify credentials/settings and run 'strata datasource test #{datasource_key}'.",
-              ColorHelper.info
-            say "Details logged to '#{ErrorReporter.log_relative_path}'.", ColorHelper.info
+            say(Output.format(:dim, "Hint: verify credentials/settings and run 'strata datasource test #{datasource_key}'."), nil) if respond_to?(:say)
+            say(Output.format(:info, "Details logged to '#{ErrorReporter.log_relative_path}'."), nil) if respond_to?(:say)
             {tables: [], failed: true}
           end
         end

data/lib/strata/cli/helpers/datasource_helper.rb

@@ -8,7 +8,7 @@ module Strata
         redshift: %w[pg],
         mysql: %w[mysql2],
         sqlserver: %w[tiny_tds],
-        athena: %w[aws-sdk-athena aws-sdk-s3],
+        athena: %w[aws-sdk-athena aws-sdk-s3 rexml],
         trino: %w[trino-client],
         sqlite: %w[sqlite3],
         duckdb: %w[duckdb]

data/lib/strata/cli/helpers/description_helper.rb

@@ -11,7 +11,8 @@ module Strata
           if File.exist?(file_path)
             long_desc File.read(file_path)
           else
-            warn "Warning: Description file not found at #{file_path}"
+            require_relative "../output"
+            Output.print_warning("Warning: Description file not found at #{file_path}")
           end
         end
       end

data/lib/strata/cli/main.rb

@@ -3,16 +3,19 @@
 require_relative "generators/project"
 require_relative "sub_commands/datasource"
 require_relative "sub_commands/deploy"
+require_relative "sub_commands/branch"
 require_relative "sub_commands/project"
 require_relative "sub_commands/table"
 require_relative "sub_commands/create"
 require_relative "sub_commands/audit"
 require_relative "helpers/description_helper"
+require_relative "output"
 
 module Strata
   module CLI
     class Main < Thor
       include Guard
+      include Output
       extend Helpers::DescriptionHelper
 
       def self.exit_on_failure?
@@ -30,21 +33,22 @@ module Strata
         repeatable: true
       option :source, aliases: ["s"], type: :string, desc: "URL of existing project"
       option :api_key, aliases: ["a"], type: :string, desc: "Api Key. Required if initializing existing project."
+      option :verbose, aliases: ["v"], type: :boolean, default: false,
+        desc: "Show detailed init output (file-by-file actions)."
 
       def init(project_name = nil)
         unless project_name || options[:source]
           raise Strata::CommandError, "PROJECT_NAME is required when not using --source option."
         end
 
-        say_status :started, "Creating #{project_name || "project from source"} - #{options[:datasource]}",
-          ColorHelper.info
+        print_status(:created, (project_name || "project from source").to_s, type: :info)
         invoke Generators::Project, [project_name], options
       end
 
       desc "adapters", "Lists supported data warehouse adapters"
       def adapters
         out = " SUPPORTED ADAPTERS: \n\t#{DWH.adapters.keys.join("\n\t")}"
-        say out, ColorHelper.info
+        print_info(out)
       end
 
       desc "datasource", "Manage project datasources"
@@ -56,12 +60,20 @@ module Strata
       desc "table", "Manage semantic tables"
       subcommand "table", SubCommands::Table
 
+      desc "tables", "List all semantic models in the project"
+      def tables
+        SubCommands::Table.start(["list"])
+      end
+
       desc "audit", "Audit project configuration and models"
       subcommand "audit", SubCommands::Audit
 
       desc "deploy", "Deploy project to Strata server"
       subcommand "deploy", SubCommands::Deploy
 
+      desc "branch", "Manage Strata server branches"
+      subcommand "branch", SubCommands::Branch
+
       desc "project", "Manage project configuration"
       subcommand "project", SubCommands::Project
 

data/lib/strata/cli/output.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require "thor"
+require "pastel"
+
+module Strata
+  module CLI
+    module Output
+      THEME = {
+        success: :green,
+        error: %i[red bold],
+        warning: :yellow,
+        info: :cyan,
+        title: %i[cyan bold],
+        highlight: %i[cyan bold],
+        dim: :bright_black,
+        primary: :blue,
+        secondary: :magenta,
+        border: %i[cyan dim],
+        selected: %i[green bold],
+        disabled: :bright_black
+      }.freeze
+
+      class << self
+        def pastel
+          @pastel ||= Pastel.new(enabled: $stdout.tty?)
+        end
+
+        def shell_for(context = nil)
+          return context.shell if context&.respond_to?(:shell)
+          return context if context.is_a?(Thor::Shell)
+
+          Thor::Shell::Color.new
+        end
+
+        def print_info(message, context: nil)
+          shell_for(context).say(format(:info, message))
+        end
+
+        def print_success(message, context: nil)
+          shell_for(context).say(format(:success, message))
+        end
+
+        def print_warning(message, context: nil)
+          shell_for(context).say(format(:warning, message))
+        end
+
+        def print_error(message, context: nil)
+          shell_for(context).say_error(format(:error, message))
+        end
+
+        def print_hint(message, context: nil, stderr: false)
+          shell = shell_for(context)
+          formatted = format(:dim, message)
+          stderr ? shell.say_error(formatted) : shell.say(formatted)
+        end
+
+        # Standard status output with Thor's prefix formatting.
+        # We keep the label color via Thor, but decorate the message via Output theme.
+        def print_status(label, message, type: :info, context: nil)
+          shell = shell_for(context)
+          shell.say_status(label, format(type, message), thor_color(type))
+        end
+
+        def format(type, message)
+          return "" if message.nil?
+
+          styles = THEME[type]
+          return message.to_s unless styles
+
+          if styles.is_a?(Array)
+            pastel.decorate(message.to_s, *styles)
+          else
+            pastel.send(styles, message.to_s)
+          end
+        end
+
+        # Thor only understands a limited palette; keep it simple/stable.
+        def thor_color(type)
+          case type
+          when :success then :green
+          when :error then :red
+          when :warning then :yellow
+          when :info, :title, :border then :cyan
+          when :primary then :blue
+          when :secondary then :magenta
+          when :dim then :white
+          else
+            :white
+          end
+        end
+      end
+
+      # Convenience instance methods for Thor classes.
+      def print_info(message) = Output.print_info(message, context: self)
+      def print_success(message) = Output.print_success(message, context: self)
+      def print_warning(message) = Output.print_warning(message, context: self)
+      def print_error(message) = Output.print_error(message, context: self)
+      def print_hint(message, stderr: false) = Output.print_hint(message, context: self, stderr: stderr)
+      def print_status(label, message, type: :info) = Output.print_status(label, message, type: type, context: self)
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 require_relative "../guard"
 require_relative "../terminal"
 require_relative "../credentials"
-require_relative "../helpers/color_helper"
+require_relative "../output"
 require_relative "../helpers/datasource_helper"
 require_relative "../utils/yaml_import_resolver"
 require_relative "../utils/import_manager"
@@ -17,6 +17,7 @@ module Strata
         include Thor::Actions
         include Guard
         include Terminal
+        include Output
         include DatasourceHelper
 
         REQUIRED_KEYS_FOR_TABLE_MODEL = %w[name physical_name fields datasource].freeze
@@ -61,7 +62,7 @@ module Strata
           if results.values.all?
             # All checks passed - no need for additional message, spinners already show success
           else
-            say "\n Some checks failed.", ColorHelper.error
+            print_error("\n Some checks failed.")
             exit(1)
           end
         end
@@ -76,7 +77,7 @@ module Strata
         rescue
           failures.each do |f|
             msg = f.is_a?(Hash) ? "#{f[:file]}: #{f[:message]}" : f.to_s
-            say "  ✖ #{msg}", ColorHelper.error
+            print_error("  ✖ #{msg}")
           end
           false
         end

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
 

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