strata-cli 0.1.8 → 0.1.9

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

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../helpers/color_helper"
 require_relative "../terminal"
+require_relative "../output"
 require "tty-spinner"
 require "pastel"
 
@@ -117,8 +117,8 @@ module Strata
 
             if Time.now - start_time > timeout
               complete_stage(TESTING_STAGE) if @tests_running
-              say "\n  Monitoring timeout reached (#{timeout}s)", ColorHelper.warning
-              say "   Deployment may still be in progress. Check server for status.\n", ColorHelper.info
+              say "\n  Monitoring timeout reached (#{timeout}s)", :warning
+              say "   Deployment may still be in progress. Check server for status.\n", :info
               return deployment
             end
 
@@ -126,13 +126,13 @@ module Strata
           end
         rescue Interrupt
           stop_all_spinners
-          say "\n\n  Monitoring interrupted. Deployment continues in background.", ColorHelper.warning
-          say "  Check server for deployment status with command `strata deploy status`.\n", ColorHelper.info
+          say "\n\n  Monitoring interrupted. Deployment continues in background.", :warning
+          say "  Check server for deployment status with command `strata deploy status`.\n", :info
           nil
         rescue => e
           stop_all_spinners
-          say "\n Error monitoring deployment: #{e.message}", ColorHelper.error
-          say "   Check server for deployment status.\n", ColorHelper.info
+          say "\n Error monitoring deployment: #{e.message}", :error
+          say "   Check server for deployment status.\n", :info
           nil
         end
 
@@ -150,11 +150,11 @@ module Strata
           deployment
         rescue Interrupt
           stop_all_spinners
-          say "\n\n  Exiting status view.\n", ColorHelper.info
+          say "\n\n  Exiting status view.\n", :info
           nil
         rescue => e
           stop_all_spinners
-          say "\n Error fetching deployment status: #{e.message}", ColorHelper.error
+          say "\n Error fetching deployment status: #{e.message}", :error
           nil
         end
 
@@ -169,42 +169,23 @@ module Strata
 
         private
 
-        def say(message, color_helper_result = nil)
-          return $stdout.puts(message) unless color_helper_result
-
-          colored_message = case color_helper_result
-          when Array
-            ColorHelper.pastel.decorate(message, *color_helper_result)
-          when Symbol
-            theme = ColorHelper::THEME[color_helper_result]
-            if theme
-              ColorHelper.pastel.decorate(message, *Array(theme))
-            else
-              begin
-                ColorHelper.pastel.send(color_helper_result, message)
-              rescue NoMethodError
-                message
-              end
-            end
-          else
-            message
-          end
-
-          $stdout.puts(colored_message)
+        def say(message, type = nil)
+          shell = Output.shell_for(nil)
+          shell.say(type ? Output.format(type, message) : message)
         end
 
         def display_initial_status
-          say "\n Monitoring deployment progress...\n", ColorHelper.title
+          say "\n Monitoring deployment progress...\n", :title
         end
 
         def display_exit_instruction
-          say "  Press Ctrl+C to exit monitoring.\n", ColorHelper.dim
+          say "  Press Ctrl+C to exit monitoring.\n", :dim
         end
 
         def fetch_deployment_status
           @client.get_deployment(@project_id, @branch_id, @deployment_id)
         rescue Strata::CommandError => e
-          say "\n  Could not fetch deployment status: #{e.message}", ColorHelper.warning
+          say "\n  Could not fetch deployment status: #{e.message}", :warning
           nil
         end
 

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

@@ -21,6 +21,53 @@ module Strata
           run_git_command("rev-parse", "--abbrev-ref", "HEAD")
         end
 
+        def local_branches
+          return [] unless git_repo?
+
+          output = run_git_command("branch", "--format", "%(refname:short)")
+          return [] unless output
+
+          output.lines.map(&:strip).reject(&:empty?)
+        end
+
+        def create_and_checkout_branch(branch_name)
+          ensure_git_repo!
+          branch_name = validate_branch_name!(branch_name)
+
+          _, stderr, status = Open3.capture3("git", "switch", "-c", branch_name)
+          raise Strata::CommandError, "Failed to create branch '#{branch_name}': #{stderr.strip}" unless status.success?
+
+          branch_name
+        end
+
+        def checkout_branch(branch_name)
+          ensure_git_repo!
+          branch_name = validate_branch_name!(branch_name)
+
+          _, stderr, status = Open3.capture3("git", "switch", branch_name)
+          raise Strata::CommandError, "Failed to checkout branch '#{branch_name}': #{stderr.strip}" unless status.success?
+
+          branch_name
+        end
+
+        def delete_local_branch(branch_name, fallback_branches: %w[main master])
+          return :not_git_repo unless git_repo?
+
+          branch_name = branch_name.to_s.strip
+          raise Strata::CommandError, "Branch name is required." if branch_name.empty?
+
+          return :not_found unless local_branch_exists?(branch_name)
+
+          if current_branch == branch_name
+            switch_to_fallback_branch(branch_name, fallback_branches)
+          end
+
+          _, stderr, status = Open3.capture3("git", "branch", "-D", branch_name)
+          raise Strata::CommandError, "Failed to delete local branch '#{branch_name}': #{stderr.strip}" unless status.success?
+
+          :deleted
+        end
+
         def commit_info
           sha = run_git_command("rev-parse", "HEAD")
           message = run_git_command("log", "-1", "--pretty=%B")
@@ -121,6 +168,21 @@ module Strata
           false
         end
 
+        def local_branch_exists?(branch_name)
+          _, _, status = Open3.capture3("git", "show-ref", "--verify", "--quiet", "refs/heads/#{branch_name}")
+          status.success?
+        end
+
+        def validate_branch_name!(branch_name)
+          branch_name = branch_name.to_s.strip
+          raise Strata::CommandError, "Branch name is required." if branch_name.empty?
+
+          _, stderr, status = Open3.capture3("git", "check-ref-format", "--branch", branch_name)
+          raise Strata::CommandError, "Invalid branch name '#{branch_name}': #{stderr.strip}" unless status.success?
+
+          branch_name
+        end
+
         def check_requirement_and_exit_if_unavailable(args)
           # Allow help and version commands to work without Git
           command = args.first
@@ -149,6 +211,22 @@ module Strata
           stdout&.strip
         end
 
+        def ensure_git_repo!
+          raise Strata::CommandError, "Not a git repository." unless git_repo?
+        end
+
+        def switch_to_fallback_branch(branch_name, fallback_branches)
+          fallback_branch = fallback_branches.find { |candidate| candidate != branch_name && local_branch_exists?(candidate) }
+
+          unless fallback_branch
+            raise Strata::CommandError,
+              "Cannot delete the currently checked out branch '#{branch_name}'. Check out another branch and try again."
+          end
+
+          _, stderr, status = Open3.capture3("git", "switch", fallback_branch)
+          raise Strata::CommandError, "Failed to switch to '#{fallback_branch}': #{stderr.strip}" unless status.success?
+        end
+
         def parse_diff_output(output)
           output.lines.map do |line|
             parse_diff_status(line.strip)

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

@@ -135,7 +135,10 @@ module Strata
 
           YAML.safe_load_file(lock_path, permitted_classes: [Date, Time], aliases: true) || default_lock_data
         rescue => e
-          warn "Failed to load lock file: #{e.message}" if ENV["DEBUG"]
+          if ENV["DEBUG"]
+            require_relative "../output"
+            Output.print_warning("Failed to load lock file: #{e.message}")
+          end
           default_lock_data
         end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../helpers/color_helper"
 require_relative "../terminal"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -9,10 +9,6 @@ module Strata
       class TestReporter
         include Terminal
 
-        def initialize(color_helper: ColorHelper)
-          @color_helper = color_helper
-        end
-
         def display(test_results, skip_opening_divider: false)
           return unless test_results.is_a?(Hash) && test_results["tests"].is_a?(Array)
 
@@ -22,33 +18,9 @@ module Strata
 
         private
 
-        attr_reader :color_helper
-
-        def say(message, color_helper_result = nil)
-          if color_helper_result
-            if color_helper_result.is_a?(Array)
-              colored_message = ColorHelper.pastel.decorate(message, *color_helper_result)
-              $stdout.puts(colored_message)
-            elsif color_helper_result.is_a?(Symbol)
-              theme = ColorHelper::THEME[color_helper_result]
-              if theme
-                styles = Array(theme)
-                colored_message = ColorHelper.pastel.decorate(message, *styles)
-                $stdout.puts(colored_message)
-              else
-                begin
-                  colored_message = ColorHelper.pastel.send(color_helper_result, message)
-                  $stdout.puts(colored_message)
-                rescue NoMethodError
-                  $stdout.puts(message)
-                end
-              end
-            else
-              $stdout.puts(message)
-            end
-          else
-            $stdout.puts(message)
-          end
+        def say(message, type = nil)
+          shell = Output.shell_for(nil)
+          shell.say(type ? Output.format(type, message) : message)
         end
 
         def display_summary(test_results, skip_opening_divider: false)

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

@@ -29,7 +29,7 @@ module Strata
           update_cache
         rescue
           # Silently fail - version checking should never break the CLI
-          # In development, you might want to log this: warn "Version check failed: #{e.message}"
+          # In development, you might want to log this failure.
           nil
         end
 
@@ -81,15 +81,11 @@ module Strata
         end
 
         def display_update_message(version)
-          require_relative "../helpers/color_helper"
-          colors = ColorHelper
-
           message = "💡 Tip: A new version of #{GEM_NAME} (#{version}) is available. " \
-                    "Update with: #{colors.info("gem update strata-cli")}"
+                    "Update with: #{Output.format(:info, "gem update strata-cli")}"
 
-          # Use Thor's say method for consistent output
-          shell = Thor::Shell::Color.new
-          shell.say "\n#{colors.warning(message)}\n"
+          require_relative "../output"
+          Output.print_warning("\n#{message}\n")
         end
 
         def skip_check?

data/lib/strata/cli/utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "output"
+
 module Strata
   module CLI
     module Utils
@@ -16,7 +18,7 @@ module Strata
       def exit_error_if_not_strata!
         return if CLI.config.strata_project?
 
-        Thor::Shell::Color.new.say_error "ERROR: This is not a valid strata project", :red
+        Output.print_error("ERROR: This is not a valid strata project")
         exit 1
       end
 

data/lib/strata/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Strata
   module CLI
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

data/lib/strata/cli.rb

@@ -9,6 +9,7 @@ require_relative "cli/utils"
 require_relative "cli/utils/git"
 require_relative "cli/utils/version_checker"
 require_relative "cli/error_reporter"
+require_relative "cli/output"
 
 module Strata
   class StrataError < StandardError; end
@@ -37,12 +38,12 @@ module Strata
       begin
         Main.start(args)
       rescue TTY::Reader::InputInterrupt
-        warn "\nCancelled."
+        Output.print_warning("\nCancelled.")
         exit(1)
       rescue => e
         ErrorReporter.log_error(e, context: "strata #{args.join(" ")}")
-        warn "ERROR: #{ErrorReporter.user_message_for(e)}"
-        warn "Hint: See #{ErrorReporter.log_relative_path} for details."
+        Output.print_error("ERROR: #{ErrorReporter.user_message_for(e)}")
+        Output.print_hint("Hint: See #{ErrorReporter.log_relative_path} for details.", stderr: true)
         exit(1)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strata-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ajo Abraham
@@ -247,6 +247,7 @@ files:
 - lib/strata/cli/ai/services/table_generator.rb
 - lib/strata/cli/api/client.rb
 - lib/strata/cli/api/connection_error_handler.rb
+- lib/strata/cli/api/response_error_handler.rb
 - lib/strata/cli/configuration.rb
 - lib/strata/cli/credentials.rb
 - lib/strata/cli/descriptions/create/migration.txt
@@ -288,7 +289,6 @@ files:
 - lib/strata/cli/generators/templates/test.yml
 - lib/strata/cli/generators/test.rb
 - lib/strata/cli/guard.rb
-- lib/strata/cli/helpers/color_helper.rb
 - lib/strata/cli/helpers/command_context.rb
 - lib/strata/cli/helpers/datasource_helper.rb
 - lib/strata/cli/helpers/description_helper.rb
@@ -296,7 +296,9 @@ files:
 - lib/strata/cli/helpers/prompts.rb
 - lib/strata/cli/helpers/table_filter.rb
 - lib/strata/cli/main.rb
+- lib/strata/cli/output.rb
 - lib/strata/cli/sub_commands/audit.rb
+- lib/strata/cli/sub_commands/branch.rb
 - lib/strata/cli/sub_commands/create.rb
 - lib/strata/cli/sub_commands/datasource.rb
 - lib/strata/cli/sub_commands/deploy.rb