origen 0.60.12 → 0.60.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e77b56f566e4499b23918702bdb7b1802d66ecb528d101397019bdb0745558b6
-  data.tar.gz: 4c2100e991668dfadee18397631b18994f1555b1b52aa304927f99eaf217f64f
+  metadata.gz: 72edbb6af81e08f3dae27340b8adb75a2bd0a328e24b398c7c493923e568fff5
+  data.tar.gz: '0711789ba34b72bf554ff6b57af5772229a36dd2d0dbbeae35f307c660c45d78'
 SHA512:
-  metadata.gz: 30facf5713b29d4f4f5d23d24bef9a4d7c0a8b5f24f9c7f2dcf8c2db684d770d4901836b5fd0f0012a77875f4287cb1b6a477c006ada1c8dcd38ac825eeba991
-  data.tar.gz: 78ace52cbff41568e31824bb0f127ac8042aaea827d624f53e247efc632e5032d8602562e6714c217c703a03a2421d6748a4cd7f4b14a58282f7dd6c1046c3a7
+  metadata.gz: b30d5368c8ac8c113047ac370d874db601b8b32cdbb6f0f5389b0d44b29140a06d1c782e5198a895b13f22928f45a90bd3c1a79815718c7319ee9b4f83cf7735
+  data.tar.gz: 59c09425ebf952b780a4bd7b6992185b0db5df2e6582bbd5fe9b3ebf4c8121e14783376c5481aec026441612a04f889145c66204d787a7efb1c8f801acb5807c

data/config/version.rb

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

data/lib/origen/chip_package.rb

@@ -254,6 +254,23 @@ module Origen
       test_string[0, 1]
     end
 
+    def method_missing(m, *args, &block)
+      ivar = "@#{m.to_s.gsub('=', '')}"
+      ivar_sym = ":#{ivar}"
+      if m.to_s =~ /=$/
+        define_singleton_method(m) do |val|
+          instance_variable_set(ivar, val)
+        end
+      elsif instance_variables.include? ivar_sym
+        instance_variable_get(ivar)
+      else
+        define_singleton_method(m) do
+          instance_variable_get(ivar)
+        end
+      end
+      send(m, *args, &block)
+    end
+
     #  .plot can be called explicitly and accepts string arguments with
     #  or without regex styling. For example:
     #

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,16 +8,16 @@ 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-10-07"
+  s.date = "2023-11-28"
   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
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "3.1.6".freeze
+  s.rubygems_version = "3.2.3".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.1.6" if s.respond_to? :installed_by_version
+  s.installed_by_version = "3.2.3" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.60.12
+  version: 0.60.14
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2024-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -731,7 +731,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit