origen 0.60.13 → 0.60.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3408435ae10ed4cc31520264005758fb73fb91a71e41086858431d4cdc2c5e82
-  data.tar.gz: d7d83e77dd28aef626400c8aad00bd157c28a2a186bcdb48e3524528880cc61f
+  metadata.gz: 72edbb6af81e08f3dae27340b8adb75a2bd0a328e24b398c7c493923e568fff5
+  data.tar.gz: '0711789ba34b72bf554ff6b57af5772229a36dd2d0dbbeae35f307c660c45d78'
 SHA512:
-  metadata.gz: b9cdf723d902c6ee28ff7f3d5b1d546742fda571e231a0da3ede7d5484c34dbdebe516b850de0d495779839dea5d0f16295c01881339b58192747f2e6081ff63
-  data.tar.gz: ac4789f3452011b504ea7335e2a851be13f8a9e55773848b88dc84115a58fff868583ce72be22c9d4899bc1b2a8bb3626b5a674d5c9b651e7a3c87d6539a847e
+  metadata.gz: b30d5368c8ac8c113047ac370d874db601b8b32cdbb6f0f5389b0d44b29140a06d1c782e5198a895b13f22928f45a90bd3c1a79815718c7319ee9b4f83cf7735
+  data.tar.gz: 59c09425ebf952b780a4bd7b6992185b0db5df2e6582bbd5fe9b3ebf4c8121e14783376c5481aec026441612a04f889145c66204d787a7efb1c8f801acb5807c

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 60
-  BUGFIX = 13
+  BUGFIX = 14
   DEV = nil
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
 end

data/lib/origen/remote_manager.rb

@@ -139,13 +139,13 @@ module Origen
           if File.exist?("#{dir}/.initial_populate_successful")
             FileUtils.rm_f(version_file) if File.exist?(version_file)
             rc = RevisionControl.new remote: rc_url, local: dir
-            rc.send rc.remotes_method, version: prefix_tag(tag), force: true
+            rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
             File.open(version_file, 'w') do |f|
               f.write tag
             end
           else
             rc = RevisionControl.new remote: rc_url, local: dir
-            rc.send rc.remotes_method, version: prefix_tag(tag), force: true
+            rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
             FileUtils.touch "#{dir}/.initial_populate_successful"
             File.open(version_file, 'w') do |f|
               f.write tag
@@ -342,13 +342,13 @@ module Origen
             if File.exist?("#{dir}/.initial_populate_successful")
               FileUtils.rm_f(version_file) if File.exist?(version_file)
               rc = RevisionControl.new remote: rc_url, local: dir
-              rc.send rc.remotes_method, version: prefix_tag(tag), force: true
+              rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
               File.open(version_file, 'w') do |f|
                 f.write tag
               end
             else
               rc = RevisionControl.new remote: rc_url, local: dir
-              rc.send rc.remotes_method, version: prefix_tag(tag), force: true
+              rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
               FileUtils.touch "#{dir}/.initial_populate_successful"
               File.open(version_file, 'w') do |f|
                 f.write tag
@@ -382,10 +382,14 @@ module Origen
     end
 
     # If the supplied tag looks like a semantic version number, then make sure it has the
-    # 'v' prefix
-    def prefix_tag(tag)
+    # 'v' prefix unless the remote has explicitly disallowed the prefix
+    def prefix_tag(tag, remote = {})
+      remote = {
+        disable_tag_prefix: false
+      }.merge(remote)
+
       tag = Origen::VersionString.new(tag)
-      if tag.semantic?
+      if tag.semantic? && !remote[:disable_tag_prefix]
         tag.prefixed
       else
         tag

data/lib/origen/revision_control/git.rb

@@ -47,7 +47,9 @@ module Origen
 
         version = options[:version] || current_branch
 
-        if version == 'HEAD'
+        # Not trying to do a VersionString comparison, just determine if the
+        # string literal value of version == HEAD, hence the .to_s call
+        if version.to_s == 'HEAD'
           puts "Sorry, but you are not currently on a branch and I don't know which branch you want to checkout"
           puts 'Please supply a branch name as the version to checkout the latest version of it, e.g. origen rc co -v develop'
           exit 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.60.13
+  version: 0.60.14
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport