test_ids 1.1.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306a202dcc8ef6fc823e3f3429e9466674c4a26442a4cb3a10f4ac15b8c8eb9d
-  data.tar.gz: c20808121f1887cca29eae01ea100f1026a8782dfee389fc5c4600bf23a7e606
+  metadata.gz: 99c0a18269234a91b27a3e0329047c5e5a4cbe50ef28679f1f1e81192a845341
+  data.tar.gz: 469135ba4071b217135f24f431f60dc9e3bd9730942c957543d9cbd83eed5543
 SHA512:
-  metadata.gz: f86d3e0ace61cf2f6f7a0f66b779b6606b7dc474456ced944c6e1a527a9045a364ebb53048a4b29b57da89f15f0d2619c843a61d6339231842131f83d34ee91e
-  data.tar.gz: 5806f010b4dfa01e6084298ea57994881689a6df815f1235ccd5116b4cf9771dc453fd1fe518d9fa4930a949fcc34da54965286278d3a862908e0281be660c2d
+  metadata.gz: 2d5a6d61c38b447d3895ca50357b8cc63241067e11c4582ecb166a0a5c7cf6439c54b8025abff91412c041b968518741eadfd176904e92c1e4db45326d9af9d4
+  data.tar.gz: cbf61dfc565216d1aa44ca6bc8f882647888782da5bf4f41a97d34af3015d61629643e4fc37e99ef00b4e52baf1b1d814dcd3ec6a472296060c23aa7702a49cc

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 = 1
-  BUGFIX = 1
+  MINOR = 2
+  BUGFIX = 2
   DEV = nil
-
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
 end

data/lib/test_ids.rb

@@ -257,6 +257,24 @@ module TestIds
     #  @reallocate_non_compliant = val
     # end
 
+    # Reset everything related to the TestIds module
+    # only needed for cases where running several targets
+    # back to back, e.g. for regression testing
+    def reset_everything(are_you_sure: false)
+      if are_you_sure
+        @repo = nil   # accessor
+        @git = nil   # accessor
+        @git_database_dir = nil
+        @git_initialized = nil
+        @configuration = nil
+        @configuration_id = nil
+        @bin_config = nil
+        @softbin_config = nil
+        @number_config = nil
+        @publish = nil
+      end
+    end
+
     private
 
     def on_origen_shutdown

data/lib/test_ids/allocator.rb

@@ -28,60 +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']
-        if rangehash.nil?
-          rangehash = store['pointers']['ranges'] ||= {}
-        else
-          rangehash = Hash[rangehash.map { |k, v| [k.to_sym, v] }]
-        end
+    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
 
@@ -287,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'] = {}
@@ -307,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_ids
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,42 @@ 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: dentaku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: origen_testers
   requirement: !ruby/object:Gem::Requirement
@@ -100,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Origen plugin to assign and track test program bins and test numbers