origen 0.44.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a8903e336caa8b0e7747f54f298178408b848f4203bfaccb4c7c2506c1df6c3
-  data.tar.gz: f3e398328927876c9ad9d7d46b04594f8ca7f33915be9b0d7956f0d86343c743
+  metadata.gz: c9ad10ac5859dc7cfe9fdbb76fea98e5c429b8844b016b661b28a346dbd83b17
+  data.tar.gz: c0f4b0490390588849aadd3fb5b4aa04b7a7d10b16e13e28b8bdae410b816e05
 SHA512:
-  metadata.gz: fc638f7063bc0fa0ae993532d19360ed6d3191710d41d4cda3f31c72f86a165ac90854b4305335d49e64f67b2941bad5a456ebbf00e740238c8e1c3b6ef635e4
-  data.tar.gz: 8094048eb20dc9c3319fc5c5f629ba40a0c928915cf3c21ad3174119f2bad267fddcf9e4c2880d91abd1f3316bedaa963a60e6c2dec53a3c4bba3c52f681da8d
+  metadata.gz: f425e0db9c3374cf6c53ee2ce1fa66defa5e09ce5b0fd3bb7aa21473a843f13b117e0026ad1c43bd23bcce98c124baf7a00aae040063184610fc9747666cb63d
+  data.tar.gz: cd2391055c02ba08d3fd3a31717f8e0db8bfa60d83254820bb6931485854339be842abc1c8f9b74dc929c1d66e6c73e852860eca9f28e0d5ee1899cee78846e7

data/config/application.rb

@@ -79,13 +79,13 @@ class OrigenCoreApplication < Origen::Application
     iterator.key = :by_block
 
     iterator.loop do |&pattern|
-      $nvm.blocks.each do |block|
+      dut.nvm.blocks.each do |block|
         pattern.call(block)
       end
     end
 
     iterator.setup do |block|
-      blk = $nvm.find_block_by_id(block.id)
+      blk = dut.nvm.find_block_by_id(block.id)
       blk.select
       blk
     end

data/config/boot.rb

@@ -1,10 +1,3 @@
-# Interfaces must be required, can't autoload
-require "c99/ate_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"
-
 require_relative "../helpers/guides"
 
 require "#{Origen.root(:origen_sim)}/config/boot"

data/config/commands.rb

@@ -15,83 +15,12 @@ when "tags"
   exit 0
 
 when "specs"
+  Origen.app.session.origen_core[:mode] = 'debug'
   require "rspec"
-
-  options = {}
-  opt_parser = OptionParser.new do |opts|
-    opts.banner = [
-      'Run the specs unit tests',
-      'Usage: origen specs [filename_substrings...] [options]',
-      "Note: all files must reside in #{Origen.app.root}/specs for filename substrings",
-      "E.g.: origen specs site_config #=> runs only specs in filenames matching 'site_config'"
-    ].join("\n")
-    opts.on('-h', '--help', 'Show this help message') do |h|
-      puts opt_parser
-      exit!
-    end
-  end
-  opt_parser.parse! ARGV
-
-  # Search for the filenames given. 
-  spec_files = ARGV.map do |file|
-    f = Pathname.new(file)
-    dir = Origen.app.root.join('spec')
-
-    # Find any files that match the name. Include all these files.
-    # Note that this will map a string to an array, so we'll flatten the array later.
-    # Also, we'll only search for .rb files in spec. Append that to the glob if no file ext is provided.
-    if f.exist? && f.extname == '.rb'
-      # This is a hard-coded path. Don't glob this, just make sure its witin the spec directory.
-      File.expand_path(f)
-    elsif f.extname == '.rb'
-      # Search includes the extension, so don't add it.
-      # (limited to .rb files)
-      Dir.glob(dir.join("**/*#{f}"))
-    else
-      # Search for matching ruby files.
-      # (limited to .rb files)
-      Dir.glob(dir.join("**/*#{f}*.rb"))
-    end
-  end
-  spec_files.flatten!
-
-  if ARGV.empty?
-    # No filename substrings given. Run all *_spec files in spec/ directory
-    spec_files = ['spec']
-  elsif spec_files.empty? && !ARGV.empty?
-    # The spec files to run is empty, but file substring were given.
-    # Report that no files were found and exit.
-    Origen.app!.fail!(message: "No matching spec files could be found at #{Origen.app.root}/spec for patterns: #{ARGV.join(', ')}")
-  else
-    # Filename substrings were given and matching files were found. List the files just for user awareness.
-    Origen.log.info "Found matching specs files for patterns: #{ARGV.join(', ')}"
-    spec_files.each { |f| Origen.log.info(f) }
-  end
-
-  current_mode = Origen.mode.instance_variable_get(:@current_mode)
-  Origen.mode = :debug
-  Origen.app.session.origen_core[:mode] = Origen.mode.to_s
-  begin
-    status = RSpec::Core::Runner.run(spec_files)
-  rescue SystemExit => e
-    Origen.log.error "Unexpected SystemExit reached. Reporting failure status..."
-    status = 1
-  end
-  Origen.mode = current_mode
-  Origen.app.session.origen_core[:mode] = Origen.mode.to_s
-  
-  # One kind of confusing thing is that Specs can still print the 'pass'/'success' verbiage even when it actually failed.
-  # This is due to rspec itself catching the errors, so there's no exception to catch from outside Rspec.
-  # Most likely the user will see red and see that nothing was actually run, but print a reassuring message from Origen saying that the specs actually failed,
-  # despite what Rspec's verbiage says.
-  if status == 1
-    Origen.log.error "Some errors occurred outside of the examples: received exit status 1 (failure). Please review RSpec output for details."
-  end
-
-  exit(status)
+  exit RSpec::Core::Runner.run(['spec'])
 
 when "examples", "test"  
-  Origen.load_application
+  Origen.app.session.origen_core[:mode] = 'debug'
   status = 0
   Dir["#{Origen.root}/examples/*.rb"].each do |example|
     require example

data/config/rubocop/easy_disabled.yml

@@ -269,3 +269,7 @@ Rails/ScopeArgs:
 Rails/Validation:
   Description: 'Use validates :attribute, hash of validations.'
   Enabled: false
+
+Style/ClassAndModuleChildren:
+  Description: 'Checks style of children classes and modules.'
+  Enabled: false

data/config/rubocop/easy_enabled.yml

@@ -78,10 +78,6 @@ Style/CharacterLiteral:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-character-literals'
   Enabled: true
 
-Style/ClassAndModuleChildren:
-  Description: 'Checks style of children classes and modules.'
-  Enabled: true
-
 Style/ClassCheck:
   Description: 'Enforces consistent use of `Object#is_a?` or `Object#kind_of?`.'
   Enabled: true

data/config/rubocop/strict_disabled.yml

@@ -245,3 +245,7 @@ Rails/ScopeArgs:
 Rails/Validation:
   Description: 'Use validates :attribute, hash of validations.'
   Enabled: false
+
+Style/ClassAndModuleChildren:
+  Description: 'Checks style of children classes and modules.'
+  Enabled: false

data/config/rubocop/strict_enabled.yml

@@ -88,10 +88,6 @@ Style/CharacterLiteral:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-character-literals'
   Enabled: true
 
-Style/ClassAndModuleChildren:
-  Description: 'Checks style of children classes and modules.'
-  Enabled: true
-
 Style/ClassCheck:
   Description: 'Enforces consistent use of `Object#is_a?` or `Object#kind_of?`.'
   Enabled: true

data/config/version.rb

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

data/lib/origen/application/deployer.rb

@@ -224,7 +224,9 @@ module Origen
       end
 
       def create_web_server_dir
-        if File.exist?("#{Origen.root}/templates/web")
+        templates_web_dir = 'app/templates/web'
+        templates_web_dir = 'templates/web' unless File.exist?("#{Origen.root}/#{templates_web_dir}")
+        if File.exist?("#{Origen.root}/#{templates_web_dir}")
           dir = web_server_dir
           FileUtils.rm_rf dir if File.exist?(dir)
           FileUtils.mkdir_p dir

data/lib/origen/application/release.rb

@@ -328,9 +328,9 @@ Your workspace has local modifications that are preventing the requested action
       # Sets the version number in the file store
       def write_version(version)
         if version.semantic?
-          Origen::CodeGenerators.invoke 'semver', [], config: { change: version }
+          Origen::CodeGenerators.invoke_internal 'semver', [], config: { change: version }
         else
-          Origen::CodeGenerators.invoke 'timever', [], config: { change: version }
+          Origen::CodeGenerators.invoke_internal 'timever', [], config: { change: version }
         end
         system 'origen -v' # Invoke Origen under the new version, this updates Gemfile.lock
       end

data/lib/origen/application/runner.rb

@@ -263,8 +263,15 @@ module Origen
           if Origen.mode.production? && Origen.app.rc
             unless Origen.app.rc.local_modifications.empty?
               puts <<-EOT
-    Your workspace has local modifications that are preventing the requested action
-      - run 'origen rc mods' to see them.
+    Your workspace is running in production mode and it has local modifications which are preventing
+    the requested action, run the following command to see what files have been modified:
+
+      origen rc mods
+
+    If you are currently developing this application and are not ready to check everything in yet,
+    then run the following command to switch your workspace to debug/development mode:
+
+      origen m debug
               EOT
               exit 1
             end

data/lib/origen/application.rb

@@ -62,6 +62,33 @@ module Origen
         super || instance.respond_to?(*args)
       end
 
+      # Returns the application instance (i.e. main app or the plugin) that owns the given class/module
+      # (literal, string or symbol representation is accepted) or object instance.
+      # Returns nil if no matching Origen application can be found.
+      #
+      #     Origen::Application.from_namespace(MyApp)                       # => <my_app instance>
+      #     Origen::Application.from_namespace(MyApp::MyClass)              # => <my_app instance>
+      #     Origen::Application.from_namespace('MyApp::MyClass')            # => <my_app instance>
+      #     Origen::Application.from_namespace(<my_app::my_class instance>) # => <my_app instance>
+      def from_namespace(item)
+        unless item.is_a?(String)
+          if item.is_a?(Module) || item.is_a?(Class) || item.is_a?(Symbol)
+            item = item.to_s
+          else # Assume to be an object instance in this case
+            item = item.class.to_s
+          end
+        end
+        namespace = item.split('::').first
+        @apps_by_namespace ||= {}
+        @apps_by_namespace[namespace] ||= begin
+          return Origen.app if Origen.app.namespace == namespace
+          Origen.app.plugins.each do |plugin|
+            return plugin if plugin.namespace == namespace
+          end
+          nil
+        end
+      end
+
       protected
 
       def method_missing(*args, &block)
@@ -104,6 +131,63 @@ module Origen
       end
     end
 
+    # @api private
+    #
+    # Returns a lookup table for all block definitions (app/blocks) that the app contains
+    def blocks_files
+      # There seems to be some issue with this cache being corrupted when running the test suite
+      # in Travis, but don't believe that this is really an issue in practice and cannot replicate
+      # it locally. Therefore maintaining the cache of this potentially expensive operation except
+      # from when running in CI.
+      @blocks_files = nil if ENV['CONTINUOUS_INTEGRATION']
+      @blocks_files ||= begin
+        files = {}
+        block_dir = Pathname.new(File.join(root, 'app', 'blocks'))
+        if block_dir.exist?
+          block_dir.children.each do |item|
+            if item.directory?
+              _add_block_files(files, block_dir, item)
+            end
+          end
+        end
+        files
+      end
+    end
+
+    # @api private
+    def _add_block_files(files, block_dir, current_dir, sub_block = false)
+      fields = current_dir.relative_path_from(block_dir).to_s.split('/')
+      fields.delete('derivatives')
+      fields.delete('sub_blocks')
+      path = fields.join('/')
+      files[path] ||= {}
+      files[path][:_sub_block] = true if sub_block
+      Dir.glob(current_dir.join('*.rb')).each do |file|
+        file = Pathname.new(file)
+        type = file.basename('.rb').to_s.to_sym
+        unless type == :model || type == :controller
+          files[path][type] ||= []
+          files[path][type] << file
+        end
+      end
+      derivatives = current_dir.join('derivatives')
+      if derivatives.exist?
+        derivatives.children.each do |item|
+          if item.directory?
+            _add_block_files(files, block_dir, item)
+          end
+        end
+      end
+      sub_blocks = current_dir.join('sub_blocks')
+      if sub_blocks.exist?
+        sub_blocks.children.each do |item|
+          if item.directory?
+            _add_block_files(files, block_dir, item, true)
+          end
+        end
+      end
+    end
+
     def current_job
       current_jobs.last
     end
@@ -766,6 +850,7 @@ END
         force_debug: false
       }.merge(options)
       @on_create_called = false
+      @target_loading = true
       if options[:reload]
         @target_load_count = 0
       else
@@ -814,7 +899,7 @@ END
       end
       listeners_for(:after_load_target).each(&:after_load_target)
       Origen.app.plugins.validate_production_status
-      # @target_instantiated = true
+      @target_loading = false
     end
 
     # Returns true if the on_create callback has already been called during a target load
@@ -900,6 +985,10 @@ END
       @target_instantiated
     end
 
+    def target_loading?
+      @target_loading || false
+    end
+
     # Prepends the application name to the fail message and throws a RuntimeError exception.
     # Very similar to the plain <code>fail</code> method with the addition of prepending the application name.
     # Prepended message: 'Fail in app.name: '
@@ -956,7 +1045,7 @@ END
     #     config.i18n.backend = MyBackend
     #   end
     def add_lib_to_load_path! #:nodoc:
-      [root.join('lib'), root.join('vendor', 'lib')].each do |path|
+      [root.join('lib'), root.join('vendor', 'lib'), root.join('app', 'lib')].each do |path|
         $LOAD_PATH.unshift(path.to_s) if File.exist?(path) && !$LOAD_PATH.include?(path.to_s)
       end
     end

data/lib/origen/boot/app.rb

@@ -193,10 +193,6 @@ end
           if BIN_DEPS.any? { |bin, gem| !File.exist?(File.join(lbin_dir, bin)) }
             system "bundle binstubs #{BIN_DEPS.map { |bin, gem| gem }.join(' ')} --path #{lbin_dir} --force"
           end
-          if Origen.site_config.use_bootsnap && !Origen.os.windows?
-            ENV['BOOTSNAP_CACHE_DIR'] ||= "#{origen_root}/tmp/cache"
-            require 'bootsnap/setup'
-          end
         end
         require 'origen'
         warnings

data/lib/origen/boot.rb

@@ -54,8 +54,9 @@ else
   end
 end
 
-# Defer loading this until we have re-launched above to save time
+# Defer loading these until we have re-launched above to save time
 load File.expand_path('../site_config.rb', __FILE__)
+load File.expand_path('../loader.rb', __FILE__)
 
 warnings = nil