origen 0.2.6 → 0.3.0

data/lib/origen/commands/program.rb

@@ -52,7 +52,7 @@ def self._with_doc_tester(options)
 end
 
 _with_doc_tester(options) do
-  Origen.current_plugin.temporary = options[:current_plugin] if options[:current_plugin]
+  Origen.app.plugins.temporary = options[:current_plugin] if options[:current_plugin]
   Origen.environment.temporary = options[:environment] if options[:environment]
   Origen.target.temporary = options[:target] if options[:target]
   Origen.app.load_target!  # This initial load is required to appply any configuration

data/lib/origen/commands/rc.rb

@@ -5,7 +5,7 @@ include Origen::Utility::InputCapture
 def _unmanaged_files
   unmanaged_files = Origen::RevisionControl::IGNORE_FILES
   unmanaged_files += config.unmanaged_files || []
-  unmanaged_files += Origen.import_manager.all_symlinks || []
+  # unmanaged_files += Origen.import_manager.all_symlinks || []
 
   # If the given files are not full paths then prefix with Origen.root, unless they
   # are wildcards
@@ -419,7 +419,7 @@ The following options are available:
         Origen::Log.console_only do
           Dir.chdir Origen.root do
             # Blow away these temporary files to make sure they are not committed
-            Origen.import_manager.send(:remove_all_symlinks!) # removes symlinks from plugins
+            # Origen.import_manager.send(:remove_all_symlinks!) # removes symlinks from plugins
             system("rm -fr #{_unmanaged_dirs.join(' ')} #{_unmanaged_files.join(' ')}")
             options.delete(:force)
             options[:comment] ||= 'Initial'

data/lib/origen/commands/version.rb

@@ -1,17 +1,2 @@
-if Origen.app_loaded?
-  puts "Application: #{Origen.app.version}"
-  if Origen.config.required_origen_version && (Origen.config.required_origen_version != Origen.version)
-    puts "     Origen: #{Origen.version} (App requires #{Origen.config.required_origen_version})"
-  elsif Origen.config.min_required_origen_version &&
-        Origen.version.less_than?(Origen.config.min_required_origen_version)
-    puts "     Origen: #{Origen.version} (App requires >= #{Origen.config.min_required_origen_version})"
-  elsif Origen.config.max_required_origen_version &&
-        Origen.version.greater_than?(Origen.config.max_required_origen_version)
-    puts "     Origen: #{Origen.version} (App requires <= #{Origen.config.max_required_origen_version})"
-  else
-    puts "     Origen: #{Origen.version}"
-  end
-else
-  puts "     Origen: #{Origen.version}"
-end
-exit 0
+puts "Application: #{Origen.app.version}" if Origen.app_loaded?
+puts "     Origen: #{Origen.version}"

data/lib/origen/commands_global.rb

@@ -47,12 +47,15 @@ case command
 
 when 'new'
   require 'origen/commands/new'
+  exit 0
 
 when '--version', '-v'
   require 'origen/commands/version'
+  exit 0
 
 when 'fetch', 'f'
   require 'origen/commands/fetch'
+  exit 0
 
 when 'interactive'
   IRB.start

data/lib/origen/file_handler.rb

@@ -117,8 +117,8 @@ module Origen
       elsif current_directory && File.exist?("#{current_directory}/#{file}")
         Pathname.new("#{current_directory}/#{file}")
       # Is it a path relative to the current plugin's Origen.root?
-      elsif Origen.current_plugin.instance && File.exist?("#{Origen.current_plugin.instance.root}/#{file}")
-        Pathname.new("#{Origen.current_plugin.instance.root}/#{file}")
+      elsif Origen.app.plugins.current && File.exist?("#{Origen.app.plugins.current.root}/#{file}")
+        Pathname.new("#{Origen.app.plugins.current.root}/#{file}")
       elsif options[:default_dir]
         m = all_matches(file, options)
         if m
@@ -140,17 +140,17 @@ module Origen
     end
 
     def check(path)
-      file_plugin = Origen.import_manager.path_within_a_plugin(path)
+      file_plugin = Origen.app.plugins.path_within_a_plugin(path)
       if file_plugin
-        if Origen.current_plugin.name
-          if file_plugin == Origen.current_plugin.name
+        if Origen.app.plugins.current
+          if file_plugin == Origen.app.plugins.current.name
             return path
           else
-            puts "The requested file is from plugin #{file_plugin} and current system plugin is set to plugin #{Origen.current_plugin.name}!"
+            puts "The requested file is from plugin #{file_plugin} and current system plugin is set to plugin #{Origen.app.plugins.current.name}!"
             fail 'Incorrect plugin error!'
           end
         else
-          Origen.current_plugin.temporary = file_plugin
+          Origen.app.plugins.temporary = file_plugin
           return path
         end
       else
@@ -159,8 +159,8 @@ module Origen
     end
 
     def all_matches(file, options)
-      if Origen.current_plugin.name
-        matches = Dir.glob("#{options[:default_dir]}/#{Origen.current_plugin.name}/**/#{file}").sort
+      if Origen.app.plugins.current
+        matches = Dir.glob("#{options[:default_dir]}/#{Origen.app.plugins.current.name}/**/#{file}").sort
         matches = matches.flatten.uniq
         if matches.size == 0
           matches = Dir.glob("#{options[:default_dir]}/**/#{file}").sort
@@ -240,7 +240,7 @@ module Origen
       path = path.to_s unless path.is_a?(String)
       if path =~ /(.*?)\/.*/
         import_name = Regexp.last_match[1].downcase.to_sym
-        if import_name == :origen || import_name == :origen_core || Origen.import_manager.names.include?(import_name) ||
+        if import_name == :origen || import_name == :origen_core || Origen.app.plugins.names.include?(import_name) ||
            import_name == :doc_helpers
           # Special case to allow a shortcut for this common import plugin and to also handle legacy
           # code from when it was called doc_helpers instead of origen_doc_helpers

data/lib/origen/generator.rb

@@ -39,7 +39,7 @@ module Origen
         j.run
       end
       Origen.interface.write_files(options)
-      unless options[:quiet] || Origen.tester.is_a?(Origen::Tester::Doc)
+      unless options[:quiet] || Origen.tester.is_a?(OrigenTesters::Doc)
         if options[:referenced_pattern_list]
           file = "#{Origen.root}/list/#{options[:referenced_pattern_list]}"
         else

data/lib/origen/generator/job.rb

@@ -90,7 +90,7 @@ module Origen
           elsif @options[:action] == :program
             Origen.flow.reset
             Origen.resources.reset
-            Origen::Tester::Generator.execute_source(@pattern)
+            OrigenTesters::Generator.execute_source(@pattern)
           else
             Origen.generator.pattern.reset      # Resets the pattern controller ready for a new pattern
             # Give the app a chance to handle pattern dispatch

data/lib/origen/generator/pattern.rb

@@ -251,9 +251,9 @@ module Origen
         c2 '  Origen'
         c2 '    Source:    https://github.com/Origen-SDK/origen'
         c2 "    Version:   #{Origen.version}"
-        unless Origen.plugins.empty?
+        unless Origen.app.plugins.empty?
           c2 '  Plugins'
-          Origen.plugins.sort_by { |p| p.name.to_s }.each do |plugin|
+          Origen.app.plugins.sort_by { |p| p.name.to_s }.each do |plugin|
             c2 "    #{plugin.name}:".ljust(30) + plugin.version
           end
         end

data/lib/origen/generator/pattern_finder.rb

@@ -100,9 +100,10 @@ module Origen
       end
 
       def current_plugin_pattern_path
-        if Origen.current_plugin.name && Origen.current_plugin.instance.config.shared
-          File.join Origen.current_plugin.instance.root,
-                    Origen.current_plugin.instance.config.shared[:patterns] || Origen.current_plugin.instance.config.shared[:pattern]
+        cp = Origen.app.plugins.current
+        if cp && cp.config.shared
+          path = cp.config.shared[:patterns] || cp.config.shared[:pattern]
+          File.join(cp.root, path) if path
         end
       end
 
@@ -122,20 +123,20 @@ module Origen
       end
 
       def check(path, options = {})
-        file_plugin = Origen.import_manager.path_within_a_plugin(path)
+        file_plugin = Origen.app.plugins.plugin_name_from_path(path)
         if file_plugin
-          if Origen.current_plugin.name
-            if file_plugin == Origen.current_plugin.name
+          if Origen.app.plugins.current
+            if file_plugin == Origen.app.plugins.current.name
               return proceed_with_pattern?(path) ? path : :skip
             elsif !options[:current_plugin]
-              Origen.current_plugin.temporary = file_plugin
+              Origen.app.plugins.current.temporary = file_plugin
               return proceed_with_pattern?(path) ? path : :skip
             else
-              puts "The requested pattern is from plugin #{file_plugin} and current system plugin is set to plugin #{Origen.current_plugin.name}!"
+              puts "The requested pattern is from plugin #{file_plugin} and current system plugin is set to plugin #{Origen.app.plugins.current.name}!"
               fail 'Incorrect plugin error!'
             end
           else
-            Origen.current_plugin.temporary = file_plugin
+            Origen.app.plugins.current.temporary = file_plugin
             return proceed_with_pattern?(path) ? path : :skip
           end
         else

data/lib/origen/remote_manager.rb

@@ -17,12 +17,6 @@ module Origen
     #  since remotes are not assumed to be Ruby.
     def require!
       unless required?
-        # Make sure the imports have already been required and added
-        # to the load path of the current thread
-        unless imports_required?
-          fail 'Error: Imports must be required before remotes!'
-        end
-
         while updates_required?
           Origen.log.info 'The following remotes need to be updated, this will now happen automatically:'
           dirty_remotes.each do |name, remote|
@@ -47,7 +41,7 @@ module Origen
     # Returns true if the imports have already been required and added
     # to the load path of the current thread
     def imports_required?
-      Origen.import_manager.required?
+      true # Guaranteed by the boot process
     end
 
     def validate_production_status(force = false)
@@ -220,7 +214,7 @@ module Origen
         end
       end
       # Add remotes from imports
-      Origen.plugins.each do |plugin|
+      Origen.app.plugins.each do |plugin|
         plugin.config.remotes.each do |import_remote|
           add_remote(import_remote)
         end

data/lib/origen/utility.rb

@@ -1,6 +1,5 @@
 module Origen
   module Utility
-    autoload :DesignSync,  'origen/utility/design_sync'
     autoload :Diff,        'origen/utility/diff'
     autoload :Mailer,      'origen/utility/mailer'
     autoload :SRecord,     'origen/utility/s_record'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -344,28 +344,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: origen_doc_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: loco
   requirement: !ruby/object:Gem::Requirement
@@ -380,6 +380,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: origen_testers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: origen_debuggers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -400,8 +434,8 @@ files:
 - config/rubocop/strict_enabled.yml
 - config/version.rb
 - helpers/url.rb
+- lib/c99/ate_interface.rb
 - lib/c99/doc_interface.rb
-- lib/c99/j750_interface.rb
 - lib/c99/nvm.rb
 - lib/c99/target/mock2.rb
 - lib/c99/target/subdir/mock3.rb
@@ -416,6 +450,7 @@ files:
 - lib/origen/application/environment.rb
 - lib/origen/application/lsf.rb
 - lib/origen/application/lsf_manager.rb
+- lib/origen/application/plugins.rb
 - lib/origen/application/plugins_manager.rb
 - lib/origen/application/release.rb
 - lib/origen/application/runner.rb
@@ -496,7 +531,6 @@ files:
 - lib/origen/generator/resources.rb
 - lib/origen/generator/stage.rb
 - lib/origen/global_methods.rb
-- lib/origen/import_manager.rb
 - lib/origen/location.rb
 - lib/origen/location/base.rb
 - lib/origen/location/map.rb
@@ -505,8 +539,6 @@ files:
 - lib/origen/mode.rb
 - lib/origen/model.rb
 - lib/origen/model_initializer.rb
-- lib/origen/nvm.rb
-- lib/origen/nvm/block_array.rb
 - lib/origen/operating_systems.rb
 - lib/origen/parameters.rb
 - lib/origen/parameters/live.rb
@@ -551,114 +583,7 @@ files:
 - lib/origen/specs/spec.rb
 - lib/origen/specs/version_history.rb
 - lib/origen/sub_blocks.rb
-- lib/origen/tester.rb
-- lib/origen/tester/api.rb
-- lib/origen/tester/bdm/bdm.rb
 - lib/origen/tester/command_based_tester.rb
-- lib/origen/tester/doc/doc.rb
-- lib/origen/tester/doc/generator.rb
-- lib/origen/tester/doc/generator/flow.rb
-- lib/origen/tester/doc/generator/flow_line.rb
-- lib/origen/tester/doc/generator/test.rb
-- lib/origen/tester/doc/generator/test_group.rb
-- lib/origen/tester/doc/generator/tests.rb
-- lib/origen/tester/doc/model.rb
-- lib/origen/tester/generator.rb
-- lib/origen/tester/generator/flow_control_api.rb
-- lib/origen/tester/generator/identity_map.rb
-- lib/origen/tester/generator/placeholder.rb
-- lib/origen/tester/generator/test_numberer.rb
-- lib/origen/tester/interface.rb
-- lib/origen/tester/j750/files.rb
-- lib/origen/tester/j750/generator.rb
-- lib/origen/tester/j750/generator/flow.rb
-- lib/origen/tester/j750/generator/flow_line.rb
-- lib/origen/tester/j750/generator/patgroup.rb
-- lib/origen/tester/j750/generator/patgroups.rb
-- lib/origen/tester/j750/generator/patset.rb
-- lib/origen/tester/j750/generator/patsets.rb
-- lib/origen/tester/j750/generator/templates/flow.txt.erb
-- lib/origen/tester/j750/generator/templates/instances.txt.erb
-- lib/origen/tester/j750/generator/templates/patgroups.txt.erb
-- lib/origen/tester/j750/generator/templates/patsets.txt.erb
-- lib/origen/tester/j750/generator/test_instance.rb
-- lib/origen/tester/j750/generator/test_instance_group.rb
-- lib/origen/tester/j750/generator/test_instances.rb
-- lib/origen/tester/j750/j750.rb
-- lib/origen/tester/j750/j750_hpt.rb
-- lib/origen/tester/j750/parser.rb
-- lib/origen/tester/j750/parser/ac_spec.rb
-- lib/origen/tester/j750/parser/ac_specs.rb
-- lib/origen/tester/j750/parser/dc_spec.rb
-- lib/origen/tester/j750/parser/dc_specs.rb
-- lib/origen/tester/j750/parser/descriptions.rb
-- lib/origen/tester/j750/parser/flow.rb
-- lib/origen/tester/j750/parser/flow_line.rb
-- lib/origen/tester/j750/parser/flows.rb
-- lib/origen/tester/j750/parser/pattern_set.rb
-- lib/origen/tester/j750/parser/pattern_sets.rb
-- lib/origen/tester/j750/parser/test_instance.rb
-- lib/origen/tester/j750/parser/test_instances.rb
-- lib/origen/tester/j750/parser/timeset.rb
-- lib/origen/tester/j750/parser/timesets.rb
-- lib/origen/tester/jlink/jlink.rb
-- lib/origen/tester/parser.rb
-- lib/origen/tester/parser/description_lookup.rb
-- lib/origen/tester/parser/searchable_array.rb
-- lib/origen/tester/parser/searchable_hash.rb
-- lib/origen/tester/time.rb
-- lib/origen/tester/timing.rb
-- lib/origen/tester/ultraflex/files.rb
-- lib/origen/tester/ultraflex/generator.rb
-- lib/origen/tester/ultraflex/generator/flow.rb
-- lib/origen/tester/ultraflex/generator/flow_line.rb
-- lib/origen/tester/ultraflex/generator/patgroup.rb
-- lib/origen/tester/ultraflex/generator/patgroups.rb
-- lib/origen/tester/ultraflex/generator/patset.rb
-- lib/origen/tester/ultraflex/generator/patsets.rb
-- lib/origen/tester/ultraflex/generator/templates/flow.txt.erb
-- lib/origen/tester/ultraflex/generator/templates/instances.txt.erb
-- lib/origen/tester/ultraflex/generator/templates/patgroups.txt.erb
-- lib/origen/tester/ultraflex/generator/templates/patsets.txt.erb
-- lib/origen/tester/ultraflex/generator/test_instance.rb
-- lib/origen/tester/ultraflex/generator/test_instance_group.rb
-- lib/origen/tester/ultraflex/generator/test_instances.rb
-- lib/origen/tester/ultraflex/parser.rb
-- lib/origen/tester/ultraflex/parser/ac_spec.rb
-- lib/origen/tester/ultraflex/parser/ac_specs.rb
-- lib/origen/tester/ultraflex/parser/dc_spec.rb
-- lib/origen/tester/ultraflex/parser/dc_specs.rb
-- lib/origen/tester/ultraflex/parser/descriptions.rb
-- lib/origen/tester/ultraflex/parser/flow.rb
-- lib/origen/tester/ultraflex/parser/flow_line.rb
-- lib/origen/tester/ultraflex/parser/flows.rb
-- lib/origen/tester/ultraflex/parser/pattern_set.rb
-- lib/origen/tester/ultraflex/parser/pattern_sets.rb
-- lib/origen/tester/ultraflex/parser/test_instance.rb
-- lib/origen/tester/ultraflex/parser/test_instances.rb
-- lib/origen/tester/ultraflex/parser/timeset.rb
-- lib/origen/tester/ultraflex/parser/timesets.rb
-- lib/origen/tester/ultraflex/ultraflex.rb
-- lib/origen/tester/v93k/generator.rb
-- lib/origen/tester/v93k/generator/flow.rb
-- lib/origen/tester/v93k/generator/flow_node.rb
-- lib/origen/tester/v93k/generator/flow_node/print.rb
-- lib/origen/tester/v93k/generator/pattern.rb
-- lib/origen/tester/v93k/generator/pattern_master.rb
-- lib/origen/tester/v93k/generator/templates/_test_method.txt.erb
-- lib/origen/tester/v93k/generator/templates/_test_suite.txt.erb
-- lib/origen/tester/v93k/generator/templates/template.flow.erb
-- lib/origen/tester/v93k/generator/templates/template.pmfl.erb
-- lib/origen/tester/v93k/generator/test_function.rb
-- lib/origen/tester/v93k/generator/test_functions.rb
-- lib/origen/tester/v93k/generator/test_method.rb
-- lib/origen/tester/v93k/generator/test_methods.rb
-- lib/origen/tester/v93k/generator/test_suite.rb
-- lib/origen/tester/v93k/generator/test_suites.rb
-- lib/origen/tester/v93k/v93k.rb
-- lib/origen/tester/vector.rb
-- lib/origen/tester/vector_generator.rb
-- lib/origen/tester/vector_pipeline.rb
 - lib/origen/top_level.rb
 - lib/origen/users.rb
 - lib/origen/users/ldap.rb
@@ -666,14 +591,12 @@ files:
 - lib/origen/utility.rb
 - lib/origen/utility/block_args.rb
 - lib/origen/utility/csv_data.rb
-- lib/origen/utility/design_sync.rb
 - lib/origen/utility/diff.rb
 - lib/origen/utility/file_diff.rb
 - lib/origen/utility/input_capture.rb
 - lib/origen/utility/mailer.rb
 - lib/origen/utility/s_record.rb
 - lib/origen/utility/time_and_date.rb
-- lib/origen/version_checker.rb
 - lib/origen/version_string.rb
 - lib/tasks/gem.rake
 - lib/tasks/private/build.rake