origen 0.60.13 → 0.60.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3408435ae10ed4cc31520264005758fb73fb91a71e41086858431d4cdc2c5e82
-  data.tar.gz: d7d83e77dd28aef626400c8aad00bd157c28a2a186bcdb48e3524528880cc61f
+  metadata.gz: 26003c462310b20599cefc143e3ccdd84896a52de79a80e3b6561f2e0c9619d0
+  data.tar.gz: 067676d06f39e6d5ba3480b6a8348157e577547d4f89628cd02d909a265560df
 SHA512:
-  metadata.gz: b9cdf723d902c6ee28ff7f3d5b1d546742fda571e231a0da3ede7d5484c34dbdebe516b850de0d495779839dea5d0f16295c01881339b58192747f2e6081ff63
-  data.tar.gz: ac4789f3452011b504ea7335e2a851be13f8a9e55773848b88dc84115a58fff868583ce72be22c9d4899bc1b2a8bb3626b5a674d5c9b651e7a3c87d6539a847e
+  metadata.gz: 73c90c8916dba4816bc5de649bc61c196c98a30d9e270ce8e736abc44aad4fe6efa67532baf6f0c7577f69c79786828bd9fbe5a7bbb47a0050f331c68bda0a13
+  data.tar.gz: 18b24c01992283009e9e6abb73f7de84fc6a82e3f91e49033991a0dfa2e8a897e38ea9d8e9d849a5e58dfc283cfb0f34a3d3e641c9875567c01ddfbcf7b9d8b7

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 60
-  BUGFIX = 13
+  BUGFIX = 16
   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

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2023-11-28"
+  s.date = "2024-07-18"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze

metadata

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