origen 0.7.24 → 0.7.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96077b0fbaaf9abb787b9db8aa77e996da1035b9
-  data.tar.gz: 9c54cb2a4381a4176e683a5818660f5e69a979df
+  metadata.gz: f00de9cfd35bf3b781f46b122cdba834cc4e463e
+  data.tar.gz: b7bd2adf089d4ed70c76ed834fbcbf1a2afba6bb
 SHA512:
-  metadata.gz: c0a59431d8da8766af067d96397e11fb0d22b78a3e8a6f8ebb34b6b1cdd8f2f5ed21e73ea57bb0cd4a1897030e2a4aa292aa4f936afdcc166ba7cf5a7be470fe
-  data.tar.gz: a192b3b3d8a0982d7302570899709f70b8ad44b585ef1d2e034c0d7b3baf227a4fe2ad9bd85b4918938efddd747032e62cbed515882cc223b17e8aa355005555
+  metadata.gz: 9714b2e319c3aaef19d537801f97969d2852e7b843a91f88fe7a9cd19786e58a28b79a7a0036defacfe2bb292f522ef13053c90ab14c189dcc8d16ccd36cf6c8
+  data.tar.gz: ad47dec90e2fa07fe5c9c19840681d715716c8913b1871bca2e30685471240902bff5761ec789a29adcdf06067e5da68b041d1e6a6db3f9edb890939742e8259

data/config/version.rb

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

data/lib/origen.rb

@@ -105,9 +105,10 @@ unless defined? RGen::ORIGENTRANSITION
         Origen.app.plugins
       end
 
-      def app_loaded?
+      def application_loaded?
         @application_loaded
       end
+      alias_method :app_loaded?, :application_loaded?
 
       def plugins_loaded?
         @plugins_loaded
@@ -452,10 +453,29 @@ unless defined? RGen::ORIGENTRANSITION
           validate_origen_dev_configuration!
           ([@application] + Origen.app.plugins).each(&:on_loaded)
           @application_loaded = true
+          Array(@after_app_loaded_blocks).each { |b| b.call(@application) }
           @application
         end
       end
 
+      # Sometimes it is necessary to refer to the app instance before it is fully loaded, which can lead to runtime
+      # errors.
+      #
+      # Such code can be wrapped in this method to ensure that it will run safely by differing it until the app
+      # is fully loaded.
+      #
+      #   Origen.after_app_loaded do
+      #     Origen.app.do_something
+      #   end
+      def after_app_loaded(&block)
+        if application_loaded?
+          yield app
+        else
+          @after_app_loaded_blocks ||= []
+          @after_app_loaded_blocks << block
+        end
+      end
+
       # @api private
       def loading_top_level?
         @loading_top_level

data/lib/origen/application.rb

@@ -36,7 +36,7 @@ module Origen
           app = base.instance
           app.root = root.to_s
           if Origen.plugins_loaded? && !Origen.loading_top_level?
-            Origen.log.warning "The #{app.name} plugin is using a non-standard loading mechanism, upgrade to a newer version to get rid of this error (please report a bug if that does not remove this warning)"
+            Origen.log.warning "The #{app.name} plugin is using a non-standard loading mechanism, upgrade to a newer version of it to get rid of this warning (please report a bug to its owner if this warning persists)"
             Origen.app.plugins << app
           else
             Origen.register_application(app)
@@ -260,10 +260,10 @@ module Origen
     def current?
       # If this is called before the plugins are loaded (i.e. by a plugin's application file), then
       # it is definitely not the top-level app
-      if Origen.plugins_loaded?
+      if Origen.application_loaded?
         Origen.app == self
       else
-        false
+        Origen.root == root
       end
     end
     alias_method :standalone?, :current?
@@ -272,7 +272,7 @@ module Origen
     # Returns true if the given application instance is
     # the current plugin
     def current_plugin?
-      if Origen.plugins_loaded?
+      if Origen.application_loaded?
         Origen.app.plugins.current == self
       else
         puts <<-END

data/lib/origen/generator.rb

@@ -74,7 +74,9 @@ module Origen
 
     def create_iterator
       iterator = PatternIterator.new
-      Origen.app.pattern_iterators << iterator
+      Origen.after_app_loaded do |app|
+        app.pattern_iterators << iterator
+      end
       iterator
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.24
+  version: 0.7.25
 platform: ruby
 authors:
 - Stephen McGinty