origen 0.51.1 → 0.51.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04054ba3497f3d1f4423748468f8039445971cc1f2415b38b62d24992653e575
-  data.tar.gz: 60c7ab624890e6452d5e5b867f53c11211c7f967599f330eedbcfa896ae8f8d7
+  metadata.gz: eda912bc0e1bb63358db06e630e5d87515cbf063349ae4e8d5c80905a4a914fc
+  data.tar.gz: f7d359b09d280721560963184dafa8b42d52b5e0712770ef76524ddf29f20b92
 SHA512:
-  metadata.gz: ecc819defb6a25fd795fc8c886466c22116bf858ea6e67cb8d13b63fde1bb5a97ddc1bf113bf025f4d3b6dfde90fa1c608c93ecf517f18a0f752667117adc265
-  data.tar.gz: da18b23a23999c13fc4fba58ce002e5ea2681a5b392771dea269db4050ab36c6c657de9119b55a2ccdd4a3d5bf9c6393ed22d474c4157b2a312a66f87f2b1e99
+  metadata.gz: ba07103f5ab19e1ac3fc026321ba9dd975ee0897c9c9ba2417d9b4d3d10fdcaaebea50a08f7bdfebc0e61bb75996b539761a71003484429cf0a1522f9e4b3a96
+  data.tar.gz: 50a88f26bb2d24a5f419c12bbac9acae8760e13a38dbaa649d00d0dfca8878f5c883248af3df1c4087bfa63e71bf182657c436ee836ac00055769af8110379dc

data/config/version.rb

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

data/lib/origen/application.rb

@@ -50,6 +50,8 @@ module Origen
               Origen.register_application(app)
             end
             app.add_lib_to_load_path!
+            # Also blow this cache as a new app has just been added
+            @apps_by_namespace = nil
           end
         end
       end
@@ -135,11 +137,6 @@ module Origen
     #
     # Returns a lookup table for all block definitions (app/blocks) that the app contains
     def blocks_files
-      # There seems to be some issue with this cache being corrupted when running the test suite
-      # in Travis, but don't believe that this is really an issue in practice and cannot replicate
-      # it locally. Therefore maintaining the cache of this potentially expensive operation except
-      # from when running in CI.
-      @blocks_files = nil if ENV['CONTINUOUS_INTEGRATION']
       @blocks_files ||= begin
         files = {}
         block_dir = Pathname.new(File.join(root, 'app', 'blocks'))
@@ -167,7 +164,7 @@ module Origen
         type = file.basename('.rb').to_s.to_sym
         unless type == :model || type == :controller
           files[path][type] ||= []
-          files[path][type] << file
+          files[path][type] << file.to_s
         end
       end
       derivatives = current_dir.join('derivatives')

data/lib/origen/loader.rb

@@ -94,8 +94,12 @@ module Origen
 
     # @api private
     def self.load_block_file(file, model)
-      e = File.exist?(file.to_s)
-      model.instance_eval(file.read, file.to_s) if e
+      file = file.to_s
+      if File.exist?(file)
+        File.open(file, 'r') do |f|
+          model.instance_eval(f.read, file)
+        end
+      end
       true
     end
 

data/lib/origen/sub_blocks.rb

@@ -299,6 +299,8 @@ module Origen
         end
         if respond_to?(name)
           callers = caller[0].split(':')
+          # reunite the drive and path if on windows os
+          callers[0] = callers[0] + ':' + callers.delete_at(1) if Origen.os.windows?
           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
@@ -353,6 +355,8 @@ module Origen
       my_group = @current_group.dup
       if respond_to?(id)
         callers = caller[0].split(':')
+        # reunite the drive and path if on windows os
+        callers[0] = callers[0] + ':' + callers.delete_at(1) if Origen.os.windows?
         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

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-05-27"
+  s.date = "2019-05-28"
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.51.1
+  version: 0.51.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport