origen 0.53.1 → 0.54.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd569a25fe01194aa87a0e7d35c2aca0ed5663b45622a085dce5c397ccb4cf7
-  data.tar.gz: b820cb13bd6565d581c9507a26800ae363f75674443f628aac5868a93fc055dc
+  metadata.gz: 5d3d368f3f4b77d66ea2a28a9ca2efc85c2457b15d79ff98d4041ab2904f316a
+  data.tar.gz: 33b54698884a63f0bea2077b1b56aef0c4971d675bcda6bf404de440b22cf20a
 SHA512:
-  metadata.gz: 3269cc10dd0868bcde87e641defb89917e4d63ebca8ebd23afcc95224c37dde85551c2e21a3a8acd191539c2619b9b6a541678f86c2d51f3fd5702ad86965294
-  data.tar.gz: d427a339ff99a83e2c6dafb31229ebdd35a8f44a62dbe54fe6793109f66b8135e70e33427e4b9d6ad385be7dd4c4578634001250aea3cfb5356ca5cdf3e62e7f
+  metadata.gz: 70d97da133e8f9b3866ac9b4593d82504a6f34f93f1c480ed3faf81ffcd52a3d2ca3317a9fd87ce7cbae45d7df81de71b1c36a81d41853c4c2acae7e0ca3f85c
+  data.tar.gz: 38b358b0698551bfb79fbb2d2c4b17e01ead20c68b581cb7c0f90449965701453483d5c29f327412791fc2a0c2f4cbac361d6fe63645c64e995e7adcac88ebd8

data/config/version.rb

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

data/lib/origen/file_handler.rb

@@ -278,7 +278,9 @@ module Origen
       path
     end
 
+    # @deprecated
     def clean_path_to_sub_program(file)
+      Origen.deprecated 'Origen.file_handler.clean_path_to_sub_program is deprecated, update to use version ... of origen_testers instead.'
       file = add_underscore_to(file)
       file = add_rb_to(file)
       clean_path_to(file)

data/lib/origen/generator/pattern_sequence.rb

@@ -18,9 +18,19 @@ module Origen
 
       # Execute the given pattern
       def run(pattern_name)
-        pattern = Origen.generator.pattern_finder.find(pattern_name.to_s, {})
-        pattern = pattern[:pattern] if pattern.is_a?(Hash)
-        load pattern
+        name = Pathname.new(pattern_name.to_s).basename
+        ss "START OF PATTERN: #{name}"
+        # Give the app a chance to handle pattern dispatch
+        skip = false
+        Origen.app.listeners_for(:before_pattern_lookup).each do |listener|
+          skip ||= !listener.before_pattern_lookup(pattern_name.to_s)
+        end
+        unless skip
+          pattern = Origen.generator.pattern_finder.find(pattern_name.to_s, {})
+          pattern = pattern[:pattern] if pattern.is_a?(Hash)
+          load pattern
+        end
+        ss "END OF PATTERN: #{name}"
       end
       alias_method :call, :run
 

data/lib/origen/parameters.rb

@@ -117,13 +117,18 @@ module Origen
           _parameter_sets[name] = Origen::Parameters::Set.new(top_level: true, owner: self)
         end
         if options[:inherit]
-          kontext = _validate_parameter_set_name(options[:inherit])
-          parent = kontext[:obj]._parameter_sets[kontext[:context]]
-          if Origen::Parameters.transaction_open && !Origen::Parameters.transaction_redefine
-            define_params_transaction[kontext[:obj]][kontext[:context]][:children] << [self, name]
+          parents = {}
+          Array(options[:inherit]).each do |inherit|
+            kontext = _validate_parameter_set_name(inherit)
+            parent = kontext[:obj]._parameter_sets[kontext[:context]]
+            parents[inherit] = parent
+            if Origen::Parameters.transaction_open && !Origen::Parameters.transaction_redefine
+              define_params_transaction[kontext[:obj]][kontext[:context]][:children] << [self, name]
+            end
+            _parameter_sets[name].copy_defaults_from(parent) unless defaults_already_set
           end
-          _parameter_sets[name].copy_defaults_from(parent) unless defaults_already_set
-          _parameter_sets[name].define(parent, &block)
+          parents = parents.values.first if parents.size == 1
+          _parameter_sets[name].define(parents, &block)
         else
           _parameter_sets[name].define(&block)
         end

data/lib/origen/parameters/set.rb

@@ -38,7 +38,7 @@ module Origen
       def copy_defaults_from(set)
         set.each do |name, val|
           if val.is_a?(Set)
-            self[name] = new_subset(name)
+            self[name] ||= new_subset(name)
             self[name].copy_defaults_from(val)
           else
             self[name] = val

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 = "2019-09-02"
+  s.date = "2019-09-20"
   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

data/templates/code_generators/pins.rb

@@ -23,6 +23,6 @@
 # add_pin_group :jtag, :tdi, :tdo, :tck, :tms
 #
 # Examples of how to create pin aliases
-# add_pin_alias :old_name, :new_name
-# add_pin_group_alias :old_name, :new_name
+# add_pin_alias :new_name, :old_name
+# add_pin_group_alias :new_name, :old_name
 # add_pin_group_alias :data_byte0, :porta, pins: [7..0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.53.1
+  version: 0.54.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,14 +70,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency