test_ids 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5ed0f63265007afb642078d96f8acd7362495c85
-  data.tar.gz: 748add426abaf38bdc4c8e3577736d28d97d09b0
+SHA256:
+  metadata.gz: ba6c6bb4a004e1483a4ac17a4eb142ec56de9642a78c6abe2909d6787083a1d5
+  data.tar.gz: 6eda1cc4e4e460e6eca95533df466bd06ac7a7e9d8dd239a4c3a7b532b3a7743
 SHA512:
-  metadata.gz: 9e5823734dc64272dd90f73196100e21434b3c9a5d05519929d90a2262712d99108a9cbf9efc378813307e1a8450f50ef4efdfb237ca07486de7d12b30738eb0
-  data.tar.gz: 73ffa02f9b035e7f94ba1ccd0eb91fef83cc115c8489884bac20221ff538137d84926d40d5c331eb01fb8684b399b3641468fa7f03147eab61c59939bbdf3344
+  metadata.gz: 8764b7fe72493a7b84594f42d03240770717dde6ec6c8f2cd5c43a2c3c4fd42a3fad100fa4512894c11330c8edf9a43427b82ef15c7079c6541cf03cf6c94ae1
+  data.tar.gz: 39c9f6b8acb3f820bd27e9e1eafe1be8b40a520517ea7bf9e2cbed60aa72cdbe1fffe572986926e8d8b00bc0b2d4bce76db76c4c63352c05e4816b79e5c4d478

data/config/shared_commands.rb

@@ -17,7 +17,7 @@ when "test_ids:clear", "test_ids:repair"
 else
   @plugin_commands << <<-EOT
  test_ids:rollback  Rollback the TestIds store to the given commit ID
- test_ids:clear     Clear the assignment database for bins, softbins, numbers or all
+ test_ids:clear     Clear the assignment database for bins, softbins, numbers, ranges or all for the given configuration database ID
  test_ids:repair    Repair the given database, see -h for more
   EOT
 

data/config/version.rb

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

data/lib/test_ids.rb

@@ -71,7 +71,8 @@ module TestIds
     # @api private
     def inject_flow_id(options)
       if Origen.interface_loaded?
-        options[:test_ids_flow_id] = Origen.interface.flow.id
+        flow = Origen.interface.flow
+        options[:test_ids_flow_id] = flow.try(:top_level).try(:id) || flow.id
       end
     end
 
@@ -128,6 +129,11 @@ module TestIds
       @configuration_id = id
     end
 
+    # Return an Array of configuration IDs
+    def configs
+      @configuration.ids
+    end
+
     def bin_config=(id)
       @bin_config = id
     end

data/lib/test_ids/allocator.rb

@@ -28,56 +28,69 @@ module TestIds
     # If a numeric number is passed to the softbin, it uses that number.
     # The configuration for the TestId plugin needs to pass in the bin number and the options from the test flow
     # For this method to work as intended.
-    def next_in_range(range, options)
-      range_item(range, options)
+    # This will handle the following range inputs:
+    #   - Range, Ex: 0..10
+    #   - Array, Ex: [0..10, 20..30]
+    def next_in_range(range_definition, options)
+      if range_definition.is_a?(Range)
+        range = range_definition.to_a
+      elsif range_definition.is_a?(Array)
+        range = []
+        range_definition.each do |range_element|
+          range += range_element.is_a?(Integer) ? [range_element] : range_element.step(options[:size]).to_a
+        end
+        if range.uniq.size != range.size
+          Origen.log.error "Duplicate or overlapping range has been detected in configuration: \'#{TestIds.current_configuration.id}\'."
+          fail
+        end
+      end
+      range_item(range, range_definition, options)
     end
 
-    def range_item(range, options)
-      orig_options = options.dup
-      # Now Check if the database (JSON file) exists.
-      # If file exists, load the database and create the alias for ['pointer']['ranges']
-      if file && File.exist?(file)
-        lines = File.readlines(file)
-        # Remove any header comment lines since these are not valid JSON
-        lines.shift while lines.first =~ /^\/\// && !lines.empty?
-        s = JSON.load(lines.join("\n"))
-        rangehash = s['pointers']['ranges']
-        rangehash = Hash[rangehash.map { |k, v| [k.to_sym, v] }]
+    def range_item(range, range_definition, options)
+      # This is the actual fix, it should now not be dependent on the json file being read in, instead the store pointers
+      # will be utilized to get the correct number assigned from the range.
+      if store['pointers']['ranges'].nil?
+        rangehash = {}
       else
-        # Create an alias for the databse that stores the pointers per range
-        rangehash = store['pointers']['ranges'] ||= {}
+        rangehash = store['pointers']['ranges']
+        rangehash = Hash[rangehash.map { |k, v| [k.to_sym, v] }]
       end
+      orig_options = options.dup
       # Check the database to see if the passed in range has already been included in the database hash
-      if rangehash.key?(:"#{range}")
+      if rangehash.key?(:"#{range_definition}")
         # Read out the database hash to see what the last_softbin given out was for that range.
         # This hash is updated whenever a new softbin is assigned, so it should have the updated values for each range.
-        previous_assigned_value = rangehash[:"#{range}"].to_i
+        previous_assigned_value = rangehash[:"#{range_definition}"].to_i
         # Now calculate the new pointer.
-        @pointer = previous_assigned_value - range.min
+        @pointer = range.index(previous_assigned_value) + 1
         # Check if the last_softbin given out is the same as the range[@pointer],
         # if so increment pointer by softbin size, default size is 1, config.softbins.size is configurable.
         # from example above, pointer was calculated as 1,range[1] is 10101 and is same as last_softbin, so pointer is incremented
         # and new value is assigned to the softbin.
-        if previous_assigned_value == range.to_a[@pointer]
+        if previous_assigned_value == range[@pointer]
           @pointer += options[:size]
-          assigned_value = range.to_a[@pointer]
+          assigned_value = range[@pointer]
         else
           # Because of the pointer calculations above, I don't think it will ever reach here, has not in my test cases so far!
-          assigned_value = range.to_a[@pointer]
+          assigned_value = range[@pointer]
         end
         # Now update the database pointers to point to the lastest assigned softbin for a given range.
-        rangehash.merge!(:"#{range}" => "#{range.to_a[@pointer]}")
+        rangehash.merge!(:"#{range_definition}" => "#{range[@pointer]}")
       else
         # This is the case for a brand new range that has not been passed before
         # We start from the first value as the assigned softbin and update the database to reflect.
         @pointer = 0
-        rangehash.merge!(:"#{range}" => "#{range.to_a[@pointer]}")
-        assigned_value = range.to_a[@pointer]
+        rangehash.merge!(:"#{range_definition}" => "#{range[@pointer]}")
+        assigned_value = range[@pointer]
       end
-      unless !assigned_value.nil? && assigned_value.between?(range.min, range.max)
+      unless !assigned_value.nil? && range.include?(assigned_value)
         Origen.log.error 'Assigned value not in range'
         fail
       end
+      # Since the assigned value for this test has now changed, update store to contain the newly assigned value
+      # so that when the json file is written, it contains the latest assigned value name.
+      store['pointers']['ranges'] = rangehash
       assigned_value
     end
 
@@ -283,7 +296,7 @@ module TestIds
       end
     end
 
-    # Clear the :bins, :softbins and/or :numbers by setting the options for each item to true
+    # Clear the :bins, :softbins and/or :numbers and/or :ranges by setting the options for each item
     def clear(options)
       if options[:softbin] || options[:softbins]
         store['assigned']['softbins'] = {}
@@ -303,6 +316,9 @@ module TestIds
         store['pointers']['numbers'] = nil
         store['references']['numbers'] = {}
       end
+      if options[:range] || options[:ranges]
+        store['pointers']['ranges'] = nil
+      end
     end
 
     # Saves the current allocator state to the repository

data/lib/test_ids/commands/clear.rb

@@ -18,6 +18,7 @@ Examples: origen test_ids:clear --bins                      # Clear the bins in
   opts.on('--bins', 'Clear the bin database') {  options[:bins] = true }
   opts.on('--softbins', 'Clear the softbin database') {  options[:softbins] = true }
   opts.on('--numbers', 'Clear the test number database') {  options[:numbers] = true }
+  opts.on('--ranges', 'Clear the ranges database') {  options[:ranges] = 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 }
   app_options.each do |app_option|
@@ -38,6 +39,11 @@ begin
   # Get the commit before the lock to give the user later
   rollback_id = git.repo.object('HEAD^').sha[0, 11]
   a = TestIds.load_allocator(ARGV.first)
+  if a.nil?
+    Origen.log.error "No configuration file could be found for file ID: '#{ARGV.first}'!"
+    Origen.log.warn 'By default, the correct ID to pass in will need to match the filename in the form: store_<file id>.json'
+    fail
+  end
   a.clear(options)
   a.save
 ensure

data/lib/test_ids/origen_testers/flow.rb

@@ -9,7 +9,7 @@ module OrigenTesters
     def test(instance, options = {})
       if TestIds.configured?
         unless options[:test_ids] == :notrack
-          options[:test_ids_flow_id] = id
+          options[:test_ids_flow_id] = try(:top_level).try(:id) || id
 
           TestIds.current_configuration.allocator.allocate(instance, options)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_ids
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.40
+        version: 0.57.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.40
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
   name: origen_testers
   requirement: !ruby/object:Gem::Requirement
@@ -100,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Origen plugin to assign and track test program bins and test numbers