makit 0.0.147 → 0.0.153

data/lib/makit/secrets.rb

@@ -1,51 +1,16 @@
 # frozen_string_literal: true
 
-module Makit
-  class Secrets
-    def add(key, value)
-      secrets_hash = get_secrets_hash
-      secrets_hash[key] = value
-      save_secrets_hash(secrets_hash)
-    end
-
-    def remove(key)
-      secrets_hash = get_secrets_hash
-      secrets_hash.delete(key)
-      save_secrets_hash(secrets_hash)
-    end
-
-    def has_key?(key)
-      secrets_hash = get_secrets_hash
-      secrets_hash.key?(key)
-    end
-
-    def get(key)
-      secrets_hash = get_secrets_hash
-      secrets_hash[key]
-    end
+require_relative "secrets/local_secrets"
+require_relative "secrets/secrets_manager"
 
-    def set(key, value)
-      secrets_hash = get_secrets_hash
-      secrets_hash[key] = value
-      save_secrets_hash(secrets_hash)
-    end
-
-    def get_secrets_filename
-      "#{Makit::Directories::ROOT}/secrets.json"
-    end
-
-    def get_secrets_hash
-      secrets_file = get_secrets_filename
-      return {} unless File.exist?(secrets_file)
-
-      text = File.read(secrets_file)
-      JSON.parse(text)
-    end
-
-    def save_secrets_hash(hash)
-      secrets_file = get_secrets_filename
-      # pretty print the hash
-      File.open(secrets_file, "w") { |f| f.puts JSON.pretty_generate(hash) }
+module Makit
+  module Secrets
+    # Module for secrets management
+    # Contains LocalSecrets and SecretsManager classes
+    
+    # Backward compatibility: Factory method to create a SecretsManager instance
+    def self.new
+      SecretsManager.new
     end
   end
 end

data/lib/makit/tasks/bump.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+desc "Bump the patch version and display updated version information"
+task :bump do
+  Makit::Version.bump
+  Makit::Version.info
+end

data/lib/makit/tasks/info.rb

@@ -0,0 +1,204 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+desc "Display information about the current project"
+task :info do
+  # Get verbosity level
+  verbosity = Makit::Logging.current_verbosity
+
+  # Get GIT_REMOTE_URL - try multiple sources
+  git_remote_url = if defined?(GIT_REMOTE_URL)
+    GIT_REMOTE_URL
+  elsif Makit::Git.git_repo?
+    Makit::Git.get_remote_url
+  else
+    project = Makit::Configuration::Project.default
+    project.git_remote_url unless project.git_remote_url.nil? || project.git_remote_url.empty?
+  end
+
+  # Get VERSION - from Rakefile constant
+  version = defined?(VERSION) ? VERSION : Makit::Version.version
+
+  # Get BRANCH - from git if available
+  branch = if Makit::Git.git_repo?
+    current_branch = Makit::Git.branch || '(unknown)'
+    
+    # Check if current branch is the default branch
+    if current_branch != '(unknown)'
+      begin
+        # Get default branch from remote
+        default_branch_output = `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null`.strip
+        if default_branch_output && !default_branch_output.empty?
+          default_branch = default_branch_output.sub('refs/remotes/origin/', '')
+          if current_branch == default_branch
+            current_branch = "#{current_branch} (default)"
+          end
+        end
+      rescue
+        # Silently fail if we can't determine default branch
+      end
+    end
+    
+    current_branch
+  else
+    '(not a git repo)'
+  end
+
+  # Display information with colors
+  name_color = :grey
+  value_color = :green
+  label_width = 20  # Fixed width for label column
+  
+  git_remote_display = git_remote_url || '(not set)'
+  
+  # Always show basic info
+  label1 = 'GIT_REMOTE_URL'.rjust(label_width).colorize(name_color)
+  value1 = git_remote_display.colorize(value_color)
+  puts "  #{label1} #{value1}"
+  
+  label2 = 'VERSION'.rjust(label_width).colorize(name_color)
+  value2 = version.to_s.colorize(value_color)
+  puts "  #{label2} #{value2}"
+  
+  label3 = 'BRANCH'.rjust(label_width).colorize(name_color)
+  value3 = branch.colorize(value_color)
+  puts "  #{label3} #{value3}"
+
+  # Show LOG_LEVEL and VERBOSITY for normal and above
+  if [:normal, :verbose, :debug].include?(verbosity)
+    log_level = Makit::Logging.current_log_level.to_s
+    verbosity_str = verbosity.to_s
+    
+    label4 = 'LOG_LEVEL'.rjust(label_width).colorize(name_color)
+    value4 = log_level.colorize(value_color)
+    puts "  #{label4} #{value4}"
+    
+    label5 = 'VERBOSITY'.rjust(label_width).colorize(name_color)
+    value5 = verbosity_str.colorize(value_color)
+    puts "  #{label5} #{value5}"
+  end
+
+  # Show additional sections for verbose and debug
+  if [:verbose, :debug].include?(verbosity)
+    # Project section
+    begin
+      project = Makit::Configuration::Project.default
+      project_root = Makit::Directories::PROJECT_ROOT
+      project_root_display = if project_root && Dir.exist?(project_root)
+        # Show relative path if possible
+        begin
+          Pathname.new(project_root).relative_path_from(Pathname.new(Dir.pwd)).to_s
+        rescue
+          project_root
+        end
+      else
+        '(not found)'
+      end
+
+      puts ""
+      puts "Project:".colorize(:cyan)
+      display_field('NAME', project.name || '(not set)', label_width, name_color, value_color)
+      display_field('TYPE', project.project_type || '(not set)', label_width, name_color, value_color)
+      display_field('ROOT', project_root_display, label_width, name_color, value_color)
+      display_field('AUTHORS', project.authors || '(not set)', label_width, name_color, value_color)
+      display_field('LICENSE', project.license_expression || '(not set)', label_width, name_color, value_color)
+    rescue => e
+      # Silently handle errors loading project info
+    end
+
+    # Git section
+    if Makit::Git.git_repo?
+      begin
+        verbose_branch = Makit::Git.branch || '(unknown)'
+        
+        # Check if current branch is the default branch
+        if verbose_branch != '(unknown)'
+          begin
+            # Get default branch from remote
+            default_branch_output = `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null`.strip
+            if default_branch_output && !default_branch_output.empty?
+              default_branch = default_branch_output.sub('refs/remotes/origin/', '')
+              if verbose_branch == default_branch
+                verbose_branch = "#{verbose_branch} (default)"
+              end
+            end
+          rescue
+            # Silently fail if we can't determine default branch
+          end
+        end
+        
+        status = Makit::Git.clean? ? 'clean' : 'dirty'
+        commit = Makit::Git.commitsha
+        commit_display = commit ? commit[0, 7] : '(unknown)'
+
+        puts ""
+        puts "Git:".colorize(:cyan)
+        display_field('BRANCH', verbose_branch, label_width, name_color, value_color)
+        display_field('STATUS', status, label_width, name_color, value_color)
+        display_field('COMMIT', commit_display, label_width, name_color, value_color)
+      rescue => e
+        # Silently handle errors loading git info
+      end
+    end
+
+    # Environment section
+    begin
+      ruby_version = RUBY_VERSION
+      os = Makit::Environment.get_os || '(unknown)'
+      makit_version = Makit::Version.version rescue '0.0.0'
+
+      puts ""
+      puts "Environment:".colorize(:cyan)
+      display_field('RUBY_VERSION', ruby_version, label_width, name_color, value_color)
+      display_field('OS', os, label_width, name_color, value_color)
+      display_field('MAKIT_VERSION', makit_version, label_width, name_color, value_color)
+    rescue => e
+      # Silently handle errors loading environment info
+    end
+  end
+
+  # Show debug-only sections
+  if verbosity == :debug
+    # Secrets section
+    begin
+      secrets_manager = Makit::Secrets.new
+      backend_type = secrets_manager.instance_variable_get(:@secrets_backend).class.name.split("::").last
+      secrets_file = secrets_manager.get_secrets_filename rescue nil
+      secrets_hash = secrets_manager.get_secrets_hash rescue {}
+      secret_count = secrets_hash.keys.count rescue 0
+
+      puts ""
+      puts "Secrets:".colorize(:cyan)
+      display_field('BACKEND', backend_type, label_width, name_color, value_color)
+      if secrets_file
+        display_field('SECRETS_FILE', secrets_file, label_width, name_color, value_color)
+      end
+      display_field('SECRET_COUNT', secret_count.to_s, label_width, name_color, value_color)
+    rescue => e
+      # Silently handle errors loading secrets info
+    end
+
+    # Paths section
+    begin
+      log_dir = Makit::Directories::LOG
+      artifacts_dir = Makit::Directories::PROJECT_ARTIFACTS || '(not set)'
+      project_root = Makit::Directories::PROJECT_ROOT || '(not found)'
+
+      puts ""
+      puts "Paths:".colorize(:cyan)
+      display_field('LOG_DIR', log_dir, label_width, name_color, value_color)
+      display_field('ARTIFACTS', artifacts_dir, label_width, name_color, value_color)
+      display_field('PROJECT_ROOT', project_root, label_width, name_color, value_color)
+    rescue => e
+      # Silently handle errors loading paths info
+    end
+  end
+end
+
+# Helper method to display a field with consistent formatting
+def display_field(label, value, label_width, name_color, value_color)
+  label_str = label.rjust(label_width).colorize(name_color)
+  value_str = value.to_s.colorize(value_color)
+  puts "  #{label_str} #{value_str}"
+end

data/lib/makit/tasks/integrate.rb

@@ -3,9 +3,36 @@
 require_relative "../git/repository"
 
 if Dir.exist?(".git")
-  desc "Integrate changes into the git repository."
+  desc "Integrate changes into the git repository (only runs on default branch)."
   task :integrate do
     Makit::Logging.default_logger.task_start("integrate")
+    
+    # Check if we're on the default branch
+    current_branch = Makit::Git.branch
+    if current_branch.nil? || current_branch.empty?
+      Makit::Logging.default_logger.info("Skipping integrate: cannot determine current branch")
+      next
+    end
+    
+    # Get default branch from remote
+    default_branch = nil
+    begin
+      default_branch_output = `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null`.strip
+      if default_branch_output && !default_branch_output.empty?
+        default_branch = default_branch_output.sub('refs/remotes/origin/', '')
+      end
+    rescue
+      # If we can't determine default branch, assume it's 'main'
+      default_branch = 'main'
+    end
+    
+    # Skip if not on default branch
+    if current_branch != default_branch
+      Makit::Logging.default_logger.info("Skipping integrate: not on default branch (current: #{current_branch}, default: #{default_branch || 'unknown'})")
+      next
+    end
+    
+    # Proceed with integration
     unstaged_files = Makit::Git::Repository.unstaged_files
     untracked_files = Makit::Git::Repository.untracked_files
     if unstaged_files.length.positive? || untracked_files.length.positive?

data/lib/makit/tasks/secrets.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+desc "Display a list of available secret names"
+task :secrets do
+  Makit::Secrets.new.info
+end
+

data/lib/makit/tasks/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+desc "Display version information for the current project"
+task :version do
+  Makit::Version.info
+end

data/lib/makit/tasks.rb

@@ -18,3 +18,7 @@ require_relative "tasks/setup"
 require_relative "tasks/test"
 require_relative "tasks/format"
 require_relative "tasks/update"
+require_relative "tasks/version"
+require_relative "tasks/bump"
+require_relative "tasks/secrets"
+require_relative "tasks/info"

data/lib/makit/v1/configuration/project_service_impl.rb

@@ -77,7 +77,7 @@ module Makit
               license_expression: "MIT",
               steps: []
             )
-            Makit::Logging.default_logger.warn("Project not configured")
+            #Makit::Logging.default_logger.warn("Project not configured")
             project
           end
         rescue StandardError => e