origen 0.59.5 → 0.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652750db0acbd37b59e15fe487e63a85dfe2c912ac5b0c90b983b7ed0d55441b
-  data.tar.gz: 4013b7b56edfab4b6be7a6fc6a482f39bb4b0972de7a1df2efa8b05b2f75f2d9
+  metadata.gz: 9bc1492505202ee447282724a65bf5a8ed4999d5efebf892c368ced94f269251
+  data.tar.gz: 99499ac74e5744a87fed58fe45ae44b4ced7c63743003a3571b911790d2bb9f3
 SHA512:
-  metadata.gz: 154adc77789ca4ac748afef68bff1d66228f9e4c5d819d23dd089f25f58e74ba37569cdabc455682d2c66a87adecca6e246ba8119a9face7182232208171f0f2
-  data.tar.gz: 4b6ee0ee0a47cb72e158b8e9a85f68a08821ad2c49e4ca8dc02275bf9ef3349602d8f7e342f238d58541e5273c5a84c4a854ce2b91fedbf5cc0ab5d4c0a79bfc
+  metadata.gz: 413cb9b4a7b29a3672fc3a8a460502cbe67e9d9171fe2da910cfbd2c8e8e0e89941d01fb1d082e0e3faf2cd05ee26bad3f37e9de654118d28cf45335ff85c6a0
+  data.tar.gz: 011bbe37ae9cf99cb88f9b31fe26f9153f6ce94462537f719f0c18dfdb97b7f5e776a9a3eb15a316f0a5149c779101e95a5586b5c7432e87688211209d1b5c87

data/config/commands.rb

@@ -17,7 +17,7 @@ when "tags"
 when "specs"
   Origen.app.session.origen_core[:mode] = 'debug'
   require "rspec"
-  exit RSpec::Core::Runner.run(['spec'])
+  exit RSpec::Core::Runner.run($ARGV.empty? ? ['spec'] : $ARGV)
 
 when "examples", "test"  
   Origen.app.session.origen_core[:mode] = 'debug'

data/config/version.rb

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

data/lib/origen/generator/compiler.rb

@@ -103,7 +103,11 @@ module Origen
         # not be an issue except when testing Origen and generating and compiling within
         # the same thread, but clearing this here doesn't seem to do any harm.
         Origen.file_handler.default_extension = nil
-        Origen.log.info "Compiling... #{relative_path_to(file)}" unless options[:quiet]
+        begin
+          Origen.log.info "Compiling... #{relative_path_to(file)}" unless options[:quiet]
+        rescue
+          Origen.log.info "Compiling... #{file}" unless options[:quiet]
+        end
         Origen.log.info "  Created... #{relative_path_to(output_file(file, options))}" unless options[:quiet]
         stats.completed_files += 1 if options[:collect_stats]
         if is_erb?(file)

data/lib/origen/generator/pattern_sequence.rb

@@ -200,7 +200,7 @@ module Origen
         elsif time < 1.s
           "%.#{number_decimal_places}fms" % (time * 1_000)
         else
-          "%.#{number_decimal_places}fs" % tick_time
+          "%.#{number_decimal_places}fs" % time
         end
       end
 

data/lib/origen/loader.rb

@@ -116,62 +116,75 @@ 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
     # 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 app = options[:app] || model.app
+      if local_app = options[:app] || model.app
         if options[:path]
-          full_paths = Array(options[:path])
+          local_full_paths = Array(options[:path])
         else
-          full_paths = model.class.to_s.split('::')
-          full_paths.shift  # Throw away the app namespace
-          full_paths = [full_paths.join('/')]
+          local_full_paths = model.class.to_s.split('::')
+          local_full_paths.shift  # Throw away the app namespace
+          local_full_paths = [local_full_paths.join('/')]
         end
-        full_paths.each do |full_path|
-          paths = full_path.to_s.split('/')
-          key = ''
-          only = Array(options[:only]) if options[:only]
-          except = Array(options[:except]) if options[:except]
-          path = paths.map(&:underscore).join('/')
-          # If the path refers to a nested sub-block then don't load the full hierarchy since they
-          # don't support inheritance or derivatives, modify the paths array so that only the sub-block
-          # level will be loaded and nothing else.
-          paths = [path] if app.blocks_files[path] && app.blocks_files[path][:_sub_block]
-          # These will be loaded first, followed by the rest in an undefined order.
-          # Attributes and parameters are first so that they may be referenced in the other files.
-          # Sub-blocks was added early due to a corner case issue that could be encountered if the pins or
-          # regs imported an Origen exported file that defined a module with the same name as a sub-block
-          # class, in that case the sub-block class would not be auto-loaded.
-          load_first = [:attributes, :parameters, :sub_blocks]
+        app_paths_map = { local_app => local_full_paths }
+        if options[:inherit]
+          inherit_full_paths = options[:inherit].split('::')
+          inherit_app = Origen.app(inherit_full_paths.shift.underscore.to_sym)
+          inherit_full_paths = [inherit_full_paths.join('/')]
+          # merge to get inherit ordered in the beginning
+          app_paths_map = { inherit_app => inherit_full_paths }.merge(app_paths_map)
+        end
+        # load the inherit files, then the current app's block files
+        app_paths_map.each do |app, full_paths|
+          full_paths.each do |full_path|
+            paths = full_path.to_s.split('/')
+            key = ''
+            only = Array(options[:only]) if options[:only]
+            except = Array(options[:except]) if options[:except]
+            path = paths.map(&:underscore).join('/')
+            # If the path refers to a nested sub-block then don't load the full hierarchy since they
+            # don't support inheritance or derivatives, modify the paths array so that only the sub-block
+            # level will be loaded and nothing else.
+            paths = [path] if app.blocks_files[path] && app.blocks_files[path][:_sub_block]
+            # These will be loaded first, followed by the rest in an undefined order.
+            # Attributes and parameters are first so that they may be referenced in the other files.
+            # Sub-blocks was added early due to a corner case issue that could be encountered if the pins or
+            # regs imported an Origen exported file that defined a module with the same name as a sub-block
+            # class, in that case the sub-block class would not be auto-loaded.
+            load_first = [:attributes, :parameters, :sub_blocks]
 
-          load_first.each do |type|
-            unless (only && !only.include?(type)) || (except && except.include?(type))
-              with_parameters_transaction(type) do
-                paths.each_with_index do |path, i|
-                  key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
-                  if app.blocks_files[key] && app.blocks_files[key][type]
-                    app.blocks_files[key][type].each do |f|
-                      if type == :attributes
-                        success = load_attributes(f, model)
-                      else
-                        success = load_block_file(f, model)
+            load_first.each do |type|
+              unless (only && !only.include?(type)) || (except && except.include?(type))
+                with_parameters_transaction(type) do
+                  paths.each_with_index do |path, i|
+                    key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
+                    if app.blocks_files[key] && app.blocks_files[key][type]
+                      app.blocks_files[key][type].each do |f|
+                        if type == :attributes
+                          success = load_attributes(f, model)
+                        else
+                          success = load_block_file(f, model)
+                        end
+                        loaded ||= success
                       end
-                      loaded ||= success
                     end
                   end
                 end
               end
             end
-          end
 
-          # Now load the rest
-          paths.each_with_index do |path, i|
-            key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
-            if app.blocks_files[key]
-              app.blocks_files[key].each do |type, files|
-                unless type == :_sub_block || load_first.include?(type) || (only && !only.include?(type)) || (except && except.include?(type))
-                  files.each { |f| success = load_block_file(f, model); loaded ||= success }
+            # Now load the rest
+            paths.each_with_index do |path, i|
+              key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
+              if app.blocks_files[key]
+                app.blocks_files[key].each do |type, files|
+                  unless type == :_sub_block || load_first.include?(type) || (only && !only.include?(type)) || (except && except.include?(type))
+                    files.each { |f| success = load_block_file(f, model); loaded ||= success }
+                  end
                 end
               end
             end

data/lib/origen/model_initializer.rb

@@ -48,7 +48,7 @@ module Origen
         end
         if x.respond_to?(:is_an_origen_model?)
           x.send(:_initialized)
-          Origen::Loader.load_block(x)
+          Origen::Loader.load_block(x, options)
         end
         if x.respond_to?(:register_callback_listener)
           Origen.after_app_loaded do |app|

data/lib/origen/pins/pin.rb

@@ -23,7 +23,7 @@ module Origen
       PACKAGE_SCOPED_ATTRIBUTES = [:location, :dib_assignment, :dib_meta]
 
       # Pin Types, 'digital' and 'analog' are legacy types kept for backwards compatibility
-      TYPES = [:digital, :analog, :signal, :ground, :power, :virtual]
+      TYPES = [:analog, :digital, :signal, :ground, :power, :virtual]
 
       attr_accessor :order
       # Inverts pin states for drive and compare, can be useful if a timing set change requires clocks to drive low for example when all pattern logic has been set up to drive them high.
@@ -90,7 +90,7 @@ module Origen
         @open_drain = options[:open_drain]
         @ext_pullup = options[:ext_pullup]
         @ext_pulldown = options[:ext_pulldown]
-        @type = options[:type].nil? ? determine_type : options[:type]
+        @type = options[:type]
         @dib_assignment = [] # Array to handle multi-site testing
         @size = 1
         @value = 0
@@ -1183,17 +1183,6 @@ module Origen
 
       private
 
-      def determine_type
-        class_type = self.class.to_s.split('::').last.downcase
-        if class_type == 'pin'
-          return :signal
-        else
-          pin_type_match = class_type.match(/^(\S+)pin$/)
-          return if pin_type_match.nil?
-          pin_type_match[1].to_sym
-        end
-      end
-
       def primary_group=(group)
         @primary_group = group
       end

data/lib/origen/site_config.rb

@@ -418,7 +418,7 @@ module Origen
       if centralized_site_config
         # The first site configs found will exist in Origen core, and they contain the default values.
         # We want the centralized config to load right after those.
-        centralized_index = -(@configs.select { |c| c.path.start_with?(Origen.top.to_s) }.size + 1)
+        centralized_index = -(@configs.select { |c| c.path.start_with?(File.expand_path('../../../')) }.size + 1)
         @configs.insert(centralized_index, Config.new(path: centralized_site_config, parent: self))
       end
 

data/lib/origen/sub_blocks.rb

@@ -317,10 +317,40 @@ module Origen
         # been instantiated yet. This is not supported yet for instantiated sub-blocks since
         # there are probably a lot more corner-cases to consider, and hopefully no one will
         # really need this anyway.
-        if sub_blocks[name] && !sub_blocks[name].is_a?(Placeholder)
-          fail "You have already defined a sub-block named #{name} within class #{self.class}"
+        # Note that override is to recreate an existing sub-block, not adding additional
+        # attributes to an existing one
+        if options[:override]
+          sub_blocks.delete(name)
+          if options[:class_name]
+            begin
+              constantizable = !!options[:class_name].constantize
+            rescue NameError
+              constantizable = false
+            end
+            # this is to handle the case where a previously instantiated subblock wont allow
+            # the current class name to exist
+            # e.g. NamespaceA::B::C
+            # =>  NameSpaceX::Y::Z
+            # After requiring the files, constants become sane again:
+            # e.g. NamespaceA::B::C
+            # =>  NameSpaceA::B::C
+            if constantizable && (options[:class_name] != options[:class_name].constantize.to_s)
+              block_dir = options[:block_file] || _find_block_dir(options)
+              # files that aren't initializing a new namespace and have special loading shouldn't be required
+              # the code they contain may try to call methods that dont exist yet
+              skip_require_files = options[:skip_require_files] || %w(attributes parameters pins registers sub_blocks timesets)
+              Dir.glob("#{block_dir}/*.rb").each do |file|
+                next if skip_require_files.include?(Pathname.new(file).basename('.rb').to_s)
+                require file
+              end
+            end
+          end
+        else
+          if sub_blocks[name] && !sub_blocks[name].is_a?(Placeholder)
+            fail "You have already defined a sub-block named #{name} within class #{self.class}"
+          end
         end
-        if respond_to?(name)
+        if respond_to?(name) && !(singleton_class.instance_methods.include?(name) && options[:override])
           callers = Origen.split_caller_line caller[0]
           Origen.log.warning "The sub_block defined at #{Pathname.new(callers[0]).relative_path_from(Pathname.pwd)}:#{callers[1]} is overriding an existing method called #{name}"
         end
@@ -404,6 +434,33 @@ module Origen
 
     private
 
+    # @api private
+    # find the block directory path containing the namespace of options[:class_name]
+    def _find_block_dir(options, current_path = nil, remaining_namespace = nil)
+      current_path ||= Pathname.new("#{Origen.root}/app/blocks")
+      remaining_namespace ||= options[:class_name].split('::')[1..-1].map(&:underscore)
+      current_namespace = remaining_namespace.shift
+      if current_namespace
+        if current_path.join(current_namespace).exist?
+          return _find_block_dir(options, current_path.join(current_namespace), remaining_namespace)
+        elsif current_path.join("derivatives/#{current_namespace}").exist?
+          return _find_block_dir(options, current_path.join("derivatives/#{current_namespace}"), remaining_namespace)
+        elsif current_path.join("sub_blocks/#{current_namespace}").exist?
+          return _find_block_dir(options, current_path.join("sub_blocks/#{current_namespace}"), remaining_namespace)
+        else
+          Origen.log.error "Could not find block dir for namespace #{options[:class_name]}!"
+          fail
+        end
+      else
+        if current_path.join('model.rb').exist?
+          return current_path.to_s
+        else
+          Origen.log.error "Could not find block dir for namespace #{options[:class_name]}!"
+          fail
+        end
+      end
+    end
+
     def instantiate_sub_block(name, klass, options)
       return sub_blocks[name] unless sub_blocks[name].is_a?(Placeholder)
       sub_blocks[name] = klass.new(options.merge(parent: self, name: name))
@@ -501,8 +558,8 @@ module Origen
             rescue NameError => e
               raise if e.message !~ /^uninitialized constant (.*)$/ || tmp_class !~ /#{Regexp.last_match(1)}/
               begin
-                tmp_class = class_name.to_s
-                klass = eval(class_name)
+                tmp_class = "::#{class_name}"
+                klass = eval(tmp_class)
               rescue NameError => e
                 raise if e.message !~ /^uninitialized constant (.*)$/ || tmp_class !~ /#{Regexp.last_match(1)}/
                 begin

data/origen_app_generators/Gemfile.lock

@@ -1,54 +1,53 @@
 PATH
   remote: .
   specs:
-    origen_app_generators (2.1.1)
+    origen_app_generators (2.2.0)
       origen (>= 0.40.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.4.0)
+    ast (2.4.1)
     astrolabe (1.3.1)
       parser (~> 2.2)
     byebug (9.0.6)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colored (1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     cri (2.10.1)
       colored (~> 1.2)
     dentaku (2.0.11)
-    diff-lcs (1.3)
-    docile (1.3.1)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
     gems (0.8.3)
     highline (1.7.10)
-    httparty (0.17.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
     kramdown (1.17.0)
-    method_source (0.9.2)
-    mime-types (3.2.2)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.1104)
     mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    minitest (5.14.2)
     multi_xml (0.6.0)
     nanoc (3.7.5)
       cri (~> 2.3)
-    net-ldap (0.16.1)
+    net-ldap (0.17.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    origen (0.52.0)
+    origen (0.59.4)
       activesupport (~> 4.1)
-      bundler (~> 1.7)
+      bundler (> 1.7)
       coderay (~> 1.1)
       colored (~> 1.2)
       colorize (~> 0.8.1)
@@ -68,33 +67,34 @@ GEM
       rspec-legacy_formatters (~> 1)
       rubocop (= 0.30)
       scrub_rb (~> 1.0)
-      simplecov (~> 0.9)
+      simplecov (~> 0.17)
+      simplecov-html (~> 0.10)
       thor (~> 0.19)
       yard (~> 0.8)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    powerpack (0.1.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (2.2.2)
       rake
     rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-legacy_formatters (1.0.1)
+      rspec-support (~> 3.10.0)
+    rspec-legacy_formatters (1.0.2)
       rspec (~> 3.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     rubocop (0.30.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
@@ -103,16 +103,17 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.10.1)
     scrub_rb (1.0.1)
-    simplecov (0.16.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    yard (0.9.19)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -123,4 +124,4 @@ DEPENDENCIES
   origen_app_generators!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/origen_app_generators/config/version.rb

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

data/origen_app_generators/doc/history

@@ -1,3 +1,14 @@
+<a class="anchor release_tag" name="v2_2_0"></a>
+<h1><a href="#v2_2_0">Tag: v2.2.0</a></h1>
+
+##### Branch: 'master'
+
+##### by Caquelin, Brian on 03-Dec-2020 08:40AM
+
+
+* Removed older Ruby dependencies
+* Added Github Actions regression testing
+
 <a class="anchor release_tag" name="v2_1_1"></a>
 <h1><a href="#v2_1_1">Tag: v2.1.1</a></h1>
 

data/origen_app_generators/origen_app_generators.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: origen_app_generators 2.1.1 ruby lib
+# stub: origen_app_generators 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "origen_app_generators".freeze
-  s.version = "2.1.1"
+  s.version = "2.2.0"
 
   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 = "2020-11-25"
+  s.date = "2021-06-17"
   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.0.3".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.0.3" if s.respond_to? :installed_by_version
+  s.installed_by_version = "3.0.1" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/origen_app_generators/templates/app_generators/application/Gemfile

@@ -8,6 +8,8 @@ source 'https://rubygems.org'
 
 gem 'origen', '>= <%= @latest_origen_version %>'
 
+gem 'byebug'
+
 gem 'origen_doc_helpers'
 <% if @development_dependencies -%>  
   <% @development_dependencies.each do |dep| -%>
@@ -15,14 +17,6 @@ gem <%= dep.map{ |d| "\"#{d}\"" }.join(', ') %>
   <% end -%>
 <% end -%>
 
-gem 'byebug', '~>8'  # You can remove this version constraint if you don't care about your app
-                     # supporting earlier versions of Ruby 2
-<% if RUBY_VERSION < "2.3.0" -%>
-
-# Lock this version of nokogiri to enable compatibility with Ruby 2.2, if you don't need
-# that then you can remove this line
-gem 'nokogiri', '1.8.5'
-<% end -%>
 <% if (@audience != :external) && Origen.site_config.gem_push_plugins -%>
 <%   Origen.site_config.gem_push_plugins.each do |plugin| -%>
 gem <%= Array(plugin).map{ |d| "\"#{d}\"" }.join(', ') %>

data/origen_app_generators/templates/app_generators/plugin/Gemfile

@@ -13,8 +13,8 @@ source 'https://rubygems.org'
 # your application's test coverage
 gem 'coveralls', require: false
 <% end -%>
-gem 'byebug', '~>8'  # You can remove this version constraint if you don't care about your app
-                     # supporting earlier versions of Ruby 2
+
+gem 'byebug'
 gem 'ripper-tags'
 gem 'origen_doc_helpers'
 <% if (@audience != :external) && Origen.site_config.gem_push_plugins -%>

data/vendor/lib/models/origen/export1.rb

@@ -5,69 +5,69 @@ module Origen
     def self.extended(model)
       model.add_package :bga
       model.add_package :pcs
-      model.add_pin :pinx, type: :signal
-      model.add_pin :piny, reset: :drive_hi, direction: :output, type: :signal, meta: { a: '1', b: 2 }
-      model.add_pin :tdo, type: :signal, packages: { bga: { location: "BF32", dib_assignment: [10104] }, pcs: { location: "BF30", dib_assignment: [31808] } }
-      model.add_pin :porta31, type: :signal
-      model.add_pin :porta30, type: :signal
-      model.add_pin :porta29, type: :signal
-      model.add_pin :porta28, type: :signal
-      model.add_pin :porta27, type: :signal
-      model.add_pin :porta26, type: :signal
-      model.add_pin :porta25, type: :signal
-      model.add_pin :porta24, type: :signal
-      model.add_pin :porta23, type: :signal
-      model.add_pin :porta22, type: :signal
-      model.add_pin :porta21, type: :signal
-      model.add_pin :porta20, type: :signal
-      model.add_pin :porta19, type: :signal
-      model.add_pin :porta18, type: :signal
-      model.add_pin :porta17, type: :signal
-      model.add_pin :porta16, type: :signal
-      model.add_pin :porta15, type: :signal
-      model.add_pin :porta14, type: :signal
-      model.add_pin :porta13, type: :signal
-      model.add_pin :porta12, type: :signal
-      model.add_pin :porta11, type: :signal
-      model.add_pin :porta10, type: :signal
-      model.add_pin :porta9, type: :signal
-      model.add_pin :porta8, type: :signal
-      model.add_pin :porta7, type: :signal
-      model.add_pin :porta6, type: :signal
-      model.add_pin :porta5, type: :signal
-      model.add_pin :porta4, type: :signal
-      model.add_pin :porta3, type: :signal
-      model.add_pin :porta2, type: :signal
-      model.add_pin :porta1, type: :signal
-      model.add_pin :porta0, type: :signal
-      model.add_pin :portb0, type: :signal
-      model.add_pin :portb1, type: :signal
-      model.add_pin :portb2, type: :signal
-      model.add_pin :portb3, type: :signal
-      model.add_pin :portb4, type: :signal
-      model.add_pin :portb5, type: :signal
-      model.add_pin :portb6, type: :signal
-      model.add_pin :portb7, type: :signal
-      model.add_pin :portb8, type: :signal
-      model.add_pin :portb9, type: :signal
-      model.add_pin :portb10, type: :signal
-      model.add_pin :portb11, type: :signal
-      model.add_pin :portb12, type: :signal
-      model.add_pin :portb13, type: :signal
-      model.add_pin :portb14, type: :signal
-      model.add_pin :portb15, type: :signal
+      model.add_pin :pinx
+      model.add_pin :piny, reset: :drive_hi, direction: :output, meta: { a: '1', b: 2 }
+      model.add_pin :tdo, packages: { bga: { location: "BF32", dib_assignment: [10104] }, pcs: { location: "BF30", dib_assignment: [31808] } }
+      model.add_pin :porta31
+      model.add_pin :porta30
+      model.add_pin :porta29
+      model.add_pin :porta28
+      model.add_pin :porta27
+      model.add_pin :porta26
+      model.add_pin :porta25
+      model.add_pin :porta24
+      model.add_pin :porta23
+      model.add_pin :porta22
+      model.add_pin :porta21
+      model.add_pin :porta20
+      model.add_pin :porta19
+      model.add_pin :porta18
+      model.add_pin :porta17
+      model.add_pin :porta16
+      model.add_pin :porta15
+      model.add_pin :porta14
+      model.add_pin :porta13
+      model.add_pin :porta12
+      model.add_pin :porta11
+      model.add_pin :porta10
+      model.add_pin :porta9
+      model.add_pin :porta8
+      model.add_pin :porta7
+      model.add_pin :porta6
+      model.add_pin :porta5
+      model.add_pin :porta4
+      model.add_pin :porta3
+      model.add_pin :porta2
+      model.add_pin :porta1
+      model.add_pin :porta0
+      model.add_pin :portb0
+      model.add_pin :portb1
+      model.add_pin :portb2
+      model.add_pin :portb3
+      model.add_pin :portb4
+      model.add_pin :portb5
+      model.add_pin :portb6
+      model.add_pin :portb7
+      model.add_pin :portb8
+      model.add_pin :portb9
+      model.add_pin :portb10
+      model.add_pin :portb11
+      model.add_pin :portb12
+      model.add_pin :portb13
+      model.add_pin :portb14
+      model.add_pin :portb15
       model.add_pin_group :porta, :porta31, :porta30, :porta29, :porta28, :porta27, :porta26, :porta25, :porta24, :porta23, :porta22, :porta21, :porta20, :porta19, :porta18, :porta17, :porta16, :porta15, :porta14, :porta13, :porta12, :porta11, :porta10, :porta9, :porta8, :porta7, :porta6, :porta5, :porta4, :porta3, :porta2, :porta1, :porta0
       model.add_pin_group :portb, :portb15, :portb14, :portb13, :portb12, :portb11, :portb10, :portb9, :portb8, :portb7, :portb6, :portb5, :portb4, :portb3, :portb2, :portb1, :portb0
       model.pins(:portb).endian = :little
-      model.add_power_pin :vdd1, type: :power, voltage: 3, current_limit: 0.05, meta: { min_voltage: 1.5 }
-      model.add_power_pin :vdd2, type: :power
+      model.add_power_pin :vdd1, voltage: 3, current_limit: 0.05, meta: { min_voltage: 1.5 }
+      model.add_power_pin :vdd2
       model.add_power_pin_group :vdd, :vdd1, :vdd2
-      model.add_ground_pin :gnd1, type: :ground
-      model.add_ground_pin :gnd2, type: :ground
-      model.add_ground_pin :gnd3, type: :ground
+      model.add_ground_pin :gnd1
+      model.add_ground_pin :gnd2
+      model.add_ground_pin :gnd3
       model.add_ground_pin_group :gnd, :gnd1, :gnd2, :gnd3
-      model.add_virtual_pin :relay1, type: :virtual
-      model.add_virtual_pin :relay2, type: :virtual, packages: { bga: {} }
+      model.add_virtual_pin :relay1
+      model.add_virtual_pin :relay2, packages: { bga: {} }
 
       model.sub_block :block1, file: 'origen/export1/block1.rb', dir: "#{Origen.root!}/vendor/lib/models", lazy: true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.59.5
+  version: 0.60.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -749,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit