origen_testers 0.52.15 → 0.53.0

data/lib/origen_testers/igxl_based_tester/ultraflex.rb

@@ -2,7 +2,7 @@ require 'origen_testers/igxl_based_tester/ultraflex/ate_hardware'
 module OrigenTesters
   module IGXLBasedTester
     class UltraFLEX < Base
-      autoload :Generator,   'origen_testers/igxl_based_tester/ultraflex/generator.rb'
+      autoload :Generator, 'origen_testers/igxl_based_tester/ultraflex/generator.rb'
 
       # Read or update the digital instrument
       #  Ex: tester.digital_instrument = 'hsdmq'
@@ -65,8 +65,7 @@ module OrigenTesters
       #   $tester.freq_count($top.pin(:d_out))                 # Freq measure on pin "d_out"
       #   $tester.freq_count($top.pin(:d_out):readcode => 10)
       def freq_count(pin, options = {})
-        options = { readcode: false
-                  }.merge(options)
+        options = { readcode: false }.merge(options)
 
         set_code(options[:readcode]) if options[:readcode]
         cycle(microcode: "#{@microcode[:set_flag]} (#{@flags[0]})") # set cpuA
@@ -191,24 +190,22 @@ module OrigenTesters
       #
       def set_code(*code)
         options = code.last.is_a?(Hash) ? code.pop : {}
-        options = { counter: 'c15'
-                  }.merge(options)
+        options = { counter: 'c15' }.merge(options)
         cc " Using counter #{options[:counter]} as set_code replacement - value set to #{code[0]} + 1"
         unless @set_msb_issued
           set_msb(1)
           cycle   # set_msb doesn't issue a cycle
         end
-        cycle(microcode: "set #{options[:counter]} #{code[0].next}")   #+1 here to align with VBT
+        cycle(microcode: "set #{options[:counter]} #{code[0].next}")   # +1 here to align with VBT
       end
 
       def set_code_no_msb(*code)
         options = code.last.is_a?(Hash) ? code.pop : {}
-        options = { counter: 'c15'
-                  }.merge(options)
+        options = { counter: 'c15' }.merge(options)
         unless @set_msb_issued
           cycle   # set_msb doesn't issue a cycle
         end
-        cycle(microcode: "set #{options[:counter]} #{code[0].next}")   #+1 here to align with VBT
+        cycle(microcode: "set #{options[:counter]} #{code[0].next}")   # +1 here to align with VBT
       end
 
       def loop_vectors(name, number_of_loops, global = false, label_first = false)
@@ -372,8 +369,7 @@ module OrigenTesters
         super(options.merge(digital_inst: @digital_instrument,
                             memory_test:  false,
                             high_voltage: false,
-                            svm_only:     false
-                           )) do |pin_list|
+                            svm_only:     false)) do |pin_list|
           # if subroutine pattern has only single-module subroutines then skip module start
           # (will be taken care of elsewhere)
           unless options[:subroutine_pat] && @onemodsubs_found && !@nonmodsubs_found
@@ -419,6 +415,7 @@ module OrigenTesters
             # must be done BEFORE any subroutines that need their own module definition!
             fail "ERROR: Cannot implement any common module subroutines (#{name}) after implementing any single-module subroutines in the same pattern!"
           end
+
           @nonmodsubs_found = true
         end
         super(name, options)
@@ -632,7 +629,7 @@ module OrigenTesters
       def handshake(options = {})
         options = {
           readcode:    false,
-          manual_stop: false,    # set a 2nd CPU flag in case 1st flag is automatically cleared
+          manual_stop: false    # set a 2nd CPU flag in case 1st flag is automatically cleared
         }.merge(options)
         if options[:readcode]
           set_code(options[:readcode])
@@ -685,10 +682,10 @@ module OrigenTesters
       #   $tester.store(:offset => -2) # Just realized I need to capture that earlier vector
       def store(*pins)
         return if @inhibit_vectors
+
         options = pins.last.is_a?(Hash) ? pins.pop : {}
         options = { offset: 0,
-                    opcode: 'stv'
-                  }.merge(options)
+                    opcode: 'stv' }.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For the UltraFLEX you must supply the pins to store/capture'
@@ -750,6 +747,7 @@ module OrigenTesters
       #   $tester.cycle                # This is the vector that will be captured
       def store_next_cycle(*pins)
         return if @inhibit_vectors
+
         options = pins.last.is_a?(Hash) ? pins.pop : {}
         options = {
           opcode: 'stv'

data/lib/origen_testers/igxl_based_tester.rb

@@ -5,7 +5,7 @@ module OrigenTesters
     autoload :J750_HPT,            'origen_testers/igxl_based_tester/j750_hpt.rb'
     autoload :UltraFLEX,           'origen_testers/igxl_based_tester/ultraflex.rb'
 
-    require 'origen_testers/igxl_based_tester/base.rb'
+    require 'origen_testers/igxl_based_tester/base'
     require 'origen_testers/igxl_based_tester/decompiler'
   end
   # Convenience/Legacy names without the IGXLBasedTester namespace

data/lib/origen_testers/interface.rb

@@ -119,6 +119,7 @@ module OrigenTesters
     # tester-level by the target.
     def add_flow_enable=(value)
       return unless flow.respond_to?(:add_flow_enable=)
+
       if value
         if value == :enable || value == :enabled
           flow.add_flow_enable = :enabled
@@ -151,17 +152,16 @@ module OrigenTesters
     # Compile a template file
     def compile(file, options = {})
       return unless write?
+
       # Any options passed in from an interface will be passed to the compiler and to
       # the templates being compiled
       options[:initial_options] = options
       Origen.file_handler.preserve_state do
-        begin
-          file = Origen.file_handler.clean_path_to_template(file)
-          Origen.generator.compile_file_or_directory(file, options)
-        rescue
-          file = Origen.file_handler.clean_path_to(file)
-          Origen.generator.compile_file_or_directory(file, options)
-        end
+        file = Origen.file_handler.clean_path_to_template(file)
+        Origen.generator.compile_file_or_directory(file, options)
+      rescue
+        file = Origen.file_handler.clean_path_to(file)
+        Origen.generator.compile_file_or_directory(file, options)
       end
     end
 
@@ -189,7 +189,7 @@ module OrigenTesters
       sheet_generators.each do |generator|
         generator.finalize(options)
       end
-      sheet_generators.each do |generator|
+      sheet_generators.each do |generator| # rubocop:disable Style/CombinableLoops
         generator.write_to_file(options) if generator.to_be_written?
       end
       clean_referenced_patterns

data/lib/origen_testers/labview_based_tester/pxie6570.rb

@@ -101,6 +101,7 @@ module OrigenTesters
         pins = pins.flatten.compact
 
         fail 'For the PXIE6570 you must supply the pins to store/capture' if pins.empty?
+
         add_capture_start pins, options
 
         pins.each do |pin|
@@ -191,6 +192,7 @@ module OrigenTesters
         repeat_count = options[:repeat].nil? ? 1 : options[:repeat]
 
         fail 'For the PXIE6570 you must supply the pins to store/capture' if pins.empty?
+
         add_capture_start pins, options
         @capture_history[:count] += repeat_count
 

data/lib/origen_testers/labview_based_tester.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   module LabVIEWBasedTester
-    autoload :Pxie6570,		'origen_testers/labview_based_tester/pxie6570.rb'
+    autoload :Pxie6570,	'origen_testers/labview_based_tester/pxie6570.rb'
   end
   # Shorter name without LabVIEWBasedTester namespace
-  autoload :Pxie6570,		'origen_testers/labview_based_tester/pxie6570.rb'
+  autoload :Pxie6570,	'origen_testers/labview_based_tester/pxie6570.rb'
 end

data/lib/origen_testers/origen_ext/pins/pin.rb

@@ -13,7 +13,7 @@ module Origen
           site:        0 # Default is to use site 0.
         }.merge(options)
         unless $tester.channelmap[options[:chanmapname]]
-          fail "You must first import the tester channel map (e.g. $tester.channelmap = \"probe_x32\") before calling pin.channel"
+          fail 'You must first import the tester channel map (e.g. $tester.channelmap = "probe_x32") before calling pin.channel'
         end
 
         channelinfo = Struct.new(:channel, :chanmapname, :site)
@@ -31,10 +31,10 @@ module Origen
         }.merge(options)
 
         unless $tester.channelmap[options[:chanmapname]]
-          fail "You must first import the tester channel map (e.g. $tester.channelmap = \"probe_x32\") before calling pin.channel"
+          fail 'You must first import the tester channel map (e.g. $tester.channelmap = "probe_x32") before calling pin.channel'
         end
         unless $tester.testerconfig[options[:testerconfigname]]
-          fail "You must first import the tester configuration (e.g. $tester.testerconfig = \"UflexConfigA\") before calling pin.instrument_type"
+          fail 'You must first import the tester configuration (e.g. $tester.testerconfig = "UflexConfigA") before calling pin.instrument_type'
         end
 
         instrumentinfo = Struct.new(:instrument, :chanmapname, :site, :testerconfigname)
@@ -52,11 +52,12 @@ module Origen
         }.merge(options)
 
         unless $tester.channelmap[options[:chanmapname]]
-          fail "You must first import the tester channel map (e.g. $tester.channelmap = \"probe_x32\") before calling pin.channel"
+          fail 'You must first import the tester channel map (e.g. $tester.channelmap = "probe_x32") before calling pin.channel'
         end
         unless $tester.testerconfig[options[:testerconfigname]]
-          fail "You must first import the tester configuration (e.g. $tester.testerconfig = \"UflexConfigA\") before calling pin.instrument_type"
+          fail 'You must first import the tester configuration (e.g. $tester.testerconfig = "UflexConfigA") before calling pin.instrument_type'
         end
+
         if Origen.top_level.power_pin_groups.keys.include?(name)  # Power Pin Groups do not need :ppmu, but need :supply
           instrumentinfo = Struct.new(:channel, :instrument, :chanmapname, :site, :testerconfigname, :supply)
           @channel = $tester.get_tester_channel(options[:chanmapname], name, options[:site])

data/lib/origen_testers/origen_ext/pins/pin_collection.rb

@@ -13,7 +13,7 @@ module Origen
           site:        0 # Default is to use site 0.
         }.merge(options)
         unless $tester.channelmap[options[:chanmapname]]
-          fail "You must first import the tester channel map (e.g. $tester.channelmap = \"probe_x32\") before calling pin.channel"
+          fail 'You must first import the tester channel map (e.g. $tester.channelmap = "probe_x32") before calling pin.channel'
         end
 
         channelinfo = Struct.new(:channel, :chanmapname, :site)
@@ -31,10 +31,10 @@ module Origen
         }.merge(options)
 
         unless $tester.channelmap[options[:chanmapname]]
-          fail "You must first import the tester channel map (e.g. $tester.channelmap = \"probe_x32\") before calling pin.channel"
+          fail 'You must first import the tester channel map (e.g. $tester.channelmap = "probe_x32") before calling pin.channel'
         end
         unless $tester.testerconfig[options[:testerconfigname]]
-          fail "You must first import the tester configuration (e.g. $tester.testerconfig = \"UflexConfigA\") before calling pin.instrument_type"
+          fail 'You must first import the tester configuration (e.g. $tester.testerconfig = "UflexConfigA") before calling pin.instrument_type'
         end
 
         instrumentinfo = Struct.new(:instrument, :chanmapname, :site, :testerconfigname)
@@ -52,10 +52,10 @@ module Origen
         }.merge(options)
 
         unless $tester.channelmap[options[:chanmapname]]
-          fail "You must first import the tester channel map (e.g. $tester.channelmap = \"probe_x32\") before calling pin.channel"
+          fail 'You must first import the tester channel map (e.g. $tester.channelmap = "probe_x32") before calling pin.channel'
         end
         unless $tester.testerconfig[options[:testerconfigname]]
-          fail "You must first import the tester configuration (e.g. $tester.testerconfig = \"UflexConfigA\") before calling pin.instrument_type"
+          fail 'You must first import the tester configuration (e.g. $tester.testerconfig = "UflexConfigA") before calling pin.instrument_type'
         end
 
         if Origen.top_level.power_pin_groups.keys.include?(name)  # Power Pin Groups do not need :ppmu, but need :supply
@@ -65,7 +65,7 @@ module Origen
           @supply = $tester.ate_hardware(@instrument).supply
           instrumentinfo.new(@channel, @instrument, options[:chanmapname], options[:site], options[:testerconfigname], @supply)
         else  # Collecting information of individual members and put in arrays
-          instrumentinfo = Struct.new(:members, :channel, :instrument, :chanmapname, :site, :testerconfigname, :ppmu)
+          instrumentinfo = Struct.new(:members, :channel, :instrument, :chanmapname, :site, :testerconfigname, :ppmu) # rubocop:disable Lint/StructNewOverride
           @members = []
           @channel = []
           @instrument = []

data/lib/origen_testers/parser/searchable_array.rb

@@ -10,13 +10,13 @@ module Tester
                  if exact
                    val.any? { |v| item.send(attr).to_s == v.to_s }
                  else
-                   val.any? { |v| item.send(attr).to_s =~ /#{v.to_s}/ }
+                   val.any? { |v| item.send(attr).to_s =~ /#{v}/ }
                  end
                else
                  if exact
                    item.send(attr).to_s == val.to_s
                  else
-                   item.send(attr).to_s =~ /#{val.to_s}/
+                   item.send(attr).to_s =~ /#{val}/
                  end
                end
              end

data/lib/origen_testers/parser/searchable_hash.rb

@@ -10,13 +10,13 @@ module OrigenTesters
                  if exact
                    val.any? { |v| item.send(attr).to_s == v.to_s }
                  else
-                   val.any? { |v| item.send(attr).to_s =~ /#{v.to_s}/ }
+                   val.any? { |v| item.send(attr).to_s =~ /#{v}/ }
                  end
                else
                  if exact
                    item.send(attr).to_s == val.to_s
                  else
-                   item.send(attr).to_s =~ /#{val.to_s}/
+                   item.send(attr).to_s =~ /#{val}/
                  end
                end
              end

data/lib/origen_testers/parser.rb

@@ -2,7 +2,7 @@ module OrigenTesters
   module Parser
     autoload :SearchableArray, 'origen_testers/parser/searchable_array'
     autoload :SearchableHash,  'origen_testers/parser/searchable_hash'
-    autoload :DescriptionLookup,  'origen_testers/parser/description_lookup'
+    autoload :DescriptionLookup, 'origen_testers/parser/description_lookup'
 
     def parse(*args, &block)
       parser.parse(*args, &block)

data/lib/origen_testers/pattern_compilers/assembler.rb

@@ -36,12 +36,14 @@ module OrigenTesters
             line.strip!
             # Skip a blank line
             next if line.match(/^\s+$/)
+
             # Check if the pattern or list exists
             line_path = Pathname.new("#{dir}/#{line}")
             unless line_path.file?
               # puts "Skipping #{line_path.to_s} at line ##{line_number} in file #{path.to_s} because it is not a file"
               next
             end
+
             # Process the file
             process_file(line_path, files)
           end
@@ -58,7 +60,7 @@ module OrigenTesters
             files << file unless files.include?(file)
           when 'list'
             parse_list(file, files)
-          end
+        end
       end
 
       # Processes a diretcory looking for files in '.' or recursively

data/lib/origen_testers/pattern_compilers/base.rb

@@ -24,7 +24,7 @@ module OrigenTesters
           path:                nil,     # required: will be passed in or parsed from a .list file
           reference_directory: nil,     # optional: will be set to @path or Origen.app.config.pattern_output_directory
           target:              nil,     # optional: allows user to temporarily set target and run compilation
-          recursive:           false,   # optional: controls whether to look for patterns in a directory recursively
+          recursive:           false   # optional: controls whether to look for patterns in a directory recursively
         }
 
         @job_options = {
@@ -32,7 +32,7 @@ module OrigenTesters
           location:         :local,     # optional: controls whether the commands go to the LSF or run locally
           clean:            false,      # optional: controls whether compiler log files are deleted after compilation
           output_directory: nil,        # optional:
-          verbose:          false,      # optional: controls whether the compiler output gets put to STDOUT
+          verbose:          false      # optional: controls whether the compiler output gets put to STDOUT
         }
         @compiler_options = {}
         @compiler_options_with_args = {}
@@ -58,7 +58,7 @@ module OrigenTesters
       end
 
       # Allow users to search for a pattern in the job queue or default to return all jobs
-      def jobs(search = nil)
+      def jobs(search = nil) # rubocop:disable Lint/DuplicateMethods
         found = false
         if search.nil?
           inspect_jobs
@@ -143,6 +143,7 @@ module OrigenTesters
               req = 'true '
             else
               next if v.nil? || v == false
+
               req = 'false'
             end
             desc << "| #{k}".ljust(22) + "| #{v}".ljust(argument_padding) + "| #{req}    |"
@@ -255,7 +256,7 @@ module OrigenTesters
       end
 
       def empty_msg
-        puts "No compiler jobs created, check the compiler options\n" if self.empty?
+        puts "No compiler jobs created, check the compiler options\n" if empty?
       end
 
       def convert_to_pathname(opt)

data/lib/origen_testers/pattern_compilers/igxl_based.rb

@@ -10,7 +10,7 @@ module OrigenTesters
         @user_options = {}.merge(@user_options)
 
         @job_options = {
-          pinmap_workbook:  dut.pinmap,    # required: will default to $dut.pinmap
+          pinmap_workbook: dut.pinmap    # required: will default to $dut.pinmap
         }.merge(@job_options)
 
         # These are compiler options that are common to both the UltraFLEX and J750 compilers
@@ -22,7 +22,7 @@ module OrigenTesters
           import_all_undefineds: false,     # automatically import all undefined symbols.  the key is mis-spelled but correct!
           suppress_log:          false,     # disables output to main log file
           template:              false,     # generate setup template
-          timestamp:             false,     # enable log timestamp
+          timestamp:             false     # enable log timestamp
         }.merge(@compiler_options)
 
         # These are compiler options that are common to both the UltraFLEX and J750 compilers
@@ -34,7 +34,7 @@ module OrigenTesters
           output:       nil,       # Name of output file
           pinmap_sheet: nil,       # Name of workbook containing pinmap
           # pinmap_workbook:     nil,       # Name of sheet in workbook which contains pinmap (moved to @job_options)
-          setup:        nil,       # path to setup file
+          setup:        nil       # path to setup file
         }.merge(@compiler_options_with_args)
       end
 
@@ -68,6 +68,7 @@ module OrigenTesters
           end
           @jobs.each do |job|
             fail "Error: compiler #{job.id} not ready for pattern #{job.name}" unless job.ready?
+
             if job.location == :lsf
               Origen.app.lsf.submit(ATPC_SETUP + '; ' + job.cmd)
             else
@@ -87,6 +88,7 @@ module OrigenTesters
         else
           list = convert_to_pathname(list)
           fail "Error: pattern list #{list} does not exist, exiting..." unless list.file?
+
           File.open(list, 'r') do |file|
             while (line = file.gets)
               current_job_options = @job_options.merge(@compiler_options_with_args)
@@ -132,8 +134,10 @@ module OrigenTesters
       # Handles singles files (.atp, .atp.gz, or .list) and directories (recursively or flat)
       def find_jobs(path = @path)
         fail 'Pattern path is set to nil, pass in a valid file (.atp or .atp.gz) or a valid directory' if path.nil?
+
         @path = Pathname.new(path)
         fail 'Pattern path does not exist, pass in a valid file (.atp or .atp.gz) or a valid directory' unless @path.exist?
+
         @path = @path.expand_path
         # Set the reference directory for pattern sub-dir mirroring
         set_reference_directory
@@ -228,6 +232,7 @@ module OrigenTesters
       # Output the compiler jobs in the queue to the console
       def inspect_jobs(index = nil)
         return empty_msg if empty?
+
         desc = []
         puts "\n"
         @jobs.each_with_index do |j, i|
@@ -290,6 +295,7 @@ module OrigenTesters
         end
         puts desc.flatten.join("\n")
       end
+
       # For future checks on incorrect or incompatible arguments to compiler options
       def options_ok?
       end

data/lib/origen_testers/pattern_compilers/j750.rb

@@ -40,7 +40,7 @@ module OrigenTesters
 
         @job_options = {
           tester:   :j750,
-          compiler: self.class.compiler,   # required
+          compiler: self.class.compiler   # required
         }.merge(@job_options)
 
         # These are compiler options that are specific to J750 compiler (builds on options from IGXL-Based)
@@ -50,7 +50,7 @@ module OrigenTesters
           extended:      false,     # Compiles the pattern for extended mode.
           scan_parallel: false,     # Expands scan vectors into parallel SVM/LVM vectors.
           svm_only:      false,     # Compile all vectors in the file for SVM.
-          svm_subr_only: false,     # Only SVM subroutines in file being used.
+          svm_subr_only: false     # Only SVM subroutines in file being used.
         }.merge(@compiler_options)
 
         # These are compiler options that are specific to J750 compiler (builds on options from IGXL-Based)
@@ -58,7 +58,7 @@ module OrigenTesters
           i:          nil,          # Includes paths to be passed to C++ preprocessor.
           lvm_size:   nil,          # Number of LVM vectors to allow in a single pattern.
           max_errors: nil,          # Number of errors that will cause compilation of the pattern file to be aborted.
-          min_period: nil,          # Minimum period, in seconds, that will be used during a pattern burst.
+          min_period: nil          # Minimum period, in seconds, that will be used during a pattern burst.
         }.merge(@compiler_options_with_args)
 
         update_common_options(options)      # Update common options with default (see BasePatternCompiler)
@@ -69,6 +69,7 @@ module OrigenTesters
       # Executes the compiler for each job in the queue
       def run(list = nil, options = {})
         fail "Error: the tester #{Origen.tester} is not an J750 tester,exiting..." unless is_j750?
+
         msg = "Error: application #{Origen.app.name} is running on Windows, "
         msg += 'to run the pattern compiler you must be on a Linux machine'
         fail msg if Origen.running_on_windows?

data/lib/origen_testers/pattern_compilers/ultraflex.rb

@@ -40,7 +40,7 @@ module OrigenTesters
 
         @job_options = {
           tester:   :ultraflex,
-          compiler: self.class.compiler,  # required
+          compiler: self.class.compiler  # required
         }.merge(@job_options)
 
         # These are compiler options that are specific to UltraFLEX (builds on options from IGXL-Based)
@@ -49,7 +49,7 @@ module OrigenTesters
           lock:       false,              # prevents pattern from being reverse compiled or opened in PatternTool
           multiinst:  false,              # indicates more than one instrument is connected to a single pin
           nocompress: false,              # do not compress pattern data blocks
-          stdin:      false,              # Compile data from standard input. Do not use -cpp or specify any pattern file(s) when using this option.
+          stdin:      false              # Compile data from standard input. Do not use -cpp or specify any pattern file(s) when using this option.
         }.merge(@compiler_options)
 
         # These are compiler options that are specific to UltraFLEX (builds on options from IGXL-Based)
@@ -70,7 +70,7 @@ module OrigenTesters
           allow_mixed_1x2x:    nil,       # Turns on/off the support of mixed 1x/2x pin groups. Default value is "no".
           allow_differential:  nil,       # Turns on/off support for differential pins. Default value is "yes".
           allow_scan_in_srm:   nil,       # Allow/disallow scan vectors in SRM pattern modules. Default value is "no".
-          vm_block_size:       nil,       # Specifies uncompressed size in bytes of a pattern data block
+          vm_block_size:       nil       # Specifies uncompressed size in bytes of a pattern data block
         }.merge(@compiler_options_with_args)
 
         update_common_options(options)    # Update common options with default (see BasePatternCompiler)
@@ -81,6 +81,7 @@ module OrigenTesters
       # Executes the compiler for each job in the queue
       def run(list = nil, options = {})
         fail "Error: the tester #{Origen.tester} is not an Ultrflex tester,exiting..." unless is_ultraflex?
+
         msg = "Error: application #{Origen.app.name} is running on Windows, "
         msg += 'to run the pattern compiler you must be on a Linux machine'
         fail msg if Origen.running_on_windows?

data/lib/origen_testers/pattern_compilers/v93k.rb

@@ -54,20 +54,18 @@ module OrigenTesters
           avc_dir:       nil,
           binl_dir:      nil,
           multiport:     nil,        # Optional hash for multiport settings: port_bursts, port_in_focus, prefix, postfix
-          digcap:        nil,        # Optional hash for digcap settings: pins, vps, nrf, char
+          digcap:        nil        # Optional hash for digcap settings: pins, vps, nrf, char
         }.merge(@user_options)
 
         @job_options = {
           tester:   :v93k,
-          compiler: self.class.compiler,   # required
+          compiler: self.class.compiler   # required
         }.merge(@job_options)
 
-        @compiler_options = {
-
-        }.merge(@compiler_options)
+        @compiler_options = {}.merge(@compiler_options)
 
         @compiler_options_with_args = {
-          aiv2b_opts:  nil
+          aiv2b_opts: nil
         }.merge(@compiler_options_with_args)
 
         @avc_files = []
@@ -149,6 +147,7 @@ module OrigenTesters
           # Assumes .aiv file and all workspace collateral has been built up
           aiv = convert_to_pathname(aiv)
           fail 'File does not exist!  Please specify existing aiv file.' unless aiv.file?
+
           current_job_options = @job_options.merge(@compiler_options_with_args)
           current_job_options = current_job_options.merge(extract_job_options_from_aiv(aiv))
           current_job_options = current_job_options.merge(options)
@@ -163,6 +162,7 @@ module OrigenTesters
       # Output the compiler jobs in the queue to the console
       def inspect_jobs(index = nil)
         return empty_msg if empty?
+
         desc = []
         puts "\n"
         @jobs.each_with_index do |j, i|
@@ -195,8 +195,10 @@ module OrigenTesters
         # First-level verification: file/directory was given and exists
         msg = 'Pass in a valid file (.avc, .avc.gz, .list) or a valid directory'
         fail "Pattern path is set to nil! #{msg}" if p.nil?
+
         path = Pathname.new(p)
         fail "Pattern path does not exist! #{msg}" unless path.exist?
+
         path = path.expand_path
 
         # Set the reference directory for pattern sub-dir mirroring
@@ -257,7 +259,7 @@ module OrigenTesters
 
           # Move AVC files into job space (through pre-processor)
           @files.each do |file|
-            contents = File.open(file, 'rb') { |f| f.read }
+            contents = File.open(file, 'rb', &:read)
             new_contents = preprocess_avc(contents)
             new_avc_file = Pathname.new("#{job_avc_dir}/#{Pathname.new(file).basename}").cleanpath
             File.open(new_avc_file, 'w') { |f| f.write(new_contents.force_encoding('UTF-8')) }
@@ -315,6 +317,7 @@ module OrigenTesters
         factor = 1
         contents.each_line do |line|
           next if line.match(/^\s*\#/)
+
           if line.match(/^\s*SQPG\s+LBGN\s+(\d+)\s*;/)
             factor = Regexp.last_match(1).to_i
           end
@@ -325,42 +328,36 @@ module OrigenTesters
       end
 
       def avc_dir
-        @avc_dir ||= begin
-          if @user_options[:avc_dir]
-            clean_path(@user_options[:avc_dir].to_s)
-          else
-            Pathname.new('./AVC')      # default value
-          end
-        end
+        @avc_dir ||= if @user_options[:avc_dir]
+                       clean_path(@user_options[:avc_dir].to_s)
+                     else
+                       Pathname.new('./AVC')      # default value
+                     end
       end
 
       def binl_dir
-        @binl_dir ||= begin
-          if @user_options[:binl_dir]
-            clean_path(@user_options[:binl_dir].to_s)
-          else
-            Pathname.new('./BINL')     # default value
-          end
-        end
+        @binl_dir ||= if @user_options[:binl_dir]
+                        clean_path(@user_options[:binl_dir].to_s)
+                      else
+                        Pathname.new('./BINL')     # default value
+                      end
       end
 
       def tmp_dir
-        @tmp_dir ||= begin
-          if @user_options[:tmp_dir]
-            clean_path(@user_options[:tmp_dir].to_s)
-          else
-            Pathname.new('./tmp')     # default value
-          end
-        end
+        @tmp_dir ||= if @user_options[:tmp_dir]
+                       clean_path(@user_options[:tmp_dir].to_s)
+                     else
+                       Pathname.new('./tmp')     # default value
+                     end
       end
 
       # Given path string, return Pathname object with cleaned up path
       def clean_path(path_str)
         path = Pathname.new(path_str).cleanpath
         if path.absolute?
-          return path
+          path
         else
-          return Pathname.new("./#{path}")
+          Pathname.new("./#{path}")
         end
       end
 
@@ -408,7 +405,7 @@ module OrigenTesters
 
       def extract_job_options_from_aiv(file)
         options = {}
-        contents = File.open(file, 'rb') { |f| f.read }
+        contents = File.open(file, 'rb', &:read)
         count = 0
         counting = false
         contents.each_line do |line|

data/lib/origen_testers/pattern_compilers.rb

@@ -104,6 +104,7 @@ module OrigenTesters
       if p.nil?
         fail "No tester platform defined, supply one of the following as an argument: #{PLATFORMS.keys.sort.join(', ')}"
       end
+
       p = p.to_sym
       @pattern_compilers[p].keys
     end