origen 0.42.0 → 0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b916938b9392e5b4be6121f06ee887c292813306e90a6d9418ecc48f3133bb4d
-  data.tar.gz: 706c9e176befbd2eca212cc6f95a55f3e0dfc61d7fa844007a5a507019b256a5
+  metadata.gz: '03983e1260131b17483ee71ddeba0cdc3f27ac85ae7f4b15ca1d5885f2bf4f97'
+  data.tar.gz: c472173dfec8ec3f361c715663fdef3a8675e940f2531fb7f9998f8a9fb1ec32
 SHA512:
-  metadata.gz: 7395218ebd774335a39540fe27d19710269b94f2fb2d2d6746638f148d32e255f16d43d17ea72e533f988fd35e109a888ac519107386dadd93c950370e0c3153
-  data.tar.gz: 4fee8e8fc1083e90165283cb6e08cb8bafab60a41b2e202bf32d1a5712a39ec3ccf83fe0cba7540076832176586817dc9c42bb83d626a7c79ada5a4043155517
+  metadata.gz: 579eeb12ff7c851ce96808908a4feeacd25cf58548f146023da0d75ba34b735157d72d93ff98271e0b123c834df522514144cd3b51719728ec9e0199ac2f24d7
+  data.tar.gz: de2bf8a7bf3bc106a5785f6734b7d68e054d332559c00c414d540bf67473eeedcfa94a617cc59302e76e4765bd25f6209943e6a716fead578eec90dc1ecfd925

data/config/version.rb

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

data/lib/origen/boot/app.rb

@@ -85,35 +85,6 @@ ________________________________________________________________________________
 
 '
 
-    if Origen.os.windows?
-      PATH_WARNING = %q(
-Warning, your PATH does not contain ./lbin which is expected by Origen.
-You can correct this by editing your system's PATH environment variable via:
-
-(right-click) My Computer -> Properties -> Advanced system settings -> Environment Variables
-
-Path is under System variables and add the following value to it:
-
-  .\lbin
-
-______________________________________________________________________________________
-
-)
-
-    else
-      PATH_WARNING = %q(
-Warning, your PATH does not contain ./lbin which is expected by Origen.
-You can correct this by adding one of the following lines to the end of your
-environment setup file:
-
-  In ~/.bashrc or ~/.bashrc.user:  export PATH="./lbin:$PATH"'
-  In ~/.tcshrc or ~/.tcshrc.user:  setenv PATH "./lbin:$PATH"'
-
-______________________________________________________________________________________
-
-)
-    end
-
     BINSTUB =
 "#!/usr/bin/env ruby
 #
@@ -167,12 +138,6 @@ end
         origen_binstub = File.join(lbin_dir, 'origen')
 
         unless exec_remote
-          if Origen.os.windows?
-            warnings << PATH_WARNING unless ENV['PATH'] =~ /\.\\lbin(;|$)/
-          else
-            warnings << PATH_WARNING unless ENV['PATH'] =~ /(^|:)\.\/lbin(:|$)/
-          end
-
           if !File.exist?(origen_binstub) ||
              (File.exist?(origen_binstub) && File.read(origen_binstub) !~ /This file was generated by Origen/)
             warnings << BUNDLER_WARNING

data/lib/origen/generator/comparator.rb

@@ -51,7 +51,8 @@ module Origen
       end
 
       def relative_path_to(file)
-        p = Pathname(file).relative_path_from(Pathname.pwd).to_s
+        file = Pathname.new(file) unless file.is_a?(Pathname)
+        p = file.expand_path.relative_path_from(Pathname.pwd).to_s
         p.gsub!('/', '\\') if Origen.running_on_windows?
         p
       end

data/lib/origen/parameters.rb

@@ -27,7 +27,7 @@ module Origen
 
     def define_params(name, options = {}, &block)
       if _parameter_sets[name]
-        fail 'Parameter sets cannot be re-opened once originally defined!'
+        fail "Parameter set '#{name}' cannot be re-opened once originally defined!"
       else
         _parameter_sets[name] = Set.new(top_level: true, owner: self)
         if options[:inherit]

data/lib/origen/parameters/set.rb

@@ -60,10 +60,10 @@ module Origen
           if args.length != 0
             super
           else
-            val = self[method]
-            if !val
+            if !key?(method)
               super
             else
+              val = self[method]
               if val.is_a?(Set)
                 val
               else

data/lib/origen/sub_blocks.rb

@@ -271,7 +271,9 @@ module Origen
       tests.empty? ? false : true
     end
 
-    def sub_block(name, options = {})
+    def sub_block(name = nil, options = {})
+      name, options = nil, name if name.is_a?(Hash)
+      return sub_blocks unless name
       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
@@ -295,10 +297,12 @@ module Origen
         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
-        unless respond_to?(name)
-          define_singleton_method name do
-            get_sub_block(name)
-          end
+        if respond_to?(name)
+          callers = caller[0].split(':')
+          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)
         end
         if sub_blocks[name] && sub_blocks[name].is_a?(Placeholder)
           sub_blocks[name].add_attributes(options)
@@ -347,6 +351,10 @@ module Origen
       @current_group = []    # open group
       yield                  # any sub_block calls within this block will have their ID added to @current_group
       my_group = @current_group.dup
+      if respond_to?(id)
+        callers = caller[0].split(':')
+        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_singleton_method "#{id}" do
         if options[:class_name]
           b = Object.const_get(options[:class_name]).new

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-01-22"
+  s.date = "2019-01-24"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "bin/fix_my_workspace".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/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/sub_block_parser.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "lib/tasks/app_generators.rake".freeze, "lib/tasks/new_app_tests.rake".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/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/lib".freeze, "templates/app_generators/application/lib/app.rake".freeze, "templates/app_generators/application/lib/module.rb".freeze, "templates/app_generators/application/lib/top_level.rb".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/application/templates".freeze, "templates/app_generators/application/templates/web".freeze, "templates/app_generators/application/templates/web/index.md.erb".freeze, "templates/app_generators/application/templates/web/layouts".freeze, "templates/app_generators/application/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/templates/web/partials".freeze, "templates/app_generators/application/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/templates/web/release_notes.md.erb".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/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/plugin.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".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/plugin/lib".freeze, "templates/app_generators/plugin/lib/README".freeze, "templates/app_generators/plugin/lib_dev".freeze, "templates/app_generators/plugin/lib_dev/README".freeze, "templates/app_generators/plugin/templates".freeze, "templates/app_generators/plugin/templates/web".freeze, "templates/app_generators/plugin/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/templates/web/partials".freeze, "templates/app_generators/plugin/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/Gemfile".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/j750.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/jlink.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/ip_block.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/ip_block_controller.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/top_level.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/top_level_controller.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/pattern".freeze, "templates/app_generators/test_engineering/stand_alone_application/pattern/example.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/target".freeze, "templates/app_generators/test_engineering/stand_alone_application/target/top_level.rb".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/environment".freeze, "templates/app_generators/test_engineering/test_block/environment/j750.rb".freeze, "templates/app_generators/test_engineering/test_block/environment/ultraflex.rb".freeze, "templates/app_generators/test_engineering/test_block/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/test_block/lib".freeze, "templates/app_generators/test_engineering/test_block/lib/controller.rb".freeze, "templates/app_generators/test_engineering/test_block/lib/interface.rb".freeze, "templates/app_generators/test_engineering/test_block/lib/model.rb".freeze, "templates/app_generators/test_engineering/test_block/lib_dev".freeze, "templates/app_generators/test_engineering/test_block/lib_dev/dut.rb".freeze, "templates/app_generators/test_engineering/test_block/lib_dev/dut_controller.rb".freeze, "templates/app_generators/test_engineering/test_block/pattern".freeze, "templates/app_generators/test_engineering/test_block/pattern/example.rb".freeze, "templates/app_generators/test_engineering/test_block/program".freeze, "templates/app_generators/test_engineering/test_block/program/prb1.rb".freeze, "templates/app_generators/test_engineering/test_block/target".freeze, "templates/app_generators/test_engineering/test_block/target/default.rb".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.42.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport