strata-cli 0.1.7 → 0.1.9

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

@@ -4,6 +4,8 @@ require_relative "group"
 require_relative "datasource"
 require_relative "../helpers/project_helper"
 require_relative "../api/connection_error_handler"
+require_relative "../api/response_error_handler"
+require_relative "../output"
 require "faraday"
 require "json"
 require "uri"
@@ -13,6 +15,7 @@ module Strata
     module Generators
       class Project < Group
         include API::ConnectionErrorHandler
+        include API::ResponseErrorHandler
 
         BASE_SERVER_URL = "http://localhost:3000"
 
@@ -20,6 +23,7 @@ module Strata
         class_option :datasource, type: :string, repeatable: true
         class_option :source, type: :string
         class_option :api_key, type: :string
+        class_option :verbose, type: :boolean, default: false, desc: "Show detailed init output (file-by-file actions)."
 
         desc "Generates a new Strata project."
 
@@ -111,8 +115,8 @@ module Strata
           return if cloned_from_git?
           return if options.key?(:datasource) # Already specified via CLI option
 
-          say "\n", :white
-          say_status :setup, "Let's configure your first datasource", :cyan
+          print_status(:setup, "Let's configure your first datasource", type: :info)
+          print_info("\n")
 
           # Change into the project directory and run the existing add command
           inside(uid) do
@@ -122,12 +126,12 @@ module Strata
         end
 
         def completion_message
-          say "\n✔ Strata project '#{uid}' is ready!", :green
-          say "\nNext steps:", :yellow
-          say "  1. cd #{uid}", :cyan
-          say "  2. strata datasource add      # To add more datasources", :cyan
-          say "  3. strata create table      # Start adding tables", :cyan
-          say "\n"
+          Output.print_success("\n✔ Strata project '#{uid}' is ready!", context: self)
+          Output.print_warning("\nNext steps:", context: self)
+          Output.print_info("  1. cd #{uid}", context: self)
+          Output.print_info("  2. strata datasource add      # To add more datasources", context: self)
+          Output.print_info("  3. strata create table      # Start adding tables", context: self)
+          Output.print_info("\n", context: self)
         end
 
         private
@@ -148,19 +152,22 @@ module Strata
 
           unless response.success?
             raise Strata::CommandError,
-              "Failed to fetch project info from #{options[:source]}. Status: #{response.status}"
+              response_error_message(
+                response,
+                default_message: "Failed to fetch project info from #{options[:source]}. Status: #{response.status}."
+              )
           end
 
           response.body
         end
 
         def clone_project(git_url)
-          say_status :clone, "Cloning project from #{git_url}", :green
+          Output.print_status(:clone, "Cloning project from #{git_url}", type: :success, context: self)
           run "git clone #{git_url} #{uid}", verbose: false, capture: true
 
           raise Strata::CommandError, "Failed to clone repository from #{git_url}" unless File.directory?(uid)
 
-          say_status :success, "Project cloned successfully", :green
+          Output.print_status(:success, "Project cloned successfully", type: :success, context: self)
         end
 
         def persist_project_id_to_project_yml

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

@@ -3,6 +3,7 @@
 require_relative "group"
 require "yaml"
 require "fileutils"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -26,7 +27,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/generators/table.rb

@@ -2,6 +2,7 @@
 
 require_relative "group"
 require "yaml"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -43,7 +44,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
@@ -101,8 +102,9 @@ module Strata
             # Normalize hash keys to symbols for consistent access
             normalized = normalize_field_hash(field)
 
+            field_type = normalized[:schema_type] || "dimension"
             field_hash = {
-              "type" => normalized[:schema_type] || "dimension",
+              "type" => field_type,
               "name" => normalized[:name],
               "description" => normalized[:description],
               "data_type" => normalized[:data_type]
@@ -112,12 +114,7 @@ module Strata
             field_hash["synonyms"] = synonyms if synonyms.is_a?(Array) && !synonyms.empty?
 
             # Build expression with proper nested format
-            expr = normalized[:expression]
-            field_hash["expression"] = {
-              "lookup" => true,
-              "sql" => expr
-            }
-
+            field_hash["expression"] = {"sql" => normalized[:expression], "lookup" => field_type.to_s.casecmp("dimension").zero?}
             field_hash
           end
 

data/lib/strata/cli/generators/templates/adapters/databricks.yml

@@ -33,10 +33,11 @@
   # Optional: default schema within that catalog (often "default")
   schema: default
 
-  # OAuth M2M (service principal) is implicit for this adapter in dwh.
-  # Do not set auth_mode here.
+  # Required: Authentication mode
+  # oauth_m2m: service principal (client_credentials)
+  auth_mode: oauth_m2m
   #
-  # Set credentials securely (oauth_client_id + oauth_client_secret) via:
+  # Set credentials securely via:
   #   `strata ds auth <%= @ds_key %>`
   # or they are collected when you run `strata datasource add databricks`.
   #

data/lib/strata/cli/generators/templates/adapters/snowflake.yml

@@ -33,15 +33,9 @@
   # Optional: Role name
   role: ACCOUNTADMIN
 
-  # Required: Authentication mode - one of: pat, kp, oauth
+  # Required: Authentication mode - one of: pat, kp
   # pat: personal_access_token
   # kp: key pair (requires username)
-  # oauth: OAuth (requires setup on snowflake to enable)
-  #   Additional required params
-  #   oauth_client_id: <MYCLIENTID>
-  #   oauth_cleint_secret: <MYCLIENTSECRET>
-  #   oauth_redirect_uri: https://localhost:3420/callback
-  #   oauth_scope: <SCOPE> # optional
   auth_mode: pat
 
   # For Personal Access Token (PAT) authentication:
@@ -53,17 +47,3 @@
   # For Key Pair (KP) authentication, uncomment and set:
   # username: john_doe
   # private_key: /path/to/private_key.pem
-
-  # For OAuth authentication, additional setup required.
-  # https://docs.snowflake.com/en/user-guide/oauth-custom
-  #
-  # Securely save tokens in .strata by running:
-  #   `strata ds auth <%= @ds_key %>`
-  #
-  # This would only work if your snowflake setup allows modification
-  # of the redirect url. Otherwise, you can get access_token and 
-  # refresh_token by other means. Then add it to .strata like so:
-  #
-  # access_token: wrwerjwrljwer
-  # refresh_token: erwerewrwer
-  # expires_at: <%= Time.now %>

data/lib/strata/cli/generators/templates/table.table_name.yml

@@ -92,7 +92,7 @@ fields:
   #   # Required: Defines how this field will query this table
   #   expresssion:
   #     primary_key: true|false (optional)
-  #     lookup: true|false (optional)
+  #     lookup: true|false (optional, dimensions only)
   #     array: true|false  (optional)
   #     sql: my_field_column (Required)
   #

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