test_ids 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb082e87d6a2fe94daeb06ca7afe3666bab6b9b0
-  data.tar.gz: c6ea82a1417478b63413bf51e7cd58bfca6fe828
+  metadata.gz: afcff07db00bb24f204b83bb988a98630d623642
+  data.tar.gz: 7b396dc69641b9375d45ca513709376a40ffe7e9
 SHA512:
-  metadata.gz: a24cabcbdf2d02a3ac2f9f0a3575ea0c211939f560ac0f2df4cc14ef9d43c043793fd4a3aaeb248e5f5102fdaf9a54b34a451084820088e5d0722ba67ef868c9
-  data.tar.gz: 08095b4eaeba91a616ff7cbbccfe1f610ab5e3ea6e9ed6fcdbdb8217e82f32c4eaa72a96a545cc1b166fcfcf155c7dc16d9687e93065c7624b76903022d344ff
+  metadata.gz: b940f125fb2e81190a0699a1b9ca9d4566bfc8e3b3b370ecaac57e955175008616f73b6336bcff841295a8a379c5e562c0ed192fb91ee82574df1fb0bbdf94d7
+  data.tar.gz: 22eda1e5968da45e985035a3e0a539a8dc0a2396eb7d5da43013d958849d90f98f0f591abc1e6b9681a92817ac524361c58718bdf1b3ee0ea9a2799013704b17

data/config/application.rb

@@ -36,6 +36,10 @@ class TestIdsApplication < Origen::Application
     #files: ["lib", "config/application.rb"],
   }
 
+  config.shared = {
+    command_launcher: "config/shared_commands.rb"
+  }
+
   config.semantically_version = true
 
   # An example of how to set application specific LSF parameters

data/config/shared_commands.rb

@@ -0,0 +1,16 @@
+# The requested command is passed in here as @command
+case @command
+
+when "test_ids:rollback"
+  if ARGV[0]
+    TestIds::Git.rollback(ARGV[0])
+  else
+    puts "You must supply a commit ID to rollback to, e.g. origen test_ids:rollback 456ac3f53"
+  end
+  exit 0
+else
+  @plugin_commands << <<-EOT
+ test_ids:rollback  Rollback the TestIds store to the given commit ID
+  EOT
+
+end

data/config/version.rb

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

data/lib/test_ids/allocator.rb

@@ -22,7 +22,7 @@ module TestIds
       t = store['tests'][name]
       # If the user has supplied any of these, that number should be used
       # and reserved so that it is not automatically generated later
-      if options[:bin]
+      if options[:bin] && options[:bin].is_a?(Numeric)
         t['bin'] = options[:bin]
         store['manually_assigned']['bin'][options[:bin].to_s] = true
       # Regenerate the bin if the original allocation has since been applied
@@ -33,7 +33,7 @@ module TestIds
         t['softbin'] = nil if config.softbins.function?
         t['number'] = nil if config.numbers.function?
       end
-      if options[:softbin]
+      if options[:softbin] && options[:softbin].is_a?(Numeric)
         t['softbin'] = options[:softbin]
         store['manually_assigned']['softbin'][options[:softbin].to_s] = true
       elsif store['manually_assigned']['softbin'][t['softbin'].to_s]
@@ -41,7 +41,7 @@ module TestIds
         # Also regenerate the number as it could be a function of the softbin
         t['number'] = nil if config.numbers.function?
       end
-      if options[:number]
+      if options[:number] && options[:number].is_a?(Numeric)
         t['number'] = options[:number]
         store['manually_assigned']['number'][options[:number].to_s] = true
       elsif store['manually_assigned']['number'][t['number'].to_s]
@@ -51,19 +51,16 @@ module TestIds
       t['bin'] ||= allocate_bin
       t['softbin'] ||= allocate_softbin(t['bin'])
       t['number'] ||= allocate_number(t['bin'], t['softbin'])
-      t['bin'] = nil if t['bin'] == :none
-      t['softbin'] = nil if t['softbin'] == :none
-      t['number'] = nil if t['number'] == :none
       # Record that there has been a reference to the final numbers
       time = Time.now.to_f
-      store['references']['bin'][t['bin'].to_s] = time if t['bin']
-      store['references']['softbin'][t['softbin'].to_s] = time if t['softbin']
-      store['references']['number'][t['number'].to_s] = time if t['number']
+      store['references']['bin'][t['bin'].to_s] = time if t['bin'] && options[:bin] != :none
+      store['references']['softbin'][t['softbin'].to_s] = time if t['softbin'] && options[:softbin] != :none
+      store['references']['number'][t['number'].to_s] = time if t['number'] && options[:number] != :none
       # Update the supplied options hash that will be forwarded to the
       # program generator
-      options[:bin] = t['bin']
-      options[:softbin] = t['softbin']
-      options[:number] = t['number']
+      options[:bin] = t['bin'] unless options.delete(:bin) == :none
+      options[:softbin] = t['softbin'] unless options.delete(:softbin) == :none
+      options[:number] = t['number'] unless options.delete(:number) == :none
       options
     end
 

data/lib/test_ids/git.rb

@@ -10,8 +10,66 @@ module TestIds
   #
   # An instance of this class is instantiated as TestIds.git
   class Git
+    include Origen::Utility::InputCapture
+
     attr_reader :repo, :local
 
+    class Rollback
+      include Origen::Utility::InputCapture
+
+      def initialize(id)
+        repos = Dir.glob("#{Origen.app.imports_dir}/test_ids/*.git")
+        if repos.size == 0
+          puts 'No TestIds repositories were found in this application'
+        elsif repos.size > 1
+          puts
+          puts 'Multiple TestIDs repositories found, select the one to rollback:'
+          puts
+          repos.each_with_index do |repo, i|
+            puts "  #{i} - #{Pathname.new(repo).basename}"
+          end
+          accept = repos.map.with_index { |r, i| i }
+          puts
+          selection = repos.size + 1
+          until repos[selection]
+            selection = get_text(single: true, accept: accept).to_i
+          end
+        else
+          selection = 0
+        end
+        name = Pathname.new(repos[selection]).basename.to_s
+        repo = ::Git.open(repos[selection])
+        begin
+          commit = repo.object(id)
+        rescue ::Git::GitExecuteError
+          puts 'The given commit ID cannot be found in that repository'
+          exit
+        end
+        day = 24 * 60 * 60
+        if commit.date < Time.now - (7 * day)
+          puts "Sorry, that commit is more than a week old and I'm too scared to rollback that far."
+          puts 'You will need to do that manually if you must.'
+          exit
+        end
+        puts
+        puts "About to rollback the TestIds repository #{name} to commit #{id}."
+        puts
+        puts 'This will permanently delete any IDs assigned by anyone, anywhere, since that commit.'
+        puts
+        puts 'ARE YOU SURE YOU KNOW WHAT YOU ARE DOING?'
+        puts
+        get_text(confirm: true, default: 'no')
+        repo.reset_hard(id)
+        repo.push('origin', 'master', force: true)
+        puts 'As you wish, rolled back successfully!'
+      end
+    end
+
+    def self.rollback(id)
+      # Implemented as a class as a hack to get access to InputCapture
+      Rollback.new(id)
+    end
+
     def initialize(options)
       unless File.exist?("#{options[:local]}/.git")
         FileUtils.rm_rf(options[:local]) if File.exist?(options[:local])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_ids
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -62,6 +62,7 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/commands.rb
+- config/shared_commands.rb
 - config/version.rb
 - lib/tasks/test_ids.rake
 - lib/test_ids.rb