makit 0.0.155 → 0.0.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d93befa57f680339009f0de2fb5f05cc21e5568edc0d11b7b353fd286b809947
-  data.tar.gz: 47fc7d425c73719c46a9f6230e001ed07c3c01b3aec5b0600e5b9013606970bd
+  metadata.gz: f53268e68239cd1ff7e167f3f466d58acf594cb4cd4b0f1ac8c2dac7bdc102ed
+  data.tar.gz: fa63343ea47d2a1aba995fe975299d80112fbd1af3d7f68cc670a3d39736a92c
 SHA512:
-  metadata.gz: d9c1bfddaab86e85cc088d30280d1c2d8f1b0e629684b0463eed255d1ae654931136fd7484a1ccd17c62541a00d70aef8fd51b3fcfb381bfeb5fd8f2993e0684
-  data.tar.gz: 9d9b1549633f32e224a2c490b4f9ef228a9bddb4e0a4097ec0a81aff9ca5f1c9c96c074b73dd781d341ac5ddf32553a14e476503df9e5a5288e7c9da0660bf83
+  metadata.gz: 533a7a8f644b8e9367f1e9d428cb66e072df4f08373ed87c627c1d42e0543bffad82fb8ee4103a475651895391f1aba014c06657e74a45c92c50cc26d11df871
+  data.tar.gz: 4d9c0d9af5d3c7987d0ed969a8b49d2cde25eb2883255900adfeb5de735894d59bab2fcb640aea67dfc2fb52fc5e903ed17dbd8769d92698d9caca11e84e2d6d

data/lib/makit/directories.rb

@@ -12,42 +12,62 @@ module Makit
   # This class provide methods for working with the system Environment.
   #
   module Directories
-    ROOT = File.join(Dir.home, ".makit")
-    CLONE = File.join(Dir.home, ".makit", "clone")
-    MAKE = File.join(Dir.home, ".makit", "make")
-    LOG = File.join(Dir.home, ".makit", "log")
-    WORK = File.join(Dir.home, ".makit", "work")
-    REPOS = File.join(Dir.home, ".makit", "repos")
-    TEMP = File.join(Dir.home, ".makit", "temp")
-    INSTALL = File.join(Dir.home, ".makit", "install")
-    NUGET = File.join(Dir.home, ".makit", "nuget")
-    HOME = Makit::Directory.normalize(Dir.home)
-    ONEDRIVE = File.join(Dir.home, "OneDrive")
-    ONEDRIVE_NUGET_SOURCE = File.join(ONEDRIVE, "code", "artifacts", "nuget")
-    ONEDRIVE_CONSOLE_SOURCE = File.join(ONEDRIVE, "code", "artifacts", "console")
-    ONEDRIVE_INSTALLER_SOURCE = File.join(ONEDRIVE, "code", "artifacts", "installer")
-    CURRENT = Dir.pwd
-    LOCAL_APPLICATION_DATA = File.join(HOME, "AppData", "Local")
+    # Helper method to normalize paths to use backslashes on Windows
+    def self.normalize_path(path)
+      return nil if path.nil?
+      return path if path.empty?
+      
+      if Makit::Environment.is_windows?
+        # Convert forward slashes to backslashes on Windows
+        path.gsub(/\//, "\\")
+      else
+        # Keep forward slashes on Unix-like systems
+        path
+      end
+    end
+
+    # Build paths first, then normalize them to handle dependencies
+    _home_path = Makit::Directory.normalize(Dir.home)
+    _onedrive_path = File.join(Dir.home, "OneDrive")
+    _rakedir_path = Dir.pwd
+    
+    ROOT = normalize_path(File.join(Dir.home, ".makit"))
+    CLONE = normalize_path(File.join(Dir.home, ".makit", "clone"))
+    MAKE = normalize_path(File.join(Dir.home, ".makit", "make"))
+    LOG = normalize_path(File.join(Dir.home, ".makit", "log"))
+    WORK = normalize_path(File.join(Dir.home, ".makit", "work"))
+    REPOS = normalize_path(File.join(Dir.home, ".makit", "repos"))
+    TEMP = normalize_path(File.join(Dir.home, ".makit", "temp"))
+    INSTALL = normalize_path(File.join(Dir.home, ".makit", "install"))
+    NUGET = normalize_path(File.join(Dir.home, ".makit", "nuget"))
+    HOME = normalize_path(_home_path)
+    ONEDRIVE = normalize_path(_onedrive_path)
+    ONEDRIVE_NUGET_SOURCE = normalize_path(File.join(_onedrive_path, "code", "artifacts", "nuget"))
+    ONEDRIVE_CONSOLE_SOURCE = normalize_path(File.join(_onedrive_path, "code", "artifacts", "console"))
+    ONEDRIVE_INSTALLER_SOURCE = normalize_path(File.join(_onedrive_path, "code", "artifacts", "installer"))
+    CURRENT = normalize_path(Dir.pwd)
+    LOCAL_APPLICATION_DATA = normalize_path(File.join(_home_path, "AppData", "Local"))
     # Rake.application.init
     # Rake.application.load_rakefile
-    RAKEDIR = Dir.pwd # File.dirname(Rake.application.rakefile)
+    RAKEDIR = normalize_path(_rakedir_path) # File.dirname(Rake.application.rakefile)
 
-    PROJECT_ROOT = Makit::Directory.find_directory_with_patterns(RAKEDIR, ["Rakefile", "rakefile.rb", ".gitignore"])
+    _project_root_path = Makit::Directory.find_directory_with_patterns(_rakedir_path, ["Rakefile", "rakefile.rb", ".gitignore"])
+    PROJECT_ROOT = normalize_path(_project_root_path)
     # PROJECT_ROOT = Makit::Directory.find_directory_with_pattern(RAKEDIR, "Rakefile")
     # PROJECT_ROOT = Makit::Directory.find_directory_with_pattern(RAKEDIR, "rakefile.rb")
     # PROJECT_ROOT = Makit::Directory.find_directory_with_pattern(RAKEDIR, ".gitignore")
-    PROJECT_ARTIFACTS = if PROJECT_ROOT.nil?
+    PROJECT_ARTIFACTS = if _project_root_path.nil?
         nil
       else
-        File.join(PROJECT_ROOT, "artifacts")
+        normalize_path(File.join(_project_root_path, "artifacts"))
       end
-    LOCAL_NUGET_SOURCE = File.join(Dir.home, ".makit", "nuget")
+    LOCAL_NUGET_SOURCE = normalize_path(File.join(Dir.home, ".makit", "nuget"))
     if Makit::Environment.get_os == "Windows"
       # NUGET_PACKAGE_CACHE = "#{ENV["USERPROFILE"]}\\.nuget\\packages"
-      NUGET_PACKAGE_CACHE = File.join(HOME, ".nuget", "packages")
-      SERVICES = File.join("C:", "Program Files")
+      NUGET_PACKAGE_CACHE = normalize_path(File.join(_home_path, ".nuget", "packages"))
+      SERVICES = normalize_path(File.join("C:", "Program Files"))
     else
-      NUGET_PACKAGE_CACHE = Makit::Directory.normalize("#{Dir.home}/.nuget/packages")
+      NUGET_PACKAGE_CACHE = normalize_path(Makit::Directory.normalize("#{Dir.home}/.nuget/packages"))
       SERVICES = if Makit::Environment.get_os == "macOS"
           "/Library/LaunchDaemons"
         else
@@ -56,9 +76,19 @@ module Makit
     end
     if Makit::NuGet.get_latest_version("Grpc.Tools").nil?
       puts "  warning: Grpc.Tools not found in Nuget cache"
+      GRPC_TOOLS_PATH = nil
+      GRPC_CSHARP_PLUGIN_PATH = nil
     else
-      GRPC_TOOLS_PATH = File.join(NUGET_PACKAGE_CACHE, "grpc.tools", Makit::Protoc.get_latest_grpc_tools_version)
-      GRPC_CSHARP_PLUGIN_PATH = Makit::Protoc.find_plugin_path("grpc_csharp_plugin")
+      _grpc_tools_version = Makit::Protoc.get_latest_grpc_tools_version
+      GRPC_TOOLS_PATH = normalize_path(File.join(NUGET_PACKAGE_CACHE, "grpc.tools", _grpc_tools_version))
+      # Now that GRPC_TOOLS_PATH is defined, we can use it in find_plugin_path
+      begin
+        _grpc_csharp_plugin_path = Makit::Protoc.find_plugin_path("grpc_csharp_plugin")
+        GRPC_CSHARP_PLUGIN_PATH = normalize_path(_grpc_csharp_plugin_path)
+      rescue => e
+        # If plugin path can't be found, set to nil
+        GRPC_CSHARP_PLUGIN_PATH = nil
+      end
     end
 
     FileUtils.mkdir_p(ROOT)

data/lib/makit/version.rb

@@ -2,7 +2,7 @@
 
 module Makit
   # Static version for now to avoid circular dependency issues
-  #VERSION = "0.0.155"
+  #VERSION = "0.0.157"
 
   # Version management utilities for various file formats
   #
@@ -62,13 +62,14 @@ module Makit
   #
   class Version
 
-    # Attempt to detect the version from the gemspec file
-    # First tries to find a gemspec in the current project root
+    # Attempt to detect the version from the SSOT (Single Source of Truth) version file
+    # Uses the same logic as Makit::Version.info to find version files in priority order:
+    # *.gemspec, Directory.Build.props, Cargo.toml, package.json, pyproject.toml, pom.xml
     # Falls back to makit.gemspec only if we're in the makit gem directory
-    # @return [String] The version string, or "0.0.0" if no gemspec is found
-    # @raise [RuntimeError] If a gemspec is found but version cannot be detected
+    # @return [String] The version string, or "0.0.0" if no version file is found
+    # @raise [RuntimeError] If a version file is found but version cannot be detected
     def self.version
-      # Try to find gemspec in project root first (for projects using makit)
+      # Try to find version file in project root using SSOT logic (same as Makit::Version.info)
       project_root = begin
         require_relative "directories" unless defined?(Makit::Directories)
         Makit::Directories::PROJECT_ROOT
@@ -76,14 +77,12 @@ module Makit
         find_project_root(Dir.pwd)
       end
 
-      # Look for any .gemspec file in project root
+      # Use SSOT version file detection (supports multiple file types)
       if project_root && Dir.exist?(project_root)
-        gemspec_files = Dir.glob(File.join(project_root, "*.gemspec"))
-        if gemspec_files.any?
-          gemspec = gemspec_files.first
-          gemspec_content = File.read(gemspec)
-          match = gemspec_content.match(/spec\.version\s*=\s*["']([^"']+)["']/)
-          return match[1] if match
+        version_file = find_ssot_version_file(project_root)
+        if version_file && File.exist?(version_file)
+          version = extract_version_from_ssot_file(version_file)
+          return version if version
         end
       end
 
@@ -115,7 +114,7 @@ module Makit
         end
       end
 
-      # If no gemspec found, return default version (for non-gem projects)
+      # If no version file found, return default version (for non-gem projects)
       "0.0.0"
     end
 
@@ -247,13 +246,30 @@ module Makit
       text = File.read(filename)
       #   VERSION = "0.0.138rake" (.rb file)
       new_text = text
-      new_text = text.gsub(/VERSION:\s?['|"]([.\d]+)['|"]/, "VERSION: \"#{version}\"") if filename.include?(".yml")
-      new_text = text.gsub(/version\s?=\s?['|"]([.\d]+)['|"]/, "version='#{version}'") if filename.include?(".gemspec")
-      new_text = text.gsub(/<Version>([-\w\d.]+)</, "<Version>#{version}<") if filename.include?(".csproj")
-      new_text = text.gsub(/<version>([-\w\d.]+)</, "<version>#{version}<") if filename.include?(".nuspec")
-      new_text = text.gsub(/ Version="([\d.]+)"/, " Version=\"#{version}\"") if filename.include?(".wxs")
-      new_text = text.gsub(/VERSION = "([\d.]+)"/, "VERSION = \"#{version}\"") if filename.include?(".rb")
-      new_text = text.gsub(/version\s+=\s+['"]([\w.]+)['"]/, "version=\"#{version}\"") if filename.include?(".toml")
+      new_text = new_text.gsub(/VERSION:\s?['|"]([.\d]+)['|"]/, "VERSION: \"#{version}\"") if filename.include?(".yml")
+      new_text = new_text.gsub(/spec\.version\s*=\s*['"]([^'"]+)['"]/, "spec.version = '#{version}'") if filename.include?(".gemspec")
+      # Handle Directory.Build.props and .csproj files (both use <Version> tag)
+      if filename.include?("Directory.Build.props") || filename.include?(".csproj")
+        new_text = new_text.gsub(/<Version>([-\w\d.]+)</, "<Version>#{version}<")
+      end
+      new_text = new_text.gsub(/<version>([-\w\d.]+)</, "<version>#{version}<") if filename.include?(".nuspec")
+      new_text = new_text.gsub(/ Version="([\d.]+)"/, " Version=\"#{version}\"") if filename.include?(".wxs")
+      new_text = new_text.gsub(/VERSION = "([\d.]+)"/, "VERSION = \"#{version}\"") if filename.include?(".rb")
+      # Handle Cargo.toml, pyproject.toml, and other .toml files
+      if filename.include?(".toml")
+        new_text = new_text.gsub(/version\s+=\s+['"]([\w.]+)['"]/, "version=\"#{version}\"")
+      end
+      # Handle package.json
+      if filename.include?("package.json")
+        require "json"
+        json = JSON.parse(new_text)
+        json["version"] = version
+        new_text = JSON.pretty_generate(json)
+      end
+      # Handle pom.xml
+      if filename.include?("pom.xml")
+        new_text = new_text.gsub(%r{<version>([^<]+)</version>}, "<version>#{version}</version>")
+      end
       File.write(filename, new_text) if new_text != text
     end
 
@@ -321,8 +337,11 @@ module Makit
 
       raise "Version not found in #{version_file}" if version.nil?
 
-      # Display information with relative path
-      relative_path = version_file.sub(project_root + "/", "")
+      # Display information with relative path (Windows-safe path handling)
+      # Normalize both paths to forward slashes for comparison, then convert back if needed
+      normalized_version_file = version_file.gsub(/\\/, "/")
+      normalized_project_root = project_root.gsub(/\\/, "/")
+      relative_path = normalized_version_file.sub(normalized_project_root + "/", "")
       puts "  Version File: #{relative_path}"
       puts "  Version: #{version}"
     end
@@ -393,9 +412,12 @@ module Makit
     # @param project_root [String] Path to the project root directory
     # @return [String, nil] Path to the version file, or nil if not found
     def self.find_ssot_version_file(project_root)
+      # Normalize project_root for file operations (Ruby's File methods work with forward slashes)
+      normalized_root = project_root.gsub(/\\/, "/")
+      
       # 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 = File.expand_path(VERSION_FILE, normalized_root)
         return version_file if File.exist?(version_file)
         warn "  Warning: VERSION_FILE constant points to non-existent file: #{VERSION_FILE}"
       end
@@ -411,7 +433,7 @@ module Makit
       ]
 
       version_file_patterns.each do |pattern|
-        matches = Dir.glob(File.join(project_root, pattern))
+        matches = Dir.glob(File.join(normalized_root, pattern))
         next if matches.empty?
 
         # For gemspec, prefer the one matching the project name or take the first

metadata

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