test_ids 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2715a10e5e999b8e7cb1d8240803232fadf178139e64a2f44186d69b65602a15
-  data.tar.gz: 2b550ced04afc190362992970a7cfaeb76e7ba78d519894ebdeb04391cd3b721
+  metadata.gz: c45579faaf12aa3964acd4caa219e9b3443c366d2186870a5ea86381376dbeae
+  data.tar.gz: 1cb178416379a578fa91c472ce7e4d22521a428bfc40d400ea52127b10dd1c8e
 SHA512:
-  metadata.gz: 4d62fc377c3bcbd5e840ed16c17e3749d7611f95e89eee17fe4bfa5ae7b572e6db8f12bf6016393f103e3dc2c59363205b5c90ad8ad999d43d87ba52017fd349
-  data.tar.gz: dfe969df5389777ea3545f506b78046b0d5596d49fc37890b7eab748329337ee955050ed6756c0977d22420408b6329c1dcaab1f400e0d8ef744c386bd197f13
+  metadata.gz: cc9951b84d9f7754d3225461157b6cd7579e6745c22ec8de0bb60ab91bc51d9f48ffdecf2c136329506fde707df173ba8e238233190e4236b62793beef92c06c
+  data.tar.gz: a04f02f1207e4599a3c0cb5d986b4e28741206afaf64e530b9d47dd86849b2c4a322e1a6c35e45284d727731d2bd592b4a5f4306b9eade6ccde0087062e01272

data/config/version.rb

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

data/lib/test_ids/allocator.rb

@@ -28,11 +28,26 @@ 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)
+    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?
@@ -43,33 +58,33 @@ module TestIds
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_ids
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-11-24 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