origen 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73c99a4efdb1a7f595896b7b1c2300f2893bdc6f
-  data.tar.gz: 32d2f94bca108ff539d1c16d846731a072f60f55
+  metadata.gz: b668d7712bef8be358291fe9bec47914b1738b43
+  data.tar.gz: f24c2df62d2f22ec88a6e9d417205129e5923ce4
 SHA512:
-  metadata.gz: 561c1b67a67028c015cbcbc9b1fd5da10291f7995f55da5e4bcefeb768bbc5935068aceb140e7aca51ca096e817c024151aca36e615e324748659cbc3a3665eb
-  data.tar.gz: 2d78a652c904d98670ab82d1396b9f139fe91d611963bad5eaa15088533773fdb637ea223180a23e84cb68fc136e04aa2893e27d44a900b7628efcdbb0da83a7
+  metadata.gz: e0eafb6914409f6a5ebdf07c03e769caf9457858570050d89ff4af0e4cd0672d5153802d31d448eb00c18b89dce97ef66908ef34972fec196f32c5f94dd4ba6a
+  data.tar.gz: e4616d302bd38753d3abd11feabc11a5e21cdc8bfe32f42415ec859eb094df3c93a5ff7412f42acdd11010e80f179bda5edec7fc145fa587fd1c52e5f3fc0c50

data/config/version.rb

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

data/lib/origen/application.rb

@@ -755,6 +755,7 @@ END
       options = {
         force_debug: false
       }.merge(options)
+      @on_create_called = false
       if options[:reload]
         @target_load_count = 0
       else
@@ -785,6 +786,7 @@ END
         @target_instantiated = true
         Origen.mode = :debug if options[:force_debug]
         listeners_for(:on_create).each(&:on_create)
+        @on_create_called = true
         # Keep this within the load_event to ensure any objects that are further instantiated objects
         # will be associated with (and cleared out upon reload of) the current target
         listeners_for(:on_load_target).each(&:on_load_target)
@@ -794,6 +796,11 @@ END
       # @target_instantiated = true
     end
 
+    # Returns true if the on_create callback has already been called during a target load
+    def on_create_called?
+      !!@on_create_called
+    end
+
     # Not a clean unload, but allows objects to be re-instantiated for testing
     # @api private
     def unload_target!

data/lib/origen/callbacks.rb

@@ -9,6 +9,11 @@ module Origen
 
     def register_callback_listener # :nodoc:
       Origen.app.add_callback_listener(self)
+      # If this object has been instantiated after on_create has already been called,
+      # then invoke it now
+      if Origen.app.on_create_called?
+        on_create if respond_to?(:on_create)
+      end
     end
   end
 

data/lib/origen/generator/compiler.rb

@@ -197,8 +197,10 @@ module Origen
 
       # Returns the ERB buffer name for the given file, something like "@my_file_name"
       def buffer_name_for(file)
-        # Not sure why the final gsub is needed but seems to fail to parse correctly otherwise.
-        @current_buffer = "@_#{file.basename('.*').basename('.*').to_s.gsub('-', '_')}"
+        expected_filename = file.basename.to_s.chomp('.erb')
+        expected_filename.gsub!('-', '_') if expected_filename.match(/-/)
+        expected_filename.gsub!('.', '_') if expected_filename.match(/./)
+        @current_buffer = '@_' + expected_filename
       end
 
       def merge_file(file, _options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport