origen 0.55.3 → 0.55.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1012987b0791325b7cd6b4f636283f83453a086468ca1771308b436faabb14b8
-  data.tar.gz: 7b5a00e51aa7fd4d9110479f93b1dc4753d58c01639be8f46d503ad1b1c7e7be
+  metadata.gz: 6cd7510b5f95a3f095e42e8cec614c0fe5dfa6dffa806e3a3b2002457a13c91a
+  data.tar.gz: 7b8a65cbd49762b5899223491a71c43f12a421ec2c9791ffbbcf8472d73e9446
 SHA512:
-  metadata.gz: a0191bdaad28793964e97be82f27fcdd1ea4fd97704af92fa42df128e466c8438b0dba57e805144884b56e09045941ff65e03a4f0863c6e627e5af41d3efc830
-  data.tar.gz: '09108ef06be15907321875c2f2aed6a5348896cc62e1590b3eac2c11081caef7877b7661c0b696cdbd882aeff99595c11ae0cf6346562fd200db68dfc28e5373'
+  metadata.gz: 9635a1f7bac9345cbf90eeeedf7e84f6a60f098c024aa75125e5e1c9465a3ac1e486b7f89c2d299b96f024558ef65dbbd7c24459c62d193b36cb03f83898b6b3
+  data.tar.gz: 0b86bd09959a6040b7738b884967b152d01c5fe8305a9361a7097f41beeaa9dc87c3b2baf3515eb721e1d60b73e72e5a19b6907dc55edbf585f03280de8956d9

data/config/version.rb

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

data/lib/origen/generator/job.rb

@@ -3,7 +3,7 @@ module Origen
     # A job is responsible for executing a single pattern source
     class Job # :nodoc: all
       attr_accessor :output_file_body, :pattern
-      attr_reader :split_counter
+      attr_reader :split_counter, :split_names
       attr_reader :options
 
       def initialize(pattern, options)
@@ -23,9 +23,11 @@ module Origen
         @no_comments
       end
 
-      def inc_split_counter
+      def inc_split_counter(name = '')
         @split_counter ||= 0
+        @split_names ||= ['']
         @split_counter += 1
+        @split_names << name
       end
 
       def requested_pattern
@@ -115,7 +117,11 @@ module Origen
 
       def split_number
         if split_counter
-          "_part#{split_counter}"
+          if split_names[split_counter] != ''
+            "_#{split_names[split_counter]}"
+          else
+            "_part#{split_counter}"
+          end
         else
           ''
         end

data/lib/origen/generator/pattern.rb

@@ -221,8 +221,9 @@ module Origen
       # Each additional pattern section created by calling this method
       # will have '_partN' appended to the original pattern name.
       def split(options = {})
+        split_name = options.delete(:name) || ''
         pattern_close(options.merge(call_shutdown_callbacks: false))
-        job.inc_split_counter
+        job.inc_split_counter(split_name)
         pattern_open(options.merge(call_startup_callbacks: false))
       end
 

data/lib/origen/sub_blocks.rb

@@ -232,6 +232,22 @@ module Origen
     end
     alias_method :children, :sub_blocks
 
+    # Returns a hash containing all sub block groups thus far added
+    # if no arguments given.
+    # If given a code block, will serve as alias to sub_block_group method.
+    # Does not handle arguments, no need at this time.
+    def sub_block_groups(*args, &block)
+      if block_given?
+        sub_block_group(*args, &block)
+      else
+        if args.empty?
+          @sub_block_groups ||= {}.with_indifferent_access
+        else
+          fail 'sub_block_groups not meant to take arguments!'
+        end
+      end
+    end
+
     # Delete all sub_blocks by emptying the Hash
     def delete_sub_blocks
       @sub_blocks = {}
@@ -309,7 +325,7 @@ module Origen
           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
         define_singleton_method name do
-          get_sub_block(name)
+          sub_blocks[name]
         end
         if sub_blocks[name] && sub_blocks[name].is_a?(Placeholder)
           sub_blocks[name].add_attributes(options)
@@ -362,21 +378,24 @@ module Origen
         callers = Origen.split_caller_line caller[0]
         Origen.log.warning "The sub_block_group defined at #{Pathname.new(callers[0]).relative_path_from(Pathname.pwd)}:#{callers[1]} is overriding an existing method called #{id}"
       end
+      # Define a singleton method which will be called every time the sub_block_group is referenced
+      # This is not called here but later when referenced
       define_singleton_method "#{id}" do
-        if options[:class_name]
-          b = Object.const_get(options[:class_name]).new
-        else
-          b = []
-        end
-        my_group.each do |group_id|
-          b << send(group_id)
-        end
-        b                         # return array inside new singleton method
+        sub_block_groups[id]
+      end
+      # Instantiate group
+      if options[:class_name]
+        b = Object.const_get(options[:class_name]).new
+      else
+        b = []             # Will use Array if no class defined
       end
+      # Add sub_blocks to group
+      my_group.each do |group_id|
+        b << send(group_id)
+      end
+      sub_block_groups[id] = b
       @current_group = nil   # close group
     end
-    alias_method :sub_block_groups, :sub_block_group
-    alias_method :sub_blocks_groups, :sub_block_group
     alias_method :sub_blocks_group, :sub_block_group
 
     def namespace
@@ -385,10 +404,6 @@ module Origen
 
     private
 
-    def get_sub_block(name)
-      sub_blocks[name]
-    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))

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 = "2020-03-10"
+  s.date = "2020-03-30"
   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.1".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.0.1" if s.respond_to? :installed_by_version
+  s.installed_by_version = "2.7.7" 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.55.3
+  version: 0.55.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -749,7 +749,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit