makit 0.0.154 → 0.0.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad406746e87035bfd4254571783e18949321ad6e6c4e3fe773fbaf82cb306320
-  data.tar.gz: 1bde5d1063f2de07e559ee3faa5a0cd63aad46a94e4b5676b0f08eca68337b49
+  metadata.gz: 99cc5b06f424c7833c2828dbbd4df8f1cda290cc900aae825f319467cd39d0fc
+  data.tar.gz: 48ad2c45a2d1b2a9b4ba223c1915ddb6a834b3e826b16e1c430f957edcfca6b9
 SHA512:
-  metadata.gz: 78967fd3ee402daffaec89af96194fee21d7fbc1c8c327309c6463b300c1880c9ee3a993ca72c07f1652183d436f425277cbb2259018d418d365bd2edee34413
-  data.tar.gz: '0281c16cdd5f55e125d757c4d5594f3fedc660f49c211b96302da458cf8eae4286d128208eff3a742dd1586e6555e9619bd5b599c55f361f3427ab61adcc6232'
+  metadata.gz: 9e35a52ee45fd084f4b8e0811a67231cd7c001b56c6d861bad1a7334884b8ba1645b83969cf2b910285a8b61417b1427e6e13aeb07be3b7c6b9944ac9be773f5
+  data.tar.gz: 4e21ae3c58f2b196a2185fe2b1a94f3b57cb685d8026b0d4e31bd08fa3ac9657326ce82452969fc413f199495e7e9c1780f295c7374368cca511a1f27c9b0701

data/lib/makit/tasks/tag.rb

@@ -3,13 +3,24 @@
 if Dir.exist?(".git")
   desc "tag the current version"
   task :tag do
-    # check if the variable VERSION is defined
-    unless defined?(VERSION)
-      puts "  VERSION is not defined".colorize(:red)
+    # Get version: use VERSION constant if defined, otherwise use Makit::Version.version
+    version = if defined?(VERSION) && !VERSION.nil?
+      VERSION
+    else
+      begin
+        Makit::Version.version
+      rescue => e
+        puts "  Could not determine version: #{e.message}".colorize(:red)
+        return
+      end
+    end
+
+    if version.nil? || version.to_s.strip.empty?
+      puts "  Version is empty or not found".colorize(:red)
       return
     end
 
-    Makit::Git::CLI.tag(VERSION)
+    Makit::Git::CLI.tag(version)
   end
 else
   Makit::Logging.default_logger.debug("Not a git repository, skipping tag")

data/lib/makit/version.rb

@@ -2,7 +2,7 @@
 
 module Makit
   # Static version for now to avoid circular dependency issues
-  #VERSION = "0.0.154"
+  #VERSION = "0.0.156"
 
   # 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
 

metadata

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