origen 0.60.7 → 0.60.8

data/lib/origen/utility/time_and_date.rb

@@ -7,8 +7,7 @@ module Origen
       def time_now(options = {})
         options = { underscore:   false,
                     format:       :human,
-                    include_time: true
-        }.merge(options)
+                    include_time: true }.merge(options)
 
         # Nice description of time format options
         # http://wesgarrison.us/2006/03/12/ruby-strftime-options-for-date-formatting/

data/lib/origen/utility.rb

@@ -2,7 +2,7 @@ module Origen
   module Utility
     autoload :Diff,        'origen/utility/diff'
     autoload :Mailer,      'origen/utility/mailer'
-    autoload :CSV,     'origen/utility/csv_data'
+    autoload :CSV, 'origen/utility/csv_data'
     autoload :TimeAndDate, 'origen/utility/time_and_date'
     autoload :InputCapture, 'origen/utility/input_capture'
     autoload :BlockArgs, 'origen/utility/block_args'
@@ -64,7 +64,7 @@ module Origen
         Regexp.new(regex) =~ regval
 
         nibbles = []
-        (reg_or_val.size / 4).times do |n|                   # now grouped by nibble
+        (reg_or_val.size / 4).times do |n| # now grouped by nibble
           nibbles << Regexp.last_match[n + 1]
         end
         unless r == 0

data/lib/origen/value.rb

@@ -58,7 +58,7 @@ module Origen
         when 'd'
           @val = val.to_s[1..-1].to_i
         else
-          if  val =~ /^[0-9]+$/
+          if val =~ /^[0-9]+$/
             @val = val.to_i
           else
             fail 'Unsupported value syntax'
@@ -107,6 +107,7 @@ module Origen
       if index.is_a?(Range)
         fail 'Currently, only single bit extraction from a Value object is supported'
       end
+
       val[index]
     end
 

data/lib/origen/version_string.rb

@@ -5,7 +5,7 @@ module Origen
 
     # returns version number string but strips out prefix
     def initialize(version, prefix = 'v')
-      version.gsub!(/^#{prefix}/, '')  # remove leading prefix
+      version.gsub!(/^#{prefix}/, '') # remove leading prefix
       super(version)
     end
 
@@ -139,54 +139,46 @@ module Origen
     end
 
     def major
-      @major ||= begin
-        if semantic?
-          self =~ /v?(\d+)/
-          Regexp.last_match[1].to_i
-        else
-          fail "#{self} is not a valid semantic version number!"
-        end
-      end
+      @major ||= if semantic?
+                   self =~ /v?(\d+)/
+                   Regexp.last_match[1].to_i
+                 else
+                   fail "#{self} is not a valid semantic version number!"
+                 end
     end
 
     def minor
-      @minor ||= begin
-        if semantic?
-          self =~ /v?\d+.(\d+)/
-          Regexp.last_match[1].to_i
-        else
-          fail "#{self} is not a valid semantic version number!"
-        end
-      end
+      @minor ||= if semantic?
+                   self =~ /v?\d+.(\d+)/
+                   Regexp.last_match[1].to_i
+                 else
+                   fail "#{self} is not a valid semantic version number!"
+                 end
     end
 
     def bugfix
-      @bugfix ||= begin
-        if semantic?
-          self =~ /v?\d+.\d+.(\d+)/
-          Regexp.last_match[1].to_i
-        else
-          fail "#{self} is not a valid semantic version number!"
-        end
-      end
+      @bugfix ||= if semantic?
+                    self =~ /v?\d+.\d+.(\d+)/
+                    Regexp.last_match[1].to_i
+                  else
+                    fail "#{self} is not a valid semantic version number!"
+                  end
     end
     alias_method :tiny, :bugfix
 
     def pre
-      @pre ||= begin
-        if semantic?
-          if self =~ /(dev|pre)(\d+)$/
-            Regexp.last_match[2].to_i
-          end
-        else
-          fail "#{self} is not a valid semantic version number!"
-        end
-      end
+      @pre ||= if semantic?
+                 if self =~ /(dev|pre)(\d+)$/
+                   Regexp.last_match[2].to_i
+                 end
+               else
+                 fail "#{self} is not a valid semantic version number!"
+               end
     end
     alias_method :dev, :pre
 
     def latest?
-      downcase.orig_equal?('trunk') || downcase.orig_equal?('latest')
+      downcase.to_s.eql?('trunk') || downcase.to_s.eql?('latest')
     end
 
     # Returns true if the version is a timestamp format version number
@@ -220,7 +212,7 @@ module Origen
            to_date == tag.to_date
           false
         else
-          numeric >= tag.numeric && ((self.latest? || tag.latest?) || self.timestamp? == tag.timestamp?)
+          numeric >= tag.numeric && ((latest? || tag.latest?) || timestamp? == tag.timestamp?)
         end
 
       elsif condition =~ /^>\s*(.*)/
@@ -229,24 +221,24 @@ module Origen
            to_date == tag.to_date
           false
         else
-          numeric > tag.numeric && ((self.latest? || tag.latest?) || self.timestamp? == tag.timestamp?)
+          numeric > tag.numeric && ((latest? || tag.latest?) || timestamp? == tag.timestamp?)
         end
 
       elsif condition =~ /^<=\s*(.*)/
         tag = validate_condition!(condition, Regexp.last_match[1])
-        numeric <= tag.numeric && ((self.latest? || tag.latest?) || self.timestamp? == tag.timestamp?)
+        numeric <= tag.numeric && ((latest? || tag.latest?) || timestamp? == tag.timestamp?)
 
       elsif condition =~ /^<\s*(.*)/
         tag = validate_condition!(condition, Regexp.last_match[1])
-        numeric < tag.numeric && ((self.latest? || tag.latest?) || self.timestamp? == tag.timestamp?)
+        numeric < tag.numeric && ((latest? || tag.latest?) || timestamp? == tag.timestamp?)
 
       elsif condition =~ /^==?\s*(.*)/
         tag = validate_condition!(condition, Regexp.last_match[1])
-        self.orig_equal?(tag)
+        orig_equal?(tag)
 
       else
         tag = validate_condition!(condition, condition)
-        self.orig_equal?(tag)
+        orig_equal?(tag)
       end
     end
 

data/lib/origen.rb

@@ -11,7 +11,8 @@ unless defined? RGen::ORIGENTRANSITION
   # Keep a note of the pwd at the time when Origen was first loaded, this is initially used
   # by the site_config lookup.
   $_origen_invocation_pwd ||= Pathname.pwd
-  require 'fileutils'
+  # duplicated require commented out below
+  # require 'fileutils'
   # Force these to re-load since they could have been loaded from an earlier version of Origen during boot
   load 'origen/loader.rb'
   load 'origen/site_config.rb'
@@ -31,7 +32,7 @@ unless defined? RGen::ORIGENTRANSITION
   require 'origen/undefined'
   require 'origen/componentable'
 
-  autoload :PatSeq,              'origen/generator/pattern_sequencer'
+  autoload :PatSeq, 'origen/generator/pattern_sequencer'
 
   module Origen
     autoload :Features,          'origen/features'
@@ -171,12 +172,11 @@ unless defined? RGen::ORIGENTRANSITION
       def app!
         file = caller[0]
         path = @current_source_dir || Pathname.new(file).dirname
-        until File.exist?(File.join(path, APP_CONFIG)) || path.root?
-          path = path.parent
-        end
+        path = path.parent until File.exist?(File.join(path, APP_CONFIG)) || path.root?
         if path.root?
           fail "Something went wrong resoving Origen.app! from: #{caller[0]}"
         end
+
         find_app_by_root(path)
       end
       alias_method :application!, :app!
@@ -251,6 +251,7 @@ unless defined? RGen::ORIGENTRANSITION
           app = _applications_lookup[:root][Pathname.new(path_to_origen_root).realpath.to_s]
         end
         return app if app
+
         puts "Couldn't find application instance with root #{path_to_origen_root}, known roots are:"
         _applications_lookup[:root].keys.each do |key|
           puts "  #{key}"
@@ -292,11 +293,10 @@ unless defined? RGen::ORIGENTRANSITION
       # Returns true if Origen is running in an application workspace
       def in_app_workspace?
         return @in_app_workspace if defined? @in_app_workspace
+
         @in_app_workspace ||= begin
           path = Pathname.new(Dir.pwd)
-          until path.root? || File.exist?(File.join(path, APP_CONFIG))
-            path = path.parent
-          end
+          path = path.parent until path.root? || File.exist?(File.join(path, APP_CONFIG))
           !path.root?
         end
       end
@@ -317,9 +317,7 @@ unless defined? RGen::ORIGENTRANSITION
           else
             @root ||= begin
               path = Pathname.new(Dir.pwd)
-              until path.root? || File.exist?(File.join(path, APP_CONFIG))
-                path = path.parent
-              end
+              path = path.parent until path.root? || File.exist?(File.join(path, APP_CONFIG))
               if path.root?
                 @running_globally = true
                 path = Pathname.new($_origen_invocation_pwd || Dir.pwd)
@@ -337,12 +335,11 @@ unless defined? RGen::ORIGENTRANSITION
       def root!
         file = caller[0]
         path = Pathname.new(file).dirname
-        until path.root? || File.exist?(File.join(path, APP_CONFIG))
-          path = path.parent
-        end
+        path = path.parent until path.root? || File.exist?(File.join(path, APP_CONFIG))
         if path.root?
           fail "Something went wrong resolving Origen.root! from: #{caller[0]}"
         end
+
         path.realpath
       end
 
@@ -396,6 +393,7 @@ unless defined? RGen::ORIGENTRANSITION
         if max && listeners.size > max
           fail "You can only define a #{callback} callback #{max > 1 ? (max.to_s + 'times') : 'once'}, however you have declared it #{listeners.size} times for instances of: #{listeners.map(&:class)}"
         end
+
         listeners
       end
 
@@ -464,6 +462,7 @@ unless defined? RGen::ORIGENTRANSITION
       def version(options = {})
         @version = nil if options[:refresh]
         return @version if @version && !options[:refresh]
+
         if options[:refresh] || !defined?(Origen::VERSION)
           load File.join(Pathname.new(File.dirname(__FILE__)).parent, 'config', 'version.rb')
         end
@@ -475,56 +474,54 @@ unless defined? RGen::ORIGENTRANSITION
       # 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(options = {})
-        @application ||= begin
-          # If running globally (outside of an app workspace), instantiate a bare bones app to help
-          # many of Origen's features that expect an app to be present.
-          if running_globally?
-            @plugins_loaded = true
-            # Now load the app
-            @loading_top_level = true
-            require 'origen/global_app'
-            @application = _applications_lookup[:root][root.to_s]
-            @loading_top_level = false
-            @application_loaded = true
-            @application
-          else
-            # Make sure the top-level root is always in the load path, it seems that some existing
-            # plugins do some strange things to require stuff from the top-level app and rely on this
-            path = File.join(root, 'lib')
-            $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
-            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
-              # about them to plug them into the application)
-              Bundler.require
-              Bundler.require(:development)
-              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
-              Origen.remote_manager.require!
-            end
-            boot = File.join(root, 'config', 'boot.rb')
-            require boot if File.exist?(boot)
-            env = File.join(root, 'config', 'environment.rb')
-            require env if File.exist?(env)
-            dev = File.join(root, 'config', 'development.rb')
-            require dev if File.exist?(dev)
-            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
+        # If running globally (outside of an app workspace), instantiate a bare bones app to help
+        # many of Origen's features that expect an app to be present.
+        @application ||= if running_globally?
+                           @plugins_loaded = true
+                           # Now load the app
+                           @loading_top_level = true
+                           require 'origen/global_app'
+                           @application = _applications_lookup[:root][root.to_s]
+                           @loading_top_level = false
+                           @application_loaded = true
+                           @application
+                         else
+                           # Make sure the top-level root is always in the load path, it seems that some existing
+                           # plugins do some strange things to require stuff from the top-level app and rely on this
+                           path = File.join(root, 'lib')
+                           $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
+                           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
+                             # about them to plug them into the application)
+                             Bundler.require
+                             Bundler.require(:development)
+                             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
+                             Origen.remote_manager.require!
+                           end
+                           boot = File.join(root, 'config', 'boot.rb')
+                           require boot if File.exist?(boot)
+                           env = File.join(root, 'config', 'environment.rb')
+                           require env if File.exist?(env)
+                           dev = File.join(root, 'config', 'development.rb')
+                           require dev if File.exist?(dev)
+                           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
@@ -638,6 +635,7 @@ unless defined? RGen::ORIGENTRANSITION
         @current_user = nil if options[:refresh]
         if app_loaded? || in_app_workspace?
           return @switch_user unless @switch_user.nil?
+
           @current_user ||= application.current_user
         else
           @current_user ||= User.new(User.current_user_id)

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2021-08-10"
+  s.date = "2023-03-02"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.60.7
+  version: 0.60.8
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '1.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -324,28 +324,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
-- !ruby/object:Gem::Dependency
-  name: cri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -373,11 +359,7 @@ files:
 - config/boot.rb
 - config/commands.rb
 - config/rubocop/easy.yml
-- config/rubocop/easy_disabled.yml
-- config/rubocop/easy_enabled.yml
 - config/rubocop/strict.yml
-- config/rubocop/strict_disabled.yml
-- config/rubocop/strict_enabled.yml
 - config/version.rb
 - helpers/guides.rb
 - helpers/url.rb
@@ -749,7 +731,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit