origen_testers 0.52.15 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ccfb03e47cfe6029a39026710cc2f13bfb22bb1fd647c487a1809a22a3e289
-  data.tar.gz: e1bca4ec1b97d106986a00346f3cb1d5950a59dd96157ba1337c026aaac3c35c
+  metadata.gz: bd70a31c286817288ecefd2da59f6e353a7352e68b7fda835d003863bb31b335
+  data.tar.gz: 15a7415efb5843bf6de77749d322fe58d83c90ed7d6f33a55493b720602f53b1
 SHA512:
-  metadata.gz: d5237f915a749375154874337a2351a76d11f91eb8194ecc14ae3b154b2ea8e268afc63e912fb0cfd4af059b92d667143f982326bebcc7f9c8c9f7fa099e6a4d
-  data.tar.gz: 11b88ca1f31bec5a795ce3b2a62a2529b74f9ff92f110cb962834d1d045279490ef9a65011c6034a791744dddca549a13e150df1f37d08b46db559868ac1b958
+  metadata.gz: b63efbe6a34c23da197eb95b35631b37fe143b4a998c391a920acf6edd664eff512de5241915cd491578ae869f8d721bd7be4be4e51580037e5a0a7b83e5862a
+  data.tar.gz: 9992f1ee5387bcef67571ae85b59aedb20578d98fa7218f7c36a1281e35aba80571288d861405ae3f2936b2d6f4f7f1e64c405ce75feeec2295936c152097c67

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   MAJOR = 0
-  MINOR = 52
-  BUGFIX = 15
+  MINOR = 53
+  BUGFIX = 0
   DEV = nil
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
 end

data/lib/commands/build.rb

@@ -21,8 +21,8 @@ Usage: origen testers:build MANIFEST [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('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
+  opts.on('-pl', '--plugin PLUGIN_NAME', String, 'Set current plugin') { |pl_n| options[:current_plugin] = pl_n }
+  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('-n', '--new', 'Generate a new manifest file for the current tester platform') { options[:new] = true }
   opts.on('-o', '--output DIR', String, 'Override the default output directory') { |o| options[:output] = o }

data/lib/commands/convert.rb

@@ -32,7 +32,7 @@ Usage: origen convert FILE [options]
     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 }
   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.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit 0 }

data/lib/commands/run.rb

@@ -14,7 +14,7 @@ Usage: origen testers:run FLOW [options]
   opts.on('--fail ID,ID', Array, 'Comma-separated list of test IDs to fail') { |ids| options[:failed_test_ids] = ids }
   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('-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.on('-h', '--help', 'Show this message') { puts opts; exit 0 }
@@ -26,7 +26,7 @@ Origen.environment.temporary = options[:environment] if options[:environment]
 Origen.target.temporary = options[:target] if options[:target]
 # Origen.app.load_target!
 
-program =  OrigenTesters.program
+program = OrigenTesters.program
 
 unless program
   puts 'Sorry, but there is no program model available for the current target, generate the program then retry'

data/lib/origen_testers/api.rb

@@ -79,6 +79,7 @@ module OrigenTesters
 
     def is_vector_based?
       return @vector_based if defined?(@vector_based)
+
       true
     end
 
@@ -252,6 +253,7 @@ module OrigenTesters
       unless timeset.period_in_ns?
         fail "You must supply a period_in_ns to timeset '#{timeset.name}' before you can cycle the tester!"
       end
+
       timeset.cycled = true
       if PatSeq.thread
         PatSeq.thread.cycle(options)
@@ -303,6 +305,7 @@ module OrigenTesters
 
     def pop_running_clock(pin)
       fail "ERROR: No clocks running, doesn't make sense to pop one" unless any_clocks_running?
+
       @clocks_running.delete(pin.name.to_s)
     end
 

data/lib/origen_testers/atp/ast/node.rb

@@ -23,8 +23,7 @@ module OrigenTesters::ATP
               description: description,
               type:        type,
               children:    Processors::Marshal.new.process_all(children),
-              properties:  properties
-            }
+              properties:  properties }
         Marshal.dump(d, depth)
       end
 

data/lib/origen_testers/atp/flow.rb

@@ -485,6 +485,7 @@ module OrigenTesters::ATP
         if name.to_s != options[:path].split('.').last.to_s
           fail "Auxiliary flow path does not end in '#{name}'. The path instead is '#{options[:path]}'. Please update the path to align with the provided name."
         end
+
         extract_meta!(options) do
           apply_conditions(options) do
             n2(:auxiliary_flow, n1(:name, name), n1(:path, options[:path]))
@@ -499,6 +500,7 @@ module OrigenTesters::ATP
       if number.is_a?(Hash)
         fail 'The bin number must be passed as the first argument'
       end
+
       options[:bin_description] ||= options.delete(:description)
       extract_meta!(options) do
         apply_conditions(options) do
@@ -514,6 +516,7 @@ module OrigenTesters::ATP
       if number.is_a?(Hash)
         fail 'The bin number must be passed as the first argument'
       end
+
       options[:type] = :pass
       bin(number, options)
     end
@@ -630,6 +633,7 @@ module OrigenTesters::ATP
       unless args[0].keys.include?(:from) && args[0].keys.include?(:to)
         fail 'Loop must specify :from, :to'
       end
+
       # assume 1 if :step not provided
       unless args[0].keys.include?(:step)
         args[0][:step] = 1
@@ -658,37 +662,42 @@ module OrigenTesters::ATP
     end
 
     RELATIONAL_OPERATORS.each do |method|
-      define_method method do |*args, &block|
-        options = args.pop if args.last.is_a?(Hash)
-        unless args.size == 2
-          fail "Format for relational operation must match: ':<operator>(var1, var2)'"
+      unless method_defined?(method)
+        define_method method do |*args, &block|
+          options = args.pop if args.last.is_a?(Hash)
+          unless args.size == 2
+            fail "Format for relational operation must match: ':<operator>(var1, var2)'"
+          end
+
+          n2(method.to_sym, args[0], args[1])
         end
-        n2(method.to_sym, args[0], args[1])
-      end unless method_defined?(method)
+      end
     end
 
     # Define handlers for all of the flow control block methods, unless a custom one has already
     # been defined above
     CONDITION_KEYS.keys.each do |method|
-      define_method method do |*flags, &block|
-        if flags.last.is_a?(Hash)
-          options = flags.pop
-        else
-          options = {}
-        end
-        if flags.include? nil
-          Origen.log.error("Found Nil flag passed to the '#{method}' method, ensure the flag is passed as a String or a Symbol!")
-          fail
-        end
-        flags = flags.first if flags.size == 1
-        # Legacy option provided by OrigenTesters that permits override of a block enable method by passing
-        # an :or option with a true value
-        if (CONDITION_KEYS[method] == :if_enabled || CONDITION_KEYS[method] || :unless_enabled) && options[:or]
-          block.call
-        else
-          flow_control_method(CONDITION_KEYS[method], flags, options, &block)
+      unless method_defined?(method)
+        define_method method do |*flags, &block|
+          if flags.last.is_a?(Hash)
+            options = flags.pop
+          else
+            options = {}
+          end
+          if flags.include? nil
+            Origen.log.error("Found Nil flag passed to the '#{method}' method, ensure the flag is passed as a String or a Symbol!")
+            fail
+          end
+          flags = flags.first if flags.size == 1
+          # Legacy option provided by OrigenTesters that permits override of a block enable method by passing
+          # an :or option with a true value
+          if (CONDITION_KEYS[method] == :if_enabled || CONDITION_KEYS[method] || :unless_enabled) && options[:or] # rubocop:disable Lint/LiteralAsCondition, Lint/RedundantCopDisableDirective
+            block.call
+          else
+            flow_control_method(CONDITION_KEYS[method], flags, options, &block)
+          end
         end
-      end unless method_defined?(method)
+      end
     end
 
     def inspect
@@ -736,6 +745,7 @@ module OrigenTesters::ATP
             unless options[:then] || options[:else]
               fail "You must supply a :then or :else option when calling #{name} like this!"
             end
+
             node = n1(name, flag)
             if options[:then]
               node = append_to(node) { options[:then].call }
@@ -766,6 +776,7 @@ module OrigenTesters::ATP
         unless found
           fail 'The request to apply the current context has failed, this is likely a bug in OrigenTesters::ATP'
         end
+
         node
       else
         conditions = extract_conditions(options)
@@ -1021,6 +1032,7 @@ module OrigenTesters::ATP
     def add_bin_description(node, number, description, options)
       @existing_bin_descriptions ||= { soft: {}, hard: {} }
       return node if @existing_bin_descriptions[options[:type]][number]
+
       @existing_bin_descriptions[options[:type]][number] = true
       name, *nodes = *node
       if nodes[0] && nodes[0].type == :volatile

data/lib/origen_testers/atp/flow_api.rb

@@ -58,6 +58,7 @@ module OrigenTesters::ATP
       unless options[:rule]
         fail 'You must supply option :rule (e.g. rule: :gt) when calling the limit helper'
       end
+
       {
         value:    value,
         rule:     options[:rule] || :lt,

data/lib/origen_testers/atp/parser.rb

@@ -1,18 +1,19 @@
 require 'sexpistol'
 module OrigenTesters::ATP
-  class Parser < Sexpistol
+  class Parser < Sexpistol::Parser
     def initialize
       # This accessor moves to Sexpistol::Parser in newer versions of the gem
-      self.ruby_keyword_literals = true
+      # self.ruby_keyword_literals = true
     end
 
     def string_to_ast(string)
-      to_sexp(parse_string(string))
+      # to_sexp(parse_string(string))
+      to_sexp(Sexpistol.parse(string, parse_ruby_keyword_literals: true))
     end
 
     def to_sexp(ast_array)
       children = ast_array.map do |item|
-        if  item.is_a?(Array)
+        if item.is_a?(Array)
           to_sexp(item)
         else
           item
@@ -20,6 +21,7 @@ module OrigenTesters::ATP
       end
       type = children.shift
       return type if type.is_a?(OrigenTesters::ATP::AST::Node)
+
       type = type.to_s.gsub('-', '_').to_sym
       OrigenTesters::ATP::AST::Node.new(type, children)
     end

data/lib/origen_testers/atp/processor.rb

@@ -57,6 +57,7 @@ module OrigenTesters::ATP
       unless @volatiles
         fail 'You must first call extract_volatiles(node) from your on_flow hander method'
       end
+
       @volatiles[:flags] || []
     end
 

data/lib/origen_testers/atp/processors/on_pass_fail_remover.rb

@@ -15,6 +15,7 @@ module OrigenTesters::ATP
           unless id
             fail 'Something has gone wrong, all nodes should have IDs by this point'
           end
+
           id = id.value
           nodes = [node]
           if on_fail && contains_anything_interesting?(on_fail)

data/lib/origen_testers/atp/processors/relationship.rb

@@ -51,7 +51,7 @@ module OrigenTesters::ATP
         end
         alias_method :on_unless_ran, :on_if_ran
 
-        def results
+        def results # rubocop:disable Lint/DuplicateMethods
           @results ||= {}.with_indifferent_access
         end
       end
@@ -107,9 +107,7 @@ module OrigenTesters::ATP
         if node.type == :group || node.type == :sub_flow
           nodes = node.to_a.dup
           pre_nodes = []
-          while [:name, :id, :path].include?(nodes.first.try(:type))
-            pre_nodes << nodes.shift
-          end
+          pre_nodes << nodes.shift while [:name, :id, :path].include?(nodes.first.try(:type))
           node.updated(nil, pre_nodes + [set_flag] + nodes)
 
         # For a test, set a flag immediately after the referenced test has executed

data/lib/origen_testers/atp/runner.rb

@@ -187,6 +187,7 @@ module OrigenTesters::ATP
       unless job
         fail 'Flow contains JOB-based conditions and no current JOB has been given!'
       end
+
       if state
         process_all(node) if jobs.include?(job)
       else

data/lib/origen_testers/callback_handlers.rb

@@ -23,6 +23,7 @@ module OrigenTesters
           # Found a .atp or .atp.gz file so we should compile it
           matches = Dir.glob("#{Origen.root}/**/#{patname}")
           fail "Found multiple locations for #{patname}, exiting...\n\t#{matches}" if matches.size > 1
+
           pattern = matches.first.to_s
           current_compiler = select_compiler
           run_compiler(current_compiler, pattern)

data/lib/origen_testers/charz/profile.rb

@@ -113,14 +113,14 @@ module OrigenTesters
       def gate_check(gates, gate_type)
         case gates
         when Symbol, String
-          return
+          nil
         when Array
           unknown_gates = gates.reject { |gate| [String, Symbol].include? gate.class }
           if unknown_gates.empty?
-            return
+            nil
           else
             Origen.log.error "Profile #{id}: Unknown #{gate_type} type(s) in #{gate_type} array."
-            Origen.log.error "Arrays must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq } were found in #{gates}"
+            Origen.log.error "Arrays must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq} were found in #{gates}"
             fail
           end
         when Hash
@@ -150,14 +150,14 @@ module OrigenTesters
         end
         case gates
         when Symbol, String
-          return
+          nil
         when Array
           unknown_gates = gates.reject { |gate| [String, Symbol].include? gate.class }
           if unknown_gates.empty?
-            return
+            nil
           else
             Origen.log.error "Profile #{id}: Unknown #{gate_type} type(s) in #{gate_type} array."
-            Origen.log.error "Arrays must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq } were found in #{gates}"
+            Origen.log.error "Arrays must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq} were found in #{gates}"
             fail
           end
         when Hash
@@ -173,7 +173,7 @@ module OrigenTesters
             gates = [gates] unless gates.is_a? Array
             unknown_gates = gates.reject { |gate| [String, Symbol].include? gate.class }
             unless unknown_gates.empty?
-              Origen.log.error "Gate array must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq } were found in #{gates}"
+              Origen.log.error "Gate array must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq} were found in #{gates}"
               fail
             end
           end

data/lib/origen_testers/charz/routines/search_routine.rb

@@ -30,6 +30,7 @@ module OrigenTesters
         end
 
         return if @attr_value_check == false
+
         if [@start, @stop, @res].all? { |attr| attr.is_a? Numeric }
           unless @res <= (@start - @stop).abs
             Origen.log.error "SearchRoutine #{@id}: Search resolution (#{@res}) is larger than the search range: #{(@start - @stop).abs}"

data/lib/origen_testers/charz/session.rb

@@ -73,7 +73,7 @@ module OrigenTesters
         end
       end
 
-      def current_instance(options = {})
+      def current_instance(options = {}) # rubocop:disable Lint/DuplicateMethods
         instance = @current_instance || instances.first
         if instance.nil? && @stored_instance
           unless options[:stored_instance_valid]

data/lib/origen_testers/charz.rb

@@ -26,30 +26,30 @@ module OrigenTesters
                   :eof_charz_tests, :skip_group_eof_charz_tests, :eof_charz_tests_group_name,
                   :default_valid_charz_placements
 
-    def charz_stack
+    def charz_stack # rubocop:disable Lint/DuplicateMethods
       @charz_stack ||= []
     end
 
-    def charz_profiles
+    def charz_profiles # rubocop:disable Lint/DuplicateMethods
       @charz_profiles ||= {}
     end
 
-    def charz_routines
+    def charz_routines # rubocop:disable Lint/DuplicateMethods
       @charz_routines ||= {}
     end
 
-    def charz_session
+    def charz_session # rubocop:disable Lint/DuplicateMethods
       @charz_session ||= Session.new
     end
 
-    def default_valid_charz_placements
+    def default_valid_charz_placements # rubocop:disable Lint/DuplicateMethods
       @default_valid_charz_placements ||= [:inline, :eof]
     end
 
     # If there is a current instance present, that should always be used. However when running EOF charz,
     # the instance to be used is no longer set, so instead of referencing the session, use the one that we've
     # stored already
-    def charz_instance
+    def charz_instance # rubocop:disable Lint/DuplicateMethods
       unless charz_session.current_instance(stored_instance_valid: true).nil?
         set_charz_instance(charz_session.current_instance(stored_instance_valid: true))
       end
@@ -61,7 +61,7 @@ module OrigenTesters
       charz_session.stored_instance = instance
     end
 
-    def eof_charz_tests
+    def eof_charz_tests # rubocop:disable Lint/DuplicateMethods
       @eof_charz_tests ||= []
     end
 
@@ -252,7 +252,11 @@ module OrigenTesters
           if charz_session.on_result?
             md5_id = Digest::MD5.new
             md5_id << parent_test_name.to_s
-            md5_id << options.to_s
+            # Use a deterministic string representation of options that is consistent
+            # across Ruby versions. Ruby 4.0 changed Hash#inspect to use "key: val"
+            # syntax instead of ":key=>val", which produces different MD5 digests.
+            # Explicitly build the old-style rocket format to keep IDs stable.
+            md5_id << ('{' + options.map { |k, v| "#{k.inspect}=>#{v.inspect}" }.join(', ') + '}')
             md5_id << charz_session.id.to_s
             options[:id] = "auto_charz_id_#{md5_id}".to_sym
           end
@@ -434,7 +438,7 @@ module OrigenTesters
             gated_routines = charz_instance.routines - ungated_routines
             # Build the proc which contains the nested if statements for each routine so they are anded.
             gated_routines.each do |routine|
-              my_proc = -> do
+              my_proc = lambda do
                 if_flag charz_instance.flags do
                   block.call(options.merge(current_routine: routine))
                 end
@@ -477,7 +481,7 @@ module OrigenTesters
             # Build the proc which contains the nested if statemements for each routine so they are anded.
             gated_routines = charz_instance.routines - ungated_routines
             gated_routines.each do |routine|
-              my_proc = -> do
+              my_proc = lambda do
                 if_enable charz_instance.enables do
                   block.call(options.merge(current_routine: routine))
                 end

data/lib/origen_testers/command_based_tester.rb

@@ -1,4 +1,3 @@
-
 module OrigenTesters
   # A base class that can be used to model command-based, rather than
   # vector-based testers.
@@ -35,7 +34,7 @@ module OrigenTesters
     end
 
     # Loop the content embedded in the supplied block
-    def loop(_name = nil, number_of_loops)
+    def loop(_name = nil, number_of_loops) # rubocop:disable Style/OptionalArguments
       number_of_loops.times do
         yield
       end

data/lib/origen_testers/decompiler/nodes.rb

@@ -117,7 +117,7 @@ module OrigenTesters
         alias_method :header, :pattern_header
         alias_method :comment_header, :pattern_header
 
-        def initialize(pattern_header: nil, comments: nil, context:)
+        def initialize(context:, pattern_header: nil, comments: nil)
           @pattern_header = pattern_header
           @comments = comments || []
 

data/lib/origen_testers/decompiler/pattern/enumerable_ext.rb

@@ -164,7 +164,7 @@ module OrigenTesters
             end
             vectors
           else
-            each_vector { |v| return v }
+            each_vector { |v| return v } # rubocop:disable Lint/UnreachableLoop
           end
         end
       end

data/lib/origen_testers/decompiler/pattern/splitter.rb

@@ -94,7 +94,6 @@ module OrigenTesters
         #    - Its possible (and fine) for endmatter to be non-existant, or even not allowed.
         #    - In the latter case, the endvector symbol should the EoF symbol.
         # @return (Hash)
-        # rubocop:disable Metrics/ParameterLists
         def split(pinlist_start:, vectors_start:, vectors_end:, vectors_include_start_line: false, vectors_include_end_line: false, &block)
           def check_match(matcher, line, index, indices)
             if matcher.respond_to?(:call)
@@ -158,7 +157,6 @@ module OrigenTesters
 
             indices
           end
-          # rubocop:enable Metrics/ParameterLists
         end
       end
     end

data/lib/origen_testers/decompiler/pattern.rb

@@ -177,6 +177,7 @@ module OrigenTesters
           if @first_vector.nil?
             fail OrigenTesters::Decompiler::ParseError, "Could not locate the first vector in pattern #{@source}"
           end
+
           @first_vector
         end
       end
@@ -249,7 +250,7 @@ module OrigenTesters
       def first_vector?
         first_vector
       rescue OrigenTesters::Decompiler::ParseError
-        return false
+        false
       end
 
       # Adds any pins in the decompiled pattern to the DUT which are not already present.

data/lib/origen_testers/flow.rb

@@ -244,12 +244,11 @@ module OrigenTesters
 
     def get_app(file)
       path = Pathname.new(file).dirname
-      until File.exist?(File.join(path, 'config/application.rb')) || path.root?
-        path = path.parent
-      end
+      path = path.parent until File.exist?(File.join(path, 'config/application.rb')) || path.root?
       if path.root?
         fail 'Something went wrong resoving the app root in OrigenTesters'
       end
+
       Origen.find_app_by_root(path)
     end
 

data/lib/origen_testers/generator/identity_map.rb

@@ -16,7 +16,7 @@ module OrigenTesters
       end
 
       def map_for(obj)
-        @store[obj.object_id]
+        @store[obj.object_id] # rubocop:disable Lint/HashCompareByIdentity
       end
     end
   end

data/lib/origen_testers/generator/test_numberer.rb

@@ -8,9 +8,7 @@ module OrigenTesters
       # @option options [Float] :range (1.26) The range parameter, see code formula
       # @option options [Integer] :offset (0) The o
       def test_number_for(test_name, options = {})
-        options = {
-
-        }.merge(options)
+        options = {}.merge(options)
       end
 
       private

data/lib/origen_testers/generator.rb

@@ -108,6 +108,7 @@ module OrigenTesters
       }.merge(options)
       # Allow generators to override this and fully define the filename if they want
       return fully_formatted_filename if try(:fully_formatted_filename)
+
       name = (@filename || Origen.file_handler.current_file.basename('.rb')).to_s
       name[0] = '' if name[0] == '_'
       if Origen.config.program_prefix
@@ -178,6 +179,7 @@ module OrigenTesters
 
     def write_from_template(options = {})
       return unless Origen.interface.write?
+
       options = {
         quiet:     false,
         skip_diff: false
@@ -192,7 +194,7 @@ module OrigenTesters
           @append = true
           Origen.file_handler.preserve_state do
             File.open(output_file, 'a') do |out|
-              content = compiler.insert(ERB.new(File.read(self.class::TEMPLATE), 0, Origen.config.erb_trim_mode).result(binding))
+              content = compiler.insert(ERB.new(File.read(self.class::TEMPLATE), trim_mode: Origen.config.erb_trim_mode).result(binding))
               out.puts content unless content.empty?
             end
           end
@@ -201,7 +203,7 @@ module OrigenTesters
           @append = false
           Origen.file_handler.preserve_state do
             File.open(output_file, 'w') do |out|
-              out.puts compiler.insert(ERB.new(File.read(self.class::TEMPLATE), 0, Origen.config.erb_trim_mode).result(binding))
+              out.puts compiler.insert(ERB.new(File.read(self.class::TEMPLATE), trim_mode: Origen.config.erb_trim_mode).result(binding))
             end
           end
           @@opened_files << output_file

data/lib/origen_testers/igxl_based_tester/base/ac_specsets.rb

@@ -46,7 +46,7 @@ module OrigenTesters
           case data
           when NilClass
             data_new = 0
-          when Fixnum, Float
+          when Integer, Float
             case
             when data == 0
               data_new = data.to_s

data/lib/origen_testers/igxl_based_tester/base/custom_test_instance.rb

@@ -106,7 +106,7 @@ module OrigenTesters
           end
           # Set the defaults
           self.class::TEST_INSTANCE_DEFAULTS.each do |k, v|
-            send("#{k}=", v) if self.respond_to?("#{k}=", v)
+            send("#{k}=", v) if respond_to?("#{k}=", v)
           end
           # Finally set any initial values that have been supplied
           options[:attrs].each do |k, v|

data/lib/origen_testers/igxl_based_tester/base/dc_specsets.rb

@@ -59,7 +59,7 @@ module OrigenTesters
           case data
           when NilClass
             data_new = 0
-          when Fixnum, Float
+          when Integer, Float
             case
             when data == 0
               data_new = data.to_s

data/lib/origen_testers/igxl_based_tester/base/edgesets.rb

@@ -20,7 +20,7 @@ module OrigenTesters
           esname = esname.to_sym unless esname.is_a? Symbol
           pin = pin.to_sym unless pin.is_a? Symbol
           @es.key?(esname) ? @es[esname].add_edge(pin, edge) : @es[esname] = platform::Edgeset.new(esname, pin, edge, options)
-          @es_sheet_pins = options[:es_sheet_pins] unless @es_sheet_pins
+          @es_sheet_pins ||= options[:es_sheet_pins]
           @es
         end