origen 0.60.5 → 0.60.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db57b94cabfd9e14047a2922c410b920da75fd4bb9a66ba8bba6bb972cb4b125
-  data.tar.gz: ad5be66cb94c42632a2d801b463ffb2984fd4fa9cdaffb5104d9bc3707bf53d4
+  metadata.gz: 7a8de77b7e1b7c8c36dbfbe4c09cfed6abf1fd1d508d915f2b06af3c62595fac
+  data.tar.gz: 13f365bc2529ba358d79bc281442190f4f41c723fa10d533badd4b349f476ea7
 SHA512:
-  metadata.gz: a9df386c2629ca963ddb93b0c65d6eb0a6281bc394a0c5f5bf17a0c8c3502b4d184c45fdc97ab6f3f2b1ade1fd3141aa8725dcda06a68549954dcdbe9f5799e2
-  data.tar.gz: 855228da5608fb39726acfe33e56e00ac46f5d2a5c557bb6f1c840cfc912a2bd1ae1627e19ac37f3cee67bac31d82acd177a0d9d774eb6440cbed76cfd7bb86e
+  metadata.gz: fec7b03350e86093b6733a2f870df766110489fa54bae7868d0d761b6a61811945f5483e4f57be963a0a3f4832dfef58abb924b85050da460e1b853ea5887192
+  data.tar.gz: 7cc42194880ba198e6e5dfa0b14321a96a6fcc83ad87c83b25fc0d5a0c759c90bfd20135fcebbf4362ebd785905d19da1deb532df9a4aac22badbb9f5918cb15

data/config/version.rb

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

data/lib/origen/loader.rb

@@ -117,11 +117,23 @@ module Origen
     # If a block definition exists for the given model, then this will load it and apply it to
     # the model.
     # if options[:inherit] is passed, it will first try to load the files for the class name contained
-    # in that option, even if its from a plugin app
+    # in that option, even if its from a plugin app. Additionally, any bugs/features will be inherited
+    # as well unless disable_bug_inheritance or disable_feature_inheritance options are passed
     # Returns true if a model is found and loaded, otherwise nil.
     def self.load_block(model, options = {})
       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])
@@ -132,6 +144,7 @@ module Origen
         end
         app_paths_map = { local_app => local_full_paths }
         if options[:inherit]
+          # update app_paths_map with the relevant inherited files
           inherit_full_paths = options[:inherit].split('::')
           inherit_app = Origen.app(inherit_full_paths.shift.underscore.to_sym)
           inherit_full_paths = [inherit_full_paths.join('/')]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.60.5
+  version: 0.60.6
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport