origen 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d09a212e8865158fd2d74d8b4beae1aa6a606f3
-  data.tar.gz: 33f72cc29a3a8959f70b05dd7011a66ae4d407b0
+  metadata.gz: 2cf3140f29f89f5990d3fd1d9280f7ee8d3f807a
+  data.tar.gz: 53d58d539aa2f2469f90f93a9964a01f77564ec4
 SHA512:
-  metadata.gz: 0550fa8d8582b7630472fb0a3916e886513b97a3457269d5d307cf0047ef66e102d263575d832dde51a53ac96b721a9b9d591e29be0198980759ddd69a3923f7
-  data.tar.gz: ee057ec1cebfeceff81bfec1ad893b095baf4d79d53997cf173dbee46e982448d788cb71fba914dd6ea86521f23f4dbb5bf85849cff06520ae8e2e025c0d3a82
+  metadata.gz: 2e6de38d9c7d045398861ca6cc6ce313ed97808677ce92d49657f1eee7ffdf8e563dcc9a97ce17f9c4c7327dc0476c734f5b195e4692629ab2ff2af438d8e505
+  data.tar.gz: 8a1e4ea8472fbc7bd32fe9b3b92c6baf0b1e1800101cb775955e40953fc8062abe7580eaf128c9be1f8fc9598a1a55d57b2e50c96791d59ad0941af6660784e2

data/bin/origen

@@ -207,7 +207,9 @@ rescue Exception => e
       e.backtrace.each do |line|
         path = Pathname.new(line)
         if path.absolute?
-          puts line if Origen.log.level == :verbose
+          if Origen.log.level == :verbose || (line =~ /^#{Origen.root}/ && line !~ /^#{Origen.root}\/lbin/)
+            puts line 
+          end
         else
           if Origen.log.level == :verbose
             puts line

data/config/boot.rb

@@ -1,13 +1,7 @@
 # Interfaces must be required, can't autoload
-require "c99/j750_interface"
+require "c99/ate_interface"
 require "c99/doc_interface"
 # The majority of this class is defined in the support application,
 # this is to test that the importing application can override and
 # extend imported classes.
 require_relative "../lib/c99/nvm"
-
-# Dummy definition to allow Origen tests to run until the Testers plugin is available
-module Testers
-  class J750
-  end
-end

data/config/commands.rb

@@ -13,7 +13,6 @@ when "specs"
   exit RSpec::Core::Runner.run(['spec'])
 
 when "examples", "test"  
-  $enable_testers = true if ARGV.delete("--testers")
   Origen.load_application
   status = 0
   Dir["#{Origen.root}/examples/*.rb"].each do |example|

data/config/version.rb

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

data/lib/c99/{j750_interface.rb → ate_interface.rb}

@@ -1,5 +1,7 @@
 module C99
-  module J750BaseInterface
+  class ATEInterface
+    include OrigenTesters::ProgramGenerators
+
     # Options passed to Flow.create and Library.create will be passed in here, use as
     # desired to configure your interface
     def initialize(_options = {})
@@ -72,14 +74,4 @@ module C99
       patsets.add("#{name}_pset", pattern: "#{name}.PAT")
     end
   end
-
-  class J750Interface
-    include J750BaseInterface
-    include Origen::Tester::J750::Generator
-  end
-
-  # class TestersJ750Interface
-  #  include J750BaseInterface
-  #  include Testers::J750::Generator
-  # end
 end

data/lib/c99/doc_interface.rb

@@ -1,6 +1,6 @@
 module C99
   class DocInterface
-    include Origen::Tester::Doc::Generator
+    include OrigenTesters::Doc::Generator
 
     # Options passed to Flow.create and Library.create will be passed in here, use as
     # desired to configure your interface

data/lib/origen.rb

@@ -13,10 +13,8 @@ require 'origen/top_level'
 require 'origen/model'
 require 'origen/ruby_version_check'
 require 'origen/application'
-require 'origen/import_manager'
 require 'origen/remote_manager'
 require 'origen/utility'
-require 'origen/version_checker'
 require 'origen/logger_methods'
 require 'option_parser/optparse'
 require 'bundler'
@@ -27,11 +25,9 @@ module Origen
   autoload :Generator, 'origen/generator'
   autoload :Pins,      'origen/pins'
   autoload :Registers, 'origen/registers'
-  autoload :Tester,    'origen/tester'
   autoload :Users,     'origen/users'
   autoload :FileHandler, 'origen/file_handler'
   autoload :RegressionManager, 'origen/regression_manager'
-  autoload :NVM,       'origen/nvm'
   autoload :Location,  'origen/location'
   autoload :VersionString, 'origen/version_string'
   autoload :Mode,      'origen/mode'
@@ -95,16 +91,9 @@ module Origen
       @plugins = nil
     end
 
-    # Returns an array containing the application instances of all plugins
     def plugins
-      @plugins ||= begin
-        top = Origen.app
-        plugins = []
-        Origen._applications_lookup[:name].each do |_name, app|
-          plugins << app unless app == top
-        end
-        plugins
-      end
+      Origen.deprecate 'Origen.plugins is deprecated, use Origen.app.plugins instead'
+      Origen.app.plugins
     end
 
     def app_loaded?
@@ -317,11 +306,6 @@ module Origen
       @with_boot_environment = false
     end
 
-    def with_disable_origen_version_check(*args, &block)
-      version_checker.with_disable_origen_version_check(*args, &block)
-    end
-    alias_method :disable_origen_version_check, :with_disable_origen_version_check
-
     # This is the application-facing API for implementing custom callbacks,
     # the top-level application, all plugin application instances, and any
     # application objects that include the Origen::Callbacks module will be
@@ -367,12 +351,14 @@ module Origen
     end
 
     def import_manager
-      @import_manager ||= ImportManager.new
+      Origen.deprecated 'Origen.import_manager is deprecated, use Origen.app.plugins instead'
+      app.plugins
     end
     alias_method :imports_manager, :import_manager
 
     def plugins_manager
-      application.plugins_manager
+      Origen.deprecated 'Origen.plugins_manager and Origen.current_plugin are deprecated, use Origen.app.plugins instead'
+      app.plugins
     end
     alias_method :plugin_manager, :plugins_manager
     alias_method :current_plugin, :plugins_manager
@@ -415,7 +401,7 @@ module Origen
     #
     # In most cases this should never need to be called directly and will be called
     # automatically the first time the application is referenced via Origen.app
-    def load_application(check_version = true)
+    def load_application(options = {})
       @application ||= begin
         # This flag is set so that when a thread starts with no app it remains with no app. This
         # was an issue when building a new app with the fetch command and when the thread did a
@@ -434,9 +420,8 @@ module Origen
           Bundler.require(:default)
         end
         if @with_boot_environment
-          @application.current_plugin.disable
+          @application.plugins.disable_current
         else
-          Origen.import_manager.require!
           Origen.remote_manager.require!
         end
         boot = File.join(root, 'config', 'boot.rb')
@@ -445,9 +430,8 @@ module Origen
         require env if File.exist?(env)
         dev = File.join(root, 'config', 'development.rb')
         require dev if File.exist?(dev)
-        version_checker.check! if check_version
         validate_origen_dev_configuration!
-        ([@application] + Origen.plugins).each(&:on_loaded)
+        ([@application] + Origen.app.plugins).each(&:on_loaded)
         @application_loaded = true
         @application
       end
@@ -457,11 +441,6 @@ module Origen
       @launch_time ||= time_now
     end
 
-    # Returns an instance of Origen::VersionChecker
-    def version_checker
-      @version_checker ||= VersionChecker.new
-    end
-
     # Returns the full path to the Origen core top-level directory
     def top
       @origen_top ||= Pathname.new(File.dirname(__FILE__)).parent

data/lib/origen/application.rb

@@ -10,6 +10,7 @@ module Origen
     autoload :Target,        'origen/application/target'
     autoload :Environment,   'origen/application/environment'
     autoload :PluginsManager, 'origen/application/plugins_manager'
+    autoload :Plugins,       'origen/application/plugins'
     autoload :LSF,           'origen/application/lsf'
     autoload :Runner,        'origen/application/runner'
     autoload :ConfigurationManager, 'origen/application/configuration_manager'
@@ -201,11 +202,7 @@ module Origen
     # Returns true if the given application instance is
     # the current plugin
     def current_plugin?
-      if Origen.current_plugin.name
-        Origen.current_plugin.instance == self
-      else
-        false
-      end
+      Origen.app.plugins.current == self
     end
 
     # Returns the current top-level object (the DUT)
@@ -420,8 +417,13 @@ module Origen
       (Origen.app.config.gem_name || name).to_s.underscore.symbolize
     end
 
+    def plugins
+      @plugins ||= Plugins.new
+    end
+
     def plugins_manager
-      @plugins_manager ||= PluginsManager.new
+      Origen.deprecated 'Origen.app.plugins_manager and Origen.app.current_plugin are deprecated, use Origen.app.plugins instead'
+      plugins
     end
     alias_method :plugin_manager, :plugins_manager
     alias_method :current_plugin, :plugins_manager
@@ -505,7 +507,7 @@ module Origen
     end
 
     def callback_listeners
-      current = Origen.current_plugin.instance
+      current = Origen.app.plugins.current
       applications = [self]
       applications << current if current
       applications + instantiated_callback_listeners
@@ -664,7 +666,7 @@ module Origen
         listeners_for(:on_load_target).each(&:on_load_target)
       end
       listeners_for(:after_load_target).each(&:after_load_target)
-      Origen.import_manager.validate_production_status
+      Origen.app.plugins.validate_production_status
       # @target_instantiated = true
     end
 

data/lib/origen/application/configuration.rb

@@ -6,8 +6,7 @@ module Origen
       # Returns the configuration's application instance
       attr_reader :app
 
-      attr_accessor :name, :initials, :instructions, :required_origen_version,
-                    :min_required_origen_version, :max_required_origen_version,
+      attr_accessor :name, :initials, :instructions,
                     :history_file, :release_directory, :release_email_subject,
                     :production_targets, :mode,
                     :vault, :output_directory, :reference_directory,
@@ -17,7 +16,7 @@ module Origen
                     :test_program_output_directory, :erb_trim_mode, :test_program_source_directory,
                     :test_program_template_directory, :referenced_pattern_list, :program_prefix,
                     :copy_command, :diff_command, :compile_only_dot_erb_files, :web_directory,
-                    :web_domain, :imports, :imports_dev,
+                    :web_domain,
                     :strict_errors, :unmanaged_dirs, :unmanaged_files, :remotes,
                     :external_app_dirs, :lint_test, :shared, :yammer_group, :rc_url, :rc_workflow,
                     :user_aliases, :release_externally, :gem_name, :disqus_shortname
@@ -40,7 +39,7 @@ module Origen
       # can be added here
       ATTRS_THAT_ACCEPT_A_BLOCK = ATTRS_THAT_DEPEND_ON_TARGET +
                                   [:release_instructions, :history_file, :log_directory, :copy_command,
-                                   :diff_command, :imports, :imports_dev, :remotes,
+                                   :diff_command, :remotes,
                                    :external_app_dirs
                                   ]
 
@@ -53,21 +52,9 @@ module Origen
       ]
 
       def log_deprecations
-        unless imports.empty?
-          Origen.deprecate "App #{app.name} uses config.imports this will be removed in Origen V3 and a Gemfile/.gemspec should be used instead"
-        end
-        unless imports_dev.empty?
-          Origen.deprecate "App #{app.name} uses config.imports_dev this will be removed in Origen V3 and a Gemfile/.gemspec should be used instead"
-        end
-        if required_origen_version
-          Origen.deprecate "App #{app.name} uses config.required_origen_version this will be removed in Origen V3 and a Gemfile/.gemspec should be used instead"
-        end
-        if min_required_origen_version
-          Origen.deprecate "App #{app.name} uses config.min_required_origen_version this will be removed in Origen V3 and a Gemfile/.gemspec should be used instead"
-        end
-        if max_required_origen_version
-          Origen.deprecate "App #{app.name} uses config.max_required_origen_version this will be removed in Origen V3 and a Gemfile/.gemspec should be used instead"
-        end
+        # unless imports.empty?
+        #  Origen.deprecate "App #{app.name} uses config.imports this will be removed in Origen V3 and a Gemfile/.gemspec should be used instead"
+        # end
       end
 
       def initialize(app)
@@ -104,10 +91,10 @@ module Origen
       end
 
       # This defines an enhanced accessor for these attributes that allows them to be assigned
-      # to an annonymous function to calculate the value based on some property of the target
+      # to an anonymous function to calculate the value based on some property of the target
       # objects.
       #
-      # Without this the objects frome the target could not be referenced in config/application.rb
+      # Without this the objects from the target could not be referenced in config/application.rb
       # because they don't exist yet, for example this will not work because $dut has not yet
       # been instantiated:
       #   # config/application.rb
@@ -136,8 +123,8 @@ module Origen
             instance_variable_set("@#{name}".to_sym, block)
           else
             if override && ATTRS_THAT_CURRENT_PLUGIN_CAN_OVERRIDE.include?(name) &&
-               app.current? && Origen.current_plugin.name
-              var = Origen.current_plugin.instance.config.send(name, override: false)
+               app.current? && Origen.app.plugins.current
+              var = Origen.app.plugins.current.config.send(name, override: false)
             end
             var ||= instance_variable_get("@#{name}".to_sym)
             if var.respond_to?('call')
@@ -160,8 +147,8 @@ module Origen
 
       (ATTRS_THAT_CURRENT_PLUGIN_CAN_OVERRIDE - ATTRS_THAT_ACCEPT_A_BLOCK).each do |name|
         if override && ATTRS_THAT_CURRENT_PLUGIN_CAN_OVERRIDE.include?(name) &&
-           app.current? && Origen.current_plugin.name
-          var = Origen.current_plugin.instance.config.send(name, override: false)
+           app.current? && Origen.app.plugins.current
+          var = Origen.app.plugins.current.config.send(name, override: false)
         end
         var || instance_variable_get("@#{name}".to_sym)
       end
@@ -199,7 +186,7 @@ module Origen
       # user can be prompted to upgrade
       def method_missing(method, *_args, &_block)
         method = method.to_s.sub('=', '')
-        puts "WARNING - unknown configuration attribute: #{method}"
+        Origen.log.warning "WARNING - unknown configuration attribute: #{method}"
       end
     end
   end

data/lib/origen/application/plugins.rb

@@ -0,0 +1,122 @@
+module Origen
+  class Application
+    # Provides an API for working with the application's plugins
+    #
+    # An instance of this class is instantiated as Origen.app.plugins
+    class Plugins < ::Array
+      def initialize
+        @plugins ||= begin
+          top = Origen.app
+          Origen._applications_lookup[:name].each do |_name, app|
+            self << app unless app == top
+          end
+        end
+      end
+
+      # Will raise an error if any plugins are currently imported from a path reference
+      # in the Gemfile
+      def validate_production_status(force = false)
+        if Origen.mode.production? || force
+          if File.exist?("#{Origen.root}/Gemfile")
+            File.readlines("#{Origen.root}/Gemfile").each do |line|
+              # http://rubular.com/r/yNGDGB6M2r
+              if line =~ /^\s*gem\s+(("|')\w+("|')),.*(:path\s*=>|path:)/
+                fail "The following gem is defined as a path in your Gemfile, but that is not allowed in production: #{Regexp.last_match[1]}"
+              end
+            end
+          end
+        end
+      end
+
+      # Returns an array of symbols that represent the names of all plugins
+      def names
+        map(&:name)
+      end
+
+      # Returns the current plugin's application instance
+      def current
+        return nil if @disabled
+        name = @temporary || @current ||= Origen.app.session.origen_core[:default_plugin]
+        find { |p| p.name.to_sym == name } if name
+      end
+
+      def current=(name)
+        name = name.to_sym if name
+        Origen.app.session.origen_core[:default_plugin] = name
+        if name == :none
+          @current = nil
+        else
+          @current = name
+        end
+      end
+
+      def temporary=(name)
+        name = name.to_sym if name
+        if name == :none
+          @temporary = nil
+        else
+          @temporary = name
+        end
+      end
+
+      # Temporarily set the current plugin to nil
+      def disable_current
+        @disabled = true
+        if block_given?
+          yield
+          @disabled = false
+        end
+      end
+
+      # Restore the current plugin after an earlier disable
+      def enable_current
+        @disabled = false
+      end
+
+      # @deprecated
+      def default=(name)
+        Origen.deprecated 'Origen.current_plugin.default= is deprecated, use Origen.app.plugins.current= instead'
+        self.current = name
+      end
+
+      # @deprecated
+      def name
+        Origen.deprecated 'Origen.current_plugin.name is deprecated, use Origen.app.plugins.current.name instead'
+        current.name if current
+      end
+
+      # @deprecated
+      def instance
+        Origen.deprecated 'Origen.current_plugin.instance is deprecated, use Origen.app.plugins.current instead'
+        current
+      end
+
+      # @deprecated
+      def default
+        Origen.deprecated 'Origen.current_plugin.default is deprecated, use Origen.app.plugins.current instead'
+        current
+      end
+
+      def shared_commands
+        [Origen.app, self].flatten.map do |plugin|
+          shared = plugin.config.shared || {}
+          if shared[:command_launcher]
+            "#{plugin.root}/#{shared[:command_launcher]}"
+          end
+        end.compact
+      end
+
+      # Return the plugin name if the path specified is from that plugin
+      def plugin_name_from_path(path)
+        path = Pathname.new(path).expand_path.cleanpath
+        each do |plugin|
+          if path.to_s =~ /^#{plugin.root}/
+            return plugin.name
+          end
+        end
+        nil
+      end
+      alias_method :path_within_a_plugin, :plugin_name_from_path
+    end
+  end
+end