origen 0.7.23 → 0.7.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93745a8389b038130ff9ea3497ff7c20eb3b115a
-  data.tar.gz: 91edbedad884bbbcc8752e62e05c6f96b3d5d4d3
+  metadata.gz: 96077b0fbaaf9abb787b9db8aa77e996da1035b9
+  data.tar.gz: 9c54cb2a4381a4176e683a5818660f5e69a979df
 SHA512:
-  metadata.gz: a4e6949d31e47568c928342dde21191fd1c94beb111547d44bbd1781c0294147cde9676d8269eaafe444ebe527eb7febada8f2325a60ea4850953067c3bb7898
-  data.tar.gz: 518c7bf4e8d3a3ffcf403eba3f93c89863e1d401f2fd62f4ae26ef5912964eed3fce4095bbe7b22b10a261fc2f98dd99aa94f46bc18d2127c4dd65eda06867c0
+  metadata.gz: c0a59431d8da8766af067d96397e11fb0d22b78a3e8a6f8ebb34b6b1cdd8f2f5ed21e73ea57bb0cd4a1897030e2a4aa292aa4f936afdcc166ba7cf5a7be470fe
+  data.tar.gz: a192b3b3d8a0982d7302570899709f70b8ad44b585ef1d2e034c0d7b3baf227a4fe2ad9bd85b4918938efddd747032e62cbed515882cc223b17e8aa355005555

data/config/version.rb

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

data/lib/origen.rb

@@ -109,6 +109,10 @@ unless defined? RGen::ORIGENTRANSITION
         @application_loaded
       end
 
+      def plugins_loaded?
+        @plugins_loaded
+      end
+
       # Returns the current (top-level) application instance
       def app(plugin = nil, _options = {})
         plugin, options = nil, plugin if plugin.is_a?(Hash)
@@ -418,8 +422,7 @@ unless defined? RGen::ORIGENTRANSITION
           # chdir to the new app directory (to fetch it) Origen.log would try to load the partial app.
           @running_outside_an_app = true unless in_app_workspace?
           return nil if @running_outside_an_app
-          require File.join(root, APP_CONFIG)
-          @application = _applications_lookup[:root][root.to_s]
+          # Load the app's plugins and other gem requirements
           if File.exist?(File.join(root, 'Gemfile')) && !@with_boot_environment
             # Don't understand the rules here, belt and braces approach for now to make
             # sure that all Origen plugins are auto-required (otherwise Origen won't know
@@ -429,6 +432,12 @@ unless defined? RGen::ORIGENTRANSITION
             Bundler.require(:runtime)
             Bundler.require(:default)
           end
+          @plugins_loaded = true
+          # Now load the app
+          @loading_top_level = true
+          require File.join(root, APP_CONFIG)
+          @application = _applications_lookup[:root][root.to_s]
+          @loading_top_level = false
           if @with_boot_environment
             @application.plugins.disable_current
           else
@@ -447,6 +456,11 @@ unless defined? RGen::ORIGENTRANSITION
         end
       end
 
+      # @api private
+      def loading_top_level?
+        @loading_top_level
+      end
+
       def launch_time
         @launch_time ||= time_now
       end

data/lib/origen/application.rb

@@ -35,7 +35,12 @@ module Origen
           root = Pathname.new(caller[0].sub(/(\\|\/)?config(\\|\/)application.rb.*/, '')).realpath
           app = base.instance
           app.root = root.to_s
-          Origen.register_application(app)
+          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.app.plugins << app
+          else
+            Origen.register_application(app)
+          end
           app.add_lib_to_load_path!
         end
       end
@@ -253,13 +258,47 @@ module Origen
     # Returns true if the given application instance is the
     # current top level application
     def current?
-      Origen.app == self
+      # 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?
+        Origen.app == self
+      else
+        false
+      end
     end
+    alias_method :standalone?, :current?
+    alias_method :running_standalone?, :current?
 
     # Returns true if the given application instance is
     # the current plugin
     def current_plugin?
-      Origen.app.plugins.current == self
+      if Origen.plugins_loaded?
+        Origen.app.plugins.current == self
+      else
+        puts <<-END
+current_plugin? cannot be used at this point in your code since the app is not loaded yet.
+
+If you are calling this from config/application.rb then you can only use current_plugin? within a block:
+
+# Not OK
+if current_plugin?
+  config.output_directory = "#{Origen.root}/output/dir1"
+else
+  config.output_directory = "#{Origen.root}/output/dir2"
+end
+
+# OK
+config.output_directory do
+  if current_plugin?
+    "#{Origen.root}/output/dir1"
+  else
+    "#{Origen.root}/output/dir2"
+  end
+end
+
+END
+        exit 1
+      end
     end
 
     # Returns the current top-level object (the DUT)
@@ -464,6 +503,10 @@ module Origen
       @config ||= Configuration.new(self)
     end
 
+    def add_config_attribute(*args)
+      Application::Configuration.add_attribute(*args)
+    end
+
     # Returns the name of the given application, this is the name that will
     # be used to refer to the application when it is used as a plugin
     def name

data/lib/origen/application/configuration.rb

@@ -37,11 +37,11 @@ module Origen
 
       # Any attributes that want to accept a block, but not necessarily require the target
       # can be added here
-      ATTRS_THAT_ACCEPT_A_BLOCK = ATTRS_THAT_DEPEND_ON_TARGET +
-                                  [:release_instructions, :history_file, :log_directory, :copy_command,
-                                   :diff_command, :remotes,
-                                   :external_app_dirs
-                                  ]
+      ATTRS_THAT_DONT_DEPEND_ON_TARGET = [
+        :release_instructions, :history_file, :log_directory, :copy_command,
+        :diff_command, :remotes,
+        :external_app_dirs
+      ]
 
       # If a current plugin is present then its value for these attributes will be
       # used instead of that from the current application
@@ -122,7 +122,11 @@ module Origen
       #   # config/application.rb
       #
       #   config.output_directory = ->{ "#{Origen.root}/output/#{$dut.class}" }
-      ATTRS_THAT_ACCEPT_A_BLOCK.each do |name|
+      def self.add_attribute(name, options = {})
+        options = {
+          depend_on_target: true
+        }.merge(options)
+        attr_writer name
         define_method name do |override = true, &block|
           if block # _given?
             instance_variable_set("@#{name}".to_sym, block)
@@ -131,9 +135,9 @@ module Origen
                app.current? && Origen.app.plugins.current
               var = Origen.app.plugins.current.config.send(name, override: false)
             end
-            var ||= instance_variable_get("@#{name}".to_sym)
+            var ||= instance_variable_get("@#{name}".to_sym) || options[:default]
             if var.respond_to?('call')
-              if ATTRS_THAT_DEPEND_ON_TARGET.include?(name)
+              if options[:depend_on_target]
                 # If an attempt has been made to access this attribute before the target has
                 # been instantiated raise an error
                 # Note Origen.app here instead of just app to ensure we are talking to the top level application,
@@ -150,7 +154,11 @@ module Origen
         end
       end
 
-      (ATTRS_THAT_CURRENT_PLUGIN_CAN_OVERRIDE - ATTRS_THAT_ACCEPT_A_BLOCK).each do |name|
+      ATTRS_THAT_DEPEND_ON_TARGET.each { |n| add_attribute(n) }
+
+      ATTRS_THAT_DONT_DEPEND_ON_TARGET.each { |n| add_attribute(n, depend_on_target: false) }
+
+      (ATTRS_THAT_CURRENT_PLUGIN_CAN_OVERRIDE - ATTRS_THAT_DEPEND_ON_TARGET - ATTRS_THAT_DONT_DEPEND_ON_TARGET).each do |name|
         if override && ATTRS_THAT_CURRENT_PLUGIN_CAN_OVERRIDE.include?(name) &&
            app.current? && Origen.app.plugins.current
           var = Origen.app.plugins.current.config.send(name, override: false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.23
+  version: 0.7.24
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -567,7 +567,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit