origen 0.60.7 → 0.60.8

data/lib/origen/commands/compile.rb

@@ -32,11 +32,11 @@ Usage: origen compile [space separated files, lists or directories] [options]
   EOT
   opts.on('-e', '--environment NAME', String, 'Override the default environment, NAME can be a full path or a fragment of an environment file name') { |e| options[:environment] = e }
   opts.on('-t', '--target NAME', String, 'Override the default target, NAME can be a full path or a fragment of a target file name') { |t| options[:target] = t }
-  opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n|  options[:current_plugin] = pl_n }
+  opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n| options[:current_plugin] = pl_n }
   opts.on('-l', '--lsf [ACTION]', [:clear, :add], "Submit jobs to the LSF, optionally specify whether to 'clear' or 'add' to existing jobs") { |a| options[:lsf] = true; options[:lsf_action] = a }
   opts.on('-w', '--wait', 'Wait for LSF processing to complete') { options[:wait_for_lsf_completion] = true }
   opts.on('-c', '--continue', 'Continue on error (to the next file)') { options[:continue] = true }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   opts.on('-f', '--file FILE', String, 'Override the default log file') { |o| options[:log_file] = o }
   opts.on('-o', '--output DIR', String, 'Override the default output directory') { |o| options[:output] = o }

data/lib/origen/commands/fetch.rb

@@ -12,7 +12,7 @@ By default this will always create the workspace at './[PLUGIN_NAME]'
 Usage: origen fetch [PLUGIN_NAME] [options]
 END
   opts.on('-o', '--outputdir PATH', 'User defined destination directory of the plugin workspace') { |o| options[:outputdir] = o }
-  opts.on('-v', '--version VERSION', 'User requested plugin/gem version') {  |v| options[:version] = v }
+  opts.on('-v', '--version VERSION', 'User requested plugin/gem version') { |v| options[:version] = v }
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end.parse!
 

data/lib/origen/commands/generate.rb

@@ -12,7 +12,7 @@ opt_parser = OptionParser.new do |opts|
   opts.on('-l', '--lsf [ACTION]', [:clear, :add], "Submit jobs to the LSF, optionally specify whether to 'clear' or 'add' to existing jobs") { |a| options[:lsf] = true; options[:lsf_action] = a }
   opts.on('-w', '--wait', 'Wait for LSF processing to complete') { options[:wait_for_lsf_completion] = true }
   opts.on('-c', '--continue', 'Continue on error (to the next pattern)') { options[:continue] = true }
-  opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n|  options[:current_plugin] = pl_n }
+  opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n| options[:current_plugin] = pl_n }
   opts.on('-f', '--file FILE', String, 'Override the default log file') { |o| options[:log_file] = o }
   opts.on('-o', '--output DIR', String, 'Override the default output directory') { |o| options[:output] = o }
   opts.on('-r', '--reference DIR', String, 'Override the default reference directory') { |o| options[:reference] = o }
@@ -22,7 +22,7 @@ opt_parser = OptionParser.new do |opts|
   opts.on('--html', 'Generate into html format') { options[:html] = true }
   opts.on('--nocom', 'No comments in the generated pattern') { options[:no_comments] = true }
   opts.on('-seq', '--sequence NAME', String, 'Generate multiple patterns into a single concurrent pattern sequence') { |o| options[:sequence] = o }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   # Apply any application option extensions to the OptionParser
   Origen::CommandHelpers.extend_options(opts, app_options, options)
@@ -56,7 +56,7 @@ _with_doc_tester(options) do
   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 apply any configuration
+  Origen.app.load_target! # This initial load is required to apply any configuration
   # options present in the target, it will loaded again before
   # each generate/compile job
   Origen.app.runner.generate(options)

data/lib/origen/commands/interactive.rb

@@ -36,9 +36,9 @@ Usage: origen i [options]
     END
     opts.on('-e', '--environment NAME', String, 'Override the default environment, NAME can be a full path or a fragment of an environment file name') { |e| options[:environment] = e }
     opts.on('-t', '--target NAME', String, 'Override the default target, NAME can be a full path or a fragment of a target file name') { |t| options[:target] = t }
-    opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n|  options[:current_plugin] = pl_n }
+    opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n| options[:current_plugin] = pl_n }
     opts.on('-p', '--pry', 'Use Pry for the session (instead of IRB)') { options[:pry] = true }
-    opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+    opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
     opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
     # Apply any application option extensions to the OptionParser
     Origen::CommandHelpers.extend_options(opts, app_options, options)
@@ -59,7 +59,7 @@ Usage: origen i [options]
   begin
     if defined?(Pry) && options[:pry]
       include ConsoleMethods
-      # rubocop:disable Debugger, EmptyLines
+      # rubocop:disable Lint/Debugger, Layout/EmptyLines
 
 
 
@@ -75,13 +75,12 @@ Usage: origen i [options]
 
 
 
-      # rubocop:enable Debugger, EmptyLines
+      # rubocop:enable Lint/Debugger, Layout/EmptyLines
     else
       IRB::ExtendCommandBundle.send :include, Origen::ConsoleMethods
       IRB.start
     end
-    ensure
-      listeners_for(:interactive_shutdown).each(&:interactive_shutdown)
-
+  ensure
+    listeners_for(:interactive_shutdown).each(&:interactive_shutdown)
   end
 end

data/lib/origen/commands/lint.rb

@@ -20,7 +20,7 @@ http://origen.freescale.net/origen/latest/guides/utilities/lint/
   opts.on('-n', '--no-correct', "Don't correct errors automatically (override if the app default is set to auto correct)") { options[:no_correct] = true }
   opts.on('-e', '--easy', 'Be less strict, most checks run with this flag enabled can be corrected automatically') { options[:easy] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   # Apply any application option extensions to the OptionParser
   Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''

data/lib/origen/commands/lsf.rb

@@ -46,7 +46,7 @@ Usage: origen lsf [options]
   EOT
   opts.on('-v', '--verbose', 'Show job details') { options[:verbose] = true }
   opts.on('-r', '--resubmit', 'Re-submit jobs') { options[:resubmit] = true }
-  opts.on('-c', '--clear', 'Clear jobs') {  options[:clear] = true }
+  opts.on('-c', '--clear', 'Clear jobs') { options[:clear] = true }
   opts.on('-l', '--log', 'Build a log file from the completed jobs') { options[:log] = true }
   #  opts.on("-k", "--kill", "Kill jobs") { options[:kill] = true }
   types = [:queuing, :running, :lost, :passed, :failed, :all]
@@ -55,7 +55,7 @@ Usage: origen lsf [options]
   opts.on('-w', '--wait', 'Wait for LSF processing to complete') { options[:wait_for_lsf_completion] = true }
   # opts.on("-e", "--execute", "Execute....") { options[:execute] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   # Apply any application option extensions to the OptionParser
   Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''

data/lib/origen/commands/new.rb

@@ -25,7 +25,7 @@ https://origen-sdk.org/origen_app_generators
 
 Usage: origen new [APP_NAME] [options]
 END
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-f', '--fetch', 'Fetch the latest versions of the app generators, otherwise happens every 24hrs') { options[:fetch] = true }
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }

data/lib/origen/commands/plugin.rb

@@ -35,8 +35,8 @@ The following commands are available:
 
 The following options are available:
   EOT
-  opts.on('-a', '--allr', 'List all plugins/gems (including external)') {  options[:debugger] = true }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-a', '--allr', 'List all plugins/gems (including external)') { options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end
 

data/lib/origen/commands/program.rb

@@ -12,7 +12,7 @@ opt_parser = OptionParser.new do |opts|
   opts.on('-l', '--lsf [ACTION]', [:clear, :add], "Submit jobs to the LSF, optionally specify whether to 'clear' or 'add' to existing jobs") { |a| options[:lsf] = true; options[:lsf_action] = a }
   opts.on('-w', '--wait', 'Wait for LSF processing to complete') { options[:wait_for_lsf_completion] = true }
   opts.on('-c', '--continue', 'Continue on error (to the next file)') { options[:continue] = true }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-f', '--file FILE', String, 'Override the default log file') { |o| options[:log_file] = o }
   opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n|  options[:current_plugin] = pl_n }
   opts.on('-o', '--output DIR', String, 'Override the default output directory') { |o| options[:output] = o }
@@ -21,7 +21,7 @@ opt_parser = OptionParser.new do |opts|
   opts.on('--doc', 'Generate into doc (yaml) format, requires a Doc interface to be setup in your application') { options[:doc] = true }
   opts.on('-q', '--queue NAME', String, 'Specify the LSF queue, default is short') { |o| options[:queue] = o }
   opts.on('-p', '--project NAME', String, 'Specify the LSF project, default is msg.te') { |o| options[:project] = o }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   # Apply any application option extensions to the OptionParser
   Origen::CommandHelpers.extend_options(opts, app_options, options)
@@ -55,7 +55,7 @@ _with_doc_tester(options) do
   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 apply any configuration
+  Origen.app.load_target! # This initial load is required to apply any configuration
   # options present in the target, it will loaded again before
   # each generate/compile job
 

data/lib/origen/commands/rc.rb

@@ -131,7 +131,7 @@ The following options are available:
     # Apply any application option extensions to the OptionParser
     Origen::CommandHelpers.extend_options(opts, app_options, options)
     opts.separator ''
-    opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+    opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
     opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
     opts.separator ''
     opts.separator "The following options apply to the 'tag' command only:"
@@ -369,13 +369,13 @@ The following options are available:
       filelist = Origen.app.rc.unmanaged.reject do |file|
         reject = false
         unmanaged_dirs.each do |dir_filter|
-          if file =~ /^#{Regexp.escape(dir_filter)}\//i         # dir matching
+          if file =~ /^#{Regexp.escape(dir_filter)}\//i # dir matching
             reject = true
           end
         end
         unless reject
           unmanaged_files.each do |file_filter|
-            if file_filter =~ /\*/                      # wildcard used
+            if file_filter =~ /\*/ # wildcard used
               temp_file_filter = file_filter.gsub('.', '___')         # replace . with ___
               temp_file_filter2 = temp_file_filter.sub(/\*/, '')      # remove *
               temp_file = file.gsub('.', '___')                       # replace . with __
@@ -383,7 +383,7 @@ The following options are available:
                 reject = true
               end
             else
-              if file.downcase == file_filter.downcase    # exact match
+              if file.downcase == file_filter.downcase # exact match
                 reject = true
               end
             end

data/lib/origen/commands/save.rb

@@ -13,7 +13,7 @@ Usage: origen save TYPE [options]
     valid TYPE values: all, new, changed
   EOT
   opts.on('-f', '--file FILE', String, 'Override the default log file') { |o| options[:log_file] = o }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   # Apply any application option extensions to the OptionParser
   Origen::CommandHelpers.extend_options(opts, app_options, options)

data/lib/origen/commands/time.rb

@@ -24,9 +24,9 @@ Usage: origen time CMD [args] [options]
 
   STOP
   opts.on('-n', '--name FILE', String, 'Use the given named reference instead of the default') { |o| options[:ref_name] = o }
-  opts.on('-s', '--summary', 'Output flow summary results only (instead of details for each test)') {  options[:summary] = true }
+  opts.on('-s', '--summary', 'Output flow summary results only (instead of details for each test)') { options[:summary] = true }
   opts.on('-t', '--target NAME1,NAME2,NAME3', Array, 'Override the default target, NAME can be a full path or a fragment of a target file name') { |t| options[:target] = t }
-  opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   opts.on('-f', '--file FILE', String, 'Override the default log file') { |o| options[:log_file] = o }
   # Apply any application option extensions to the OptionParser
@@ -75,8 +75,7 @@ when 'new'
                              file:              "#{Origen.top}/templates/time/rules.rb.erb",
                              output:            "#{Origen.root}/config/test_time",
                              quiet:             true,
-                             check_for_changes: false
-                            )
+                             check_for_changes: false)
     # Add this to the environment if not already present...
     env = "#{Origen.root}/config/environment.rb"
     unless File.readlines(env).any? { |l| l =~ /config\/test_time\/rules/ }
@@ -99,8 +98,7 @@ when 'new'
                              file:              "#{Origen.top}/templates/time/filter.rb.erb",
                              output:            "#{Origen.root}/config/test_time",
                              quiet:             true,
-                             check_for_changes: false
-                            )
+                             check_for_changes: false)
     # Add this to the environment if not already present...
     env = "#{Origen.root}/config/environment.rb"
     unless File.readlines(env).any? { |l| l =~ /config\/test_time\/filter/ }

data/lib/origen/commands/web.rb

@@ -39,14 +39,14 @@ The following options are available:
     END
     opts.on('-e', '--environment NAME', String, 'Override the default environment, NAME can be a full path or a fragment of an environment file name') { |e| options[:environment] = e }
     opts.on('-t', '--target NAME', String, 'Override the default target, NAME can be a full path or a fragment of a target file name') { |t| options[:target] = t }
-    opts.on('-r', '--remote', 'Use in conjunction with the compile command to deploy files to a remote web server') {  options[:remote] = true }
+    opts.on('-r', '--remote', 'Use in conjunction with the compile command to deploy files to a remote web server') { options[:remote] = true }
     opts.on('-a', '--api', 'Generate API documentation after compiling') {  options[:api] = true }
     opts.on('--archive ID', String, 'Archive the documents after compiling or deploying remotely') do |id|
       options[:archive] = id
       require "#{Origen.top}/helpers/url"
       Origen::Generator::Compiler::Helpers.archive_name = id
     end
-    opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+    opts.on('-d', '--debugger', 'Enable the debugger') { options[:debugger] = true }
     opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
     opts.on('--no-serve', "Don't serve the website after compiling without the remote option") { options[:no_serve] = true }
     opts.on('-c', '--comment COMMENT', String, 'Supply a commit comment when deploying to Git') { |o| options[:comment] = o }
@@ -75,7 +75,10 @@ The following options are available:
   def self._start_server
     # Get the current host
     require 'socket'
+    # gethostbyname is deprecated in favor of Addrinfo#getaddrinfo
+    # rubocop:disable Lint/DeprecatedClassMethods
     host = Socket.gethostbyname(Socket.gethostname).first.downcase
+    # rubocop:enable Lint/DeprecatedClassMethods
 
     # Get a free port
     port = 8000 # preferred port

data/lib/origen/commands.rb

@@ -10,7 +10,7 @@ ORIGEN_COMMAND_ALIASES = {
   'g'         => 'generate',
   'p'         => 'program',
   't'         => 'target',
-  '-t'        => 'target',          # For legacy reasons
+  '-t'        => 'target', # For legacy reasons
   'e'         => 'environment',
   '-e'        => 'environment',
   'l'         => 'lsf',

data/lib/origen/componentable.rb

@@ -577,6 +577,7 @@ module Origen
     def delete(to_delete)
       obj = delete!(to_delete)
       fail Origen::Componentable::NameDoesNotExistError, "#{_singleton_name} name :#{to_delete} does not exist" if obj.nil?
+
       obj
     end
     alias_method :remove, :delete

data/lib/origen/controller.rb

@@ -75,19 +75,17 @@ module Origen
 
     # Returns the controller's model
     def model
-      @model ||= begin
-        if self.class.path_to_model
-          m = eval(self.class.path_to_model)
-          if m
-            if m.respond_to?(:_controller=)
-              m.send(:_controller=, self)
-            end
-          else
-            fail "No model object found at path: #{self.class.path_to_model}"
-          end
-          m
-        end
-      end
+      @model ||= if self.class.path_to_model
+                   m = eval(self.class.path_to_model)
+                   if m
+                     if m.respond_to?(:_controller=)
+                       m.send(:_controller=, self)
+                     end
+                   else
+                     fail "No model object found at path: #{self.class.path_to_model}"
+                   end
+                   m
+                 end
     end
 
     # When compared to another object, a controller will consider itself equal if either the controller

data/lib/origen/core_ext/array.rb

@@ -12,7 +12,8 @@ class Array
   end
 
   def dups_with_index
-    return {} unless self.dups?
+    return {} unless dups?
+
     hash = Hash.new { |h, k| h[k] = [] }
     each_with_index do |val, idx|
       hash[val] << idx

data/lib/origen/core_ext/enumerable.rb

@@ -29,11 +29,11 @@ module Enumerable
     unless options[:ignore].empty? || options[:select].empty?
       fail "Cannot have the same arguments for 'ignore' and 'select' options" unless (options[:ignore] & options[:select]).empty?
     end
-    if self.respond_to?(:empty?) && self.empty?
+    if respond_to?(:empty?) && empty?
       list_array << self if options[:nil_or_empty]
     else
       each do |k, v|
-        self.is_a?(Hash) ? item = v : item = k
+        is_a?(Hash) ? item = v : item = k
         klass = item.class.to_s
         superklass = item.class.superclass.to_s
         if options[:flatten].include? item.class
@@ -50,6 +50,7 @@ module Enumerable
         else
           next unless options[:select].empty? || options[:select].include?(item.class) || PRIMATIVES.any? { |klass| item.is_a?(klass) }
           next if options[:ignore].include?(item.class)
+
           case item
           when NilClass
             list_array << item if options[:nil_or_empty]
@@ -64,6 +65,7 @@ module Enumerable
             list_array += item.list(options)
           when String
             next if item.empty? && options[:nil_or_empty] == false
+
             list_array << item
           else
             list_array << item

data/lib/origen/core_ext/hash.rb

@@ -32,8 +32,7 @@ class Hash
       when Symbol then 'k == filter'
       when NilClass then true
       else true
-    end
-    # rubocop:disable UnusedBlockArgument
+                   end
     filtered_hash = select do |k, v|
       [TrueClass, FalseClass].include?(select_logic.class) ? select_logic : !!eval(select_logic)
     end
@@ -66,16 +65,16 @@ class Hash
         elsif key.is_a? Regexp
           search_results[k] = v if key.match(k.to_s)
         else
-          return v if (k == key)
+          return v if k == key
         end
       end
     end
     if search_results.empty?
-      return nil
+      nil
     elsif search_results.size == 1
-      return search_results.values.first
+      search_results.values.first
     else
-      return search_results
+      search_results
     end
   end
 end

data/lib/origen/core_ext/integer.rb

@@ -60,11 +60,9 @@ class Integer
 
   def to_bool
     if self == 1
-      return true
+      true
     elsif self == 0
-      return false
-    else
-      return nil
+      false
     end
   end
 

data/lib/origen/core_ext/object.rb

@@ -3,7 +3,7 @@ class Object
   # ultimately returns nil if no value is found.
   def try(*methods)
     methods.each do |method|
-      if self.respond_to?(method)
+      if respond_to?(method)
         val = send(method)
         return val if val
       end
@@ -21,7 +21,7 @@ class Object
   #   'hi'.origen_subblock? #=> false
   # @see https://origen-sdk.org/origen/guides/models/defining/#Adding_Sub_Blocks
   def origen_subblock?
-    self.is_a?(Origen::Model) || self.is_a?(Origen::Controller) || self.is_a?(Origen::SubBlocks::Placeholder)
+    is_a?(Origen::Model) || is_a?(Origen::Controller) || is_a?(Origen::SubBlocks::Placeholder)
   end
   alias_method :origen_sub_block?, :origen_subblock?
 end

data/lib/origen/core_ext/option_parser/optparse.rb

@@ -6,7 +6,7 @@ class OptionParser
   def parse!(*args)
     lsf_options = ARGV.dup
     orig_parse!(*args)
-    lsf_options -= ARGV  # Now contains all original options
+    lsf_options -= ARGV # Now contains all original options
 
     # Pick whether we should be using the application's LSF instance or Origen's
     # global LSF instance

data/lib/origen/core_ext/string.rb

@@ -11,7 +11,7 @@ end
 
 class String
   def to_dec
-    if self.is_verilog_number?
+    if is_verilog_number?
       verilog_to_dec
     elsif match(/^0[x,o,d,b]\S+/)
       _to_dec(self)
@@ -92,6 +92,7 @@ class String
     while match_str.length > 0
       md = match_str.match(regex)
       break unless md
+
       matches << md
       match_str = md.post_match
     end
@@ -165,25 +166,24 @@ class String
   # Attempt to convert a String to a boolean answer
   def to_bool
     if self == true || self =~ (/^(true|t|yes|y|1)$/i)
-      return true
-    elsif self == false || self.empty? || self =~ (/^(false|f|no|n|0)$/i)
-      return false
-    else
-      return nil
+      true
+    elsif self == false || empty? || self =~ (/^(false|f|no|n|0)$/i)
+      false
     end
   end
 
   # Check if a String is a numeric
   def is_numeric?
     return true if self =~ /\A\d+\Z/
+
     true if Float(self) rescue false # rubocop:disable Style/RescueModifier
   end
   alias_method :numeric?, :is_numeric?
 
   # Convert the String to a Numeric (Float or Integer)
   def to_numeric
-    if self.numeric?
-      if to_i == to_f
+    if numeric?
+      if to_i == to_f # rubocop:disable Lint/FloatComparison
         to_i
       else
         to_f

data/lib/origen/database/key_value_store.rb

@@ -24,7 +24,7 @@ module Origen
         refresh if persisted?
         store[key] = val
         save_to_file
-        val
+        val               # rubocop:disable Lint/Void
       end
 
       # Force a refresh of the database
@@ -91,17 +91,15 @@ module Origen
       end
 
       def store
-        @store ||= begin
-          if file.exist?
-            load_from_file
-          elsif persisted? && dssc.managed_by_design_sync?(file)
-            refresh
-            load_from_file
-          else
-            @uncommitted = true
-            { refresh_interval_in_minutes: 60 }
-          end
-        end
+        @store ||= if file.exist?
+                     load_from_file
+                   elsif persisted? && dssc.managed_by_design_sync?(file)
+                     refresh
+                     load_from_file
+                   else
+                     @uncommitted = true
+                     { refresh_interval_in_minutes: 60 }
+                   end
       end
 
       def load_from_file
@@ -124,9 +122,9 @@ module Origen
           Marshal.dump(store, f)
         end
         if private?
-          FileUtils.chmod(0600, file)
+          FileUtils.chmod(0o600, file)
         else
-          FileUtils.chmod(0664, file)
+          FileUtils.chmod(0o664, file)
         end
         if persisted?
           dssc.check_in file, new: true, keep: true, branch: 'Trunk'

data/lib/origen/database/key_value_stores.rb

@@ -73,6 +73,7 @@ module Origen
             loaded[method] ||= KeyValueStore.new(self, method)
           end
         end
+
         send(method, *args, &block)
       end
 

data/lib/origen/errata/hw_erratum.rb

@@ -31,7 +31,7 @@ module Origen
       # Software workaround object associated with erratum
       attr_accessor :sw_workaround
 
-      def initialize(id, ip_block, overview  = {}, status = {}, sw_workaround = {})
+      def initialize(id, ip_block, overview = {}, status = {}, sw_workaround = {})
         @id = id
         @ip_block = ip_block
         @title = overview[:title]

data/lib/origen/errata.rb

@@ -1,11 +1,11 @@
 module Origen
   module Errata
-    autoload :HwErratum,		'origen/errata/hw_erratum'
+    autoload :HwErratum,	'origen/errata/hw_erratum'
     autoload :SwErratumWorkaround,	'origen/errata/sw_erratum_workaround'
 
-    attr_accessor :_errata
+    attr_writer :_errata
 
-    attr_accessor :_sw_workarounds
+    attr_writer :_sw_workarounds
 
     # Define and instantiate an erratum object
     def erratum(id, ip_block, overview = {}, status = {}, sw_workaround = {})
@@ -40,12 +40,12 @@ module Origen
 
       # Return nil if there are no errata that meet criteria
       if errata_found.empty?
-        return nil
+        nil
       # If only one errata meets criteria, return that HwErratum object
       elsif errata_found.size == 1
         errata_found.values.first.values.first.values.first
       else
-        return errata_found
+        errata_found
       end
     end
 
@@ -72,11 +72,11 @@ module Origen
         sw_workarounds_found[id] = workarounds
       end
       if sw_workarounds_found.empty?
-        return nil
+        nil
       elsif sw_workarounds_found.size == 1
         sw_workarounds_found.values.first # .values.first
       else
-        return sw_workarounds_found
+        sw_workarounds_found
       end
     end
 
@@ -107,7 +107,6 @@ module Origen
     #    when NilClass then true # Return all specs if a filter is set to nil (i.e. user doesn't care about this filter)
     #    else true
     #  end
-    # rubocop:disable UnusedBlockArgument
     #  filtered_hash = hash.select do |k, v|
     #    [TrueClass, FalseClass].include?(select_logic.class) ? select_logic : eval(select_logic)
     #  end

data/lib/origen/features/feature.rb

@@ -11,6 +11,7 @@ module Origen
 
       def describe
         return 'No description provided!' if @description == []
+
         if @description.class == Array
           @description.join(' ')
         else