origen 0.60.18 → 0.60.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68d3ec07f5d39ca0b395d5571407c64bbccc2d541e4b492163f42dfe56e2ac0
-  data.tar.gz: 12bf4962bbd86f588a0a02cb7885c142d354555255d913c2ca96a156a75569e0
+  metadata.gz: c0ff67408cee3aae35f1f237df9b56f59671e4fded6ec18801b5add83850ec40
+  data.tar.gz: ac44e4e681cb14cb8d5cef023dff12f0430365bfc0e4dc73fbcd4f5a63615634
 SHA512:
-  metadata.gz: 00dec76088c4bf7a5586d1adb924a81b25707183e4e21039b8e1baee2635ad4b291de83d40b58c93d06d41fe981c252d8892684898cd9af7c354239e2e7ee6b4
-  data.tar.gz: d5f6bc75637d545ab18a91f371655ffbfb2681fd5e69b5257c5bee27e3a37480207d3f43bc6024b879034870712b7d00da5ae017fa8f9a848f1b1dc5461efe61
+  metadata.gz: 8c9f687da5d64f04da00bf588c4683694a8bdc2567c2f7714a846dbad755dfb2e7afc91e4af0c8eb26e5535d74c534049998f17a16dd766b387383d0da8bfb3a
+  data.tar.gz: 51393f786f377c74bf4b8251fcc908720e2387f15409ac0392fcc58a9d7d65da0eb61cf7562c160e5aba60cc7b29a36e439893cef56c5eea1d24420f16899bd6

data/config/version.rb

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

data/lib/origen/application/configuration.rb

@@ -91,8 +91,8 @@ module Origen
         @proceed_with_pattern = ->(_name) { true }
         @erb_trim_mode = '%'
         @referenced_pattern_list = -> { "#{Origen.root}/list/referenced.list" }
-        @copy_command = -> { Origen.running_on_windows? ? 'copy' : 'cp' }
-        @diff_command = -> { Origen.running_on_windows? ? 'start winmerge' : 'tkdiff' }
+        @copy_command = -> { Origen.session.user[:copy_command] || (Origen.running_on_windows? ? 'copy' : 'cp') }
+        @diff_command = -> { Origen.session.user[:diff_command] || (Origen.running_on_windows? ? 'start winmerge' : 'tkdiff') }
         @imports = []
         @imports_dev = []
         @external_app_dirs = []

data/lib/origen/callbacks.rb

@@ -12,7 +12,12 @@ module Origen
       # If this object has been instantiated after on_create has already been called,
       # then invoke it now
       if Origen.app.on_create_called?
-        on_create if respond_to?(:on_create)
+        if respond_to?(:on_create)
+          unless @_on_create_called
+            @_on_create_called = true
+            on_create
+          end
+        end
       end
     end
   end

data/lib/origen/database/key_value_store.rb

@@ -104,8 +104,13 @@ module Origen
 
       def load_from_file
         s = nil
-        File.open(file.to_s) do |f|
-          s = Marshal.load(f)
+        begin
+          File.open(file.to_s) do |f|
+            s = Marshal.load(f)
+          end
+        rescue
+          Origen.log.error "Failed to load session file: #{file}"
+          Origen.log.error 'This can happen if the file has been corrupted, please delete it and try again'
         end
         s
       end

data/lib/origen/loader.rb

@@ -124,16 +124,6 @@ module Origen
       model = model.model # Ensure we have a handle on the model and not its controller
       loaded = nil
 
-      if options[:inherit]
-        # pass down any bugs/features from the inherited block class
-        unless options[:disable_bug_inheritance]
-          model.class.instance_variable_set(:@bugs, options[:inherit].constantize.bugs.merge(model.class.bugs))
-        end
-        unless options[:disable_feature_inheritance]
-          model.class.instance_variable_set(:@features, options[:inherit].constantize.features.merge(model.class.features))
-        end
-      end
-
       if local_app = options[:app] || model.app
         if options[:path]
           local_full_paths = Array(options[:path])
@@ -143,6 +133,8 @@ module Origen
           local_full_paths = [local_full_paths.join('/')]
         end
         app_paths_map = { local_app => local_full_paths }
+        inherit_app = nil
+        inherited_sub_blocks_files = []
         if options[:inherit]
           # update app_paths_map with the relevant inherited files
           inherit_full_paths = options[:inherit].split('::')
@@ -179,6 +171,9 @@ module Origen
                       app.blocks_files[key][type].each do |f|
                         if type == :attributes
                           success = load_attributes(f, model)
+                        elsif type == :sub_blocks && app == inherit_app
+                          # handle inherited sub blocks later
+                          inherited_sub_blocks_files << f
                         else
                           success = load_block_file(f, model)
                         end
@@ -203,7 +198,36 @@ module Origen
             end
           end
         end
+
+        # Now load the inherited sub blocks, but don't override any existing sub blocks this model has already defined
+        inherited_sub_blocks_files.each do |f|
+          model.instance_variable_set(:@_inherited_sub_blocks_mode, true)
+          load_block_file(f, model)
+          model.instance_variable_set(:@_inherited_sub_blocks_mode, false)
+        end
       end
+
+      # pass down any bugs/features from the inherited block class
+      if options[:inherit]
+        inherited_ancestors = options[:inherit].constantize.ancestors
+        inherited_features = inherited_ancestors.map do |a|
+          a.respond_to?(:features) ? a.features : {}
+        end
+        inherited_features = inherited_features.reject(&:empty?).reverse.reduce({}, :merge)
+
+        inherited_bugs = inherited_ancestors.map do |a|
+          a.respond_to?(:bugs) ? a.bugs : {}
+        end
+        inherited_bugs = inherited_bugs.reject(&:empty?).reverse.reduce({}, :merge)
+
+        unless options[:disable_feature_inheritance]
+          model.class.instance_variable_set(:@features, inherited_features.merge(model.class.features))
+        end
+        unless options[:disable_bug_inheritance]
+          model.class.instance_variable_set(:@bugs, inherited_bugs.merge(model.class.bugs))
+        end
+      end
+
       loaded
     end
 

data/lib/origen/model_initializer.rb

@@ -68,10 +68,20 @@ module Origen
           if x.try(:is_a_model_and_controller)
             m = x.model
             c = x.controller
-            m.on_create if m.respond_to_directly?(:on_create)
+            if m.respond_to_directly?(:on_create)
+              unless m_on_create_called = m.instance_variable_get(:@_on_create_called)
+                m.instance_variable_set(:@_on_create_called, true)
+                m.on_create
+              end
+            end
             c.on_create if c.respond_to_directly?(:on_create)
           else
-            x.on_create if x.respond_to?(:on_create)
+            if x.respond_to?(:on_create)
+              unless x_on_create_called = x.instance_variable_get(:@_on_create_called)
+                x.instance_variable_set(:@_on_create_called, true)
+                x.on_create
+              end
+            end
           end
         end
         if is_top_level

data/lib/origen/sub_blocks.rb

@@ -296,6 +296,10 @@ module Origen
         return sub_block(name.class)
       end
 
+      if sub_blocks[name] && model.instance_variable_get(:@_inherited_sub_blocks_mode)
+        return
+      end
+
       if i = options.delete(:instances)
         # permit creating multiple instances of a particular sub_block class
         # can pass array for base_address, which will be processed above

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,18 +8,24 @@ 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 = "2024-10-29"
+  s.date = "2025-05-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.4.10".freeze
+  s.rubygems_version = "3.1.6".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.4.10" if s.respond_to? :installed_by_version
+  s.installed_by_version = "3.1.6" if s.respond_to? :installed_by_version
 
-  s.specification_version = 4
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
 
-  s.add_runtime_dependency(%q<origen>.freeze, [">= 0.40.2"])
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<origen>.freeze, [">= 0.40.2"])
+  else
+    s.add_dependency(%q<origen>.freeze, [">= 0.40.2"])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.60.18
+  version: 0.60.20
 platform: ruby
 authors:
 - Stephen McGinty
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -346,7 +346,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - stephen.f.mcginty@gmail.com
 executables:
@@ -716,7 +716,7 @@ homepage: https://origen-sdk.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -731,8 +731,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: The Semiconductor Developer's Kit
 test_files: []