makit 0.0.153 → 0.0.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f06350e9b4394c8673bf8b13e99da1fbbac3527642dfbfc72ba9bd4de1488f
-  data.tar.gz: e9dec1b8e98c097bbcc5672c98ef9e538ee2c68504d430bde0f01da4c9bbdcb9
+  metadata.gz: ad406746e87035bfd4254571783e18949321ad6e6c4e3fe773fbaf82cb306320
+  data.tar.gz: 1bde5d1063f2de07e559ee3faa5a0cd63aad46a94e4b5676b0f08eca68337b49
 SHA512:
-  metadata.gz: a70943cbd834d30a9bb3f30a37644eb551196afc7af6f2b2ea322720569700dd06db6c086850ffdfb31b00e8a1d2b77dbed3455f7c89f817dca1dbf83c01b094
-  data.tar.gz: 6a4995e84b65dc086ac80844fa83663861bac509b77d5a2b0ce7134162d36115b4259638c1a4dfc71fccd20684362957ef00485f60acd16ff92aaabd48a621a1
+  metadata.gz: 78967fd3ee402daffaec89af96194fee21d7fbc1c8c327309c6463b300c1880c9ee3a993ca72c07f1652183d436f425277cbb2259018d418d365bd2edee34413
+  data.tar.gz: '0281c16cdd5f55e125d757c4d5594f3fedc660f49c211b96302da458cf8eae4286d128208eff3a742dd1586e6555e9619bd5b599c55f361f3427ab61adcc6232'

data/lib/makit/tasks/info.rb

@@ -1,51 +1,199 @@
 # frozen_string_literal: true
 
 require "pathname"
+require "open3"
 
 desc "Display information about the current project"
 task :info do
+  # Start timing for debug logging
+  start_time = Time.now
+  is_debug = Makit::Logging.current_log_level == :debug
+  
+  if is_debug
+    Makit::Logging.debug("rake info task started")
+  end
+  
   # Get verbosity level
   verbosity = Makit::Logging.current_verbosity
 
-  # Get GIT_REMOTE_URL - try multiple sources
-  git_remote_url = if defined?(GIT_REMOTE_URL)
+  # Get GIT_REMOTE_URL - try multiple sources (optimized: check constant first, avoid slow operations)
+  git_remote_url_start = Time.now if is_debug
+  git_remote_url = if defined?(GIT_REMOTE_URL) && !GIT_REMOTE_URL.nil? && !GIT_REMOTE_URL.empty?
     GIT_REMOTE_URL
-  elsif Makit::Git.git_repo?
-    Makit::Git.get_remote_url
+  elsif Dir.exist?(".git") || File.exist?(".git")
+    # Fast check: directly check for .git directory/file instead of calling Makit::Git.git_repo?
+    # which executes multiple git commands. Then directly get remote URL.
+    begin
+      # Direct git command execution - much faster than going through repository state
+      remote_url_output, _stderr, status = Open3.capture3('git', 'remote', 'get-url', 'origin')
+      if status.success? && remote_url_output && !remote_url_output.strip.empty?
+        remote_url_output.strip
+      else
+        nil
+      end
+    rescue
+      nil
+    end
+  elsif File.exist?(".makit.json")
+    # Only load project config if .makit.json exists (avoid creating it unnecessarily)
+    begin
+      project = Makit::Configuration::Project.default
+      project.git_remote_url unless project.git_remote_url.nil? || project.git_remote_url.empty?
+    rescue
+      nil
+    end
   else
-    project = Makit::Configuration::Project.default
-    project.git_remote_url unless project.git_remote_url.nil? || project.git_remote_url.empty?
+    nil
+  end
+  if is_debug
+    elapsed = Time.now - git_remote_url_start
+    Makit::Logging.debug("GIT_REMOTE_URL lookup took #{sprintf('%.3f', elapsed)} seconds")
   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)'
+  # Get VERSION and VERSION_FILE - using same logic as rake version
+  # This ensures consistency between rake info and rake version
+  # Optimized: Use Makit::Directories::PROJECT_ROOT directly, check specific files before glob
+  version_start = Time.now if is_debug
+  version_file = nil
+  version = nil
+  
+  begin
+    # Use Makit::Directories::PROJECT_ROOT directly (already loaded, fast)
+    project_root = Makit::Directories::PROJECT_ROOT
     
-    # 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)"
+    if project_root && Dir.exist?(project_root)
+      # Check for manually defined VERSION_FILE constant first
+      if defined?(VERSION_FILE) && !VERSION_FILE.nil?
+        version_file = File.expand_path(VERSION_FILE, project_root)
+        version_file = nil unless File.exist?(version_file)
+      end
+      
+      # If no VERSION_FILE constant, search for common version files
+      # Optimized: Check specific files first (fast File.exist?) before using glob (slower)
+      unless version_file
+        # Check specific files first (much faster than glob patterns)
+        specific_files = [
+          "Directory.Build.props",
+          "Cargo.toml",
+          "package.json",
+          "pyproject.toml",
+          "pom.xml"
+        ]
+        
+        specific_files.each do |filename|
+          file_path = File.join(project_root, filename)
+          if File.exist?(file_path)
+            version_file = file_path
+            break
           end
         end
-      rescue
-        # Silently fail if we can't determine default branch
+        
+        # Only use glob for gemspec if no specific file found (glob can be slow on large dirs)
+        unless version_file
+          gemspec_matches = Dir.glob(File.join(project_root, "*.gemspec"))
+          version_file = gemspec_matches.first unless gemspec_matches.empty?
+        end
+      end
+      
+      # Extract version from the file if found (same logic as Makit::Version.extract_version_from_ssot_file)
+      if version_file && File.exist?(version_file)
+        case File.basename(version_file)
+        when /\.gemspec$/
+          content = File.read(version_file)
+          match = content.match(/spec\.version\s*=\s*["']([^"']+)["']/)
+          version = match[1] if match
+        when "Directory.Build.props"
+          content = File.read(version_file)
+          match = content.match(%r{<Version>([^<]+)</Version>})
+          version = match[1] if match
+        when "Cargo.toml"
+          content = File.read(version_file)
+          match = content.match(/version\s*=\s*["']([^"']+)["']/)
+          version = match[1] if match
+        when "package.json"
+          require "json"
+          json = JSON.parse(File.read(version_file))
+          version = json["version"]
+        when "pyproject.toml"
+          content = File.read(version_file)
+          match = content.match(/\[project\]\s*version\s*=\s*["']([^"']+)["']/)
+          version = match[1] if match
+          unless version
+            match = content.match(/\[tool\.poetry\]\s*version\s*=\s*["']([^"']+)["']/)
+            version = match[1] if match
+          end
+        when "pom.xml"
+          content = File.read(version_file)
+          match = content.match(%r{<version>([^<]+)</version>})
+          version = match[1] if match
+        end
+        
+        # Convert to relative path for display (same as Makit::Version.info)
+        if version_file && project_root
+          # Normalize paths to use forward slashes for consistency (Windows-safe)
+          normalized_version_file = version_file.gsub(/\\/, "/")
+          normalized_project_root = project_root.gsub(/\\/, "/")
+          version_file = normalized_version_file.sub(normalized_project_root + "/", "")
+        end
       end
     end
-    
-    current_branch
+  rescue => e
+    # Silently handle errors - fall back to VERSION constant
+  end
+  
+  # Fallback to Rakefile VERSION constant or Makit::Version.version if no version file found
+  unless version
+    version = defined?(VERSION) ? VERSION : Makit::Version.version
+  end
+  if is_debug
+    elapsed = Time.now - version_start
+    Makit::Logging.debug("VERSION and VERSION_FILE lookup took #{sprintf('%.3f', elapsed)} seconds")
+  end
+
+  # Get BRANCH - from git if available (optimized, Windows-safe)
+  # Reuse git repo check from GIT_REMOTE_URL lookup to avoid duplicate check
+  branch_start = Time.now if is_debug
+  branch = if git_remote_url || Dir.exist?(".git") || File.exist?(".git")
+    # Fast check: directly execute git branch command instead of calling Makit::Git.branch
+    # which executes the expensive get_repository_state with multiple git commands
+    begin
+      branch_output, _stderr, status = Open3.capture3('git', 'branch', '--show-current')
+      current_branch = if status.success? && branch_output && !branch_output.strip.empty?
+        branch_output.strip
+      else
+        '(unknown)'
+      end
+      
+      # Check if current branch is the default branch (Windows-safe error handling)
+      if current_branch != '(unknown)'
+        begin
+          # Get default branch from remote (Windows-safe: use Open3 for proper error handling)
+          default_branch_output, _stderr, status = Open3.capture3('git', 'symbolic-ref', 'refs/remotes/origin/HEAD')
+          if status.success? && default_branch_output && !default_branch_output.strip.empty?
+            default_branch = default_branch_output.strip.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
+    rescue
+      '(unknown)'
+    end
   else
     '(not a git repo)'
   end
+  if is_debug
+    elapsed = Time.now - branch_start
+    Makit::Logging.debug("BRANCH lookup took #{sprintf('%.3f', elapsed)} seconds")
+  end
 
   # Display information with colors
+  display_start = Time.now if is_debug
   name_color = :grey
   value_color = :green
   label_width = 20  # Fixed width for label column
@@ -61,6 +209,12 @@ task :info do
   value2 = version.to_s.colorize(value_color)
   puts "  #{label2} #{value2}"
   
+  if version_file
+    label_version_file = 'VERSION_FILE'.rjust(label_width).colorize(name_color)
+    value_version_file = version_file.colorize(value_color)
+    puts "  #{label_version_file} #{value_version_file}"
+  end
+  
   label3 = 'BRANCH'.rjust(label_width).colorize(name_color)
   value3 = branch.colorize(value_color)
   puts "  #{label3} #{value3}"
@@ -107,30 +261,29 @@ task :info do
       # Silently handle errors loading project info
     end
 
-    # Git section
-    if Makit::Git.git_repo?
+    # Git section (optimized: reuse branch from main section, avoid expensive git operations)
+    if branch && branch != '(not a git repo)'
       begin
-        verbose_branch = Makit::Git.branch || '(unknown)'
+        # Reuse branch from main section (already optimized)
+        verbose_branch = branch
         
-        # 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
+        # Get git status and commit info (optimized: direct git commands instead of get_repository_state)
+        begin
+          # Check if clean using direct git command (faster than Makit::Git.clean?)
+          status_output, _stderr, status = Open3.capture3('git', 'status', '--porcelain')
+          status = status.success? && status_output.strip.empty? ? 'clean' : 'dirty'
+        rescue
+          status = 'unknown'
         end
         
-        status = Makit::Git.clean? ? 'clean' : 'dirty'
-        commit = Makit::Git.commitsha
-        commit_display = commit ? commit[0, 7] : '(unknown)'
+        begin
+          # Get commit SHA using direct git command (faster than Makit::Git.commitsha)
+          commit_output, _stderr, commit_status = Open3.capture3('git', 'rev-parse', 'HEAD')
+          commit = commit_status.success? && commit_output ? commit_output.strip : nil
+          commit_display = commit ? commit[0, 7] : '(unknown)'
+        rescue
+          commit_display = '(unknown)'
+        end
 
         puts ""
         puts "Git:".colorize(:cyan)
@@ -194,6 +347,17 @@ task :info do
       # Silently handle errors loading paths info
     end
   end
+  
+  if is_debug
+    display_elapsed = Time.now - display_start
+    Makit::Logging.debug("Display operations took #{sprintf('%.3f', display_elapsed)} seconds")
+  end
+  
+  # Log total execution time in debug mode
+  if is_debug
+    elapsed_time = Time.now - start_time
+    Makit::Logging.debug("rake info task completed in #{sprintf('%.3f', elapsed_time)} seconds")
+  end
 end
 
 # Helper method to display a field with consistent formatting

data/lib/makit/version.rb

@@ -2,7 +2,7 @@
 
 module Makit
   # Static version for now to avoid circular dependency issues
-  #VERSION = "0.0.153"
+  #VERSION = "0.0.154"
 
   # Version management utilities for various file formats
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.153
+  version: 0.0.154
 platform: ruby
 authors:
 - Lou Parslow