test_ids 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99c0a18269234a91b27a3e0329047c5e5a4cbe50ef28679f1f1e81192a845341
-  data.tar.gz: 469135ba4071b217135f24f431f60dc9e3bd9730942c957543d9cbd83eed5543
+  metadata.gz: 3cc056bd639bd5288a0ed73842d5790de1beaf2d8ef53aefe004376fd2647ca2
+  data.tar.gz: 75ee0869b2c5d8a9e0e0ec75d9125bd8ad5286a1490af80e95ddcd986874b12e
 SHA512:
-  metadata.gz: 2d5a6d61c38b447d3895ca50357b8cc63241067e11c4582ecb166a0a5c7cf6439c54b8025abff91412c041b968518741eadfd176904e92c1e4db45326d9af9d4
-  data.tar.gz: cbf61dfc565216d1aa44ca6bc8f882647888782da5bf4f41a97d34af3015d61629643e4fc37e99ef00b4e52baf1b1d814dcd3ec6a472296060c23aa7702a49cc
+  metadata.gz: ca98189aaf0d39ba9b4f7acac86354e5f6afa2c537dc3e6f70ebcce6413e607aeca2ed722f548c761432306729163c1b893ca4a10bbf2b711b217cd2418bfc58
+  data.tar.gz: 86b3b1023d650d963adf0cc4998dda002bec9bd925b4ac20e414f4215a765101ca7c8e5a8dfd84024eec4808e17fb61ca425a150218357955c622dc5d22d0bfc

data/config/application.rb

@@ -83,7 +83,7 @@ class TestIdsApplication < Origen::Application
       puts "All tests passing, proceeding with release process!"
     end
   end
-
+  
   # To enabled source-less pattern generation create a class (for example PatternDispatcher)
   # to generate the pattern. This should return false if the requested pattern has been
   # dispatched, otherwise Origen will proceed with looking up a pattern source as normal.

data/config/version.rb

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

data/lib/test_ids/git.rb

@@ -50,26 +50,28 @@ module TestIds
     end
 
     def initialize(options)
-      unless File.exist?("#{options[:local]}/.git")
-        FileUtils.rm_rf(options[:local]) if File.exist?(options[:local])
-        FileUtils.mkdir_p(options[:local])
-        Dir.chdir options[:local] do
-          `git clone #{options[:remote]} .`
-          unless File.exist?('lock.json')
-            # Should really try to use the Git driver for this
-            exec 'touch lock.json'
-            exec 'git add lock.json'
-            exec 'git commit -m "Initial commit"'
-            exec 'git push'
+      if !(TestIds.lsf_manual_init_shutdown) && Origen.running_locally?
+        unless File.exist?("#{options[:local]}/.git")
+          FileUtils.rm_rf(options[:local]) if File.exist?(options[:local])
+          FileUtils.mkdir_p(options[:local])
+          Dir.chdir options[:local] do
+            `git clone #{options[:remote]} .`
+            unless File.exist?('lock.json')
+              # Should really try to use the Git driver for this
+              exec 'touch lock.json'
+              exec 'git add lock.json'
+              exec 'git commit -m "Initial commit"'
+              exec 'git push'
+            end
           end
         end
+        @local = options[:local]
+        @repo = ::Git.open(options[:local])
+        # Get rid of any local edits coming in here, this is only called once at the start
+        # of the program generation run.
+        # No need to pull latest as that will be done when we obtain a lock.
+        @repo.reset_hard
       end
-      @local = options[:local]
-      @repo = ::Git.open(options[:local])
-      # Get rid of any local edits coming in here, this is only called once at the start
-      # of the program generation run.
-      # No need to pull latest as that will be done when we obtain a lock.
-      @repo.reset_hard
     end
 
     # Roll the repo back to the given commit ID
@@ -108,11 +110,13 @@ module TestIds
     end
 
     def publish
-      Origen.profile 'Publishing the test IDs store' do
-        release_lock
-        repo.add  # Checkin everything
-        repo.commit('Publishing latest store')
-        repo.push('origin', 'master', force: true)
+      if !(TestIds.lsf_manual_init_shutdown) && Origen.running_locally?
+        Origen.profile 'Publishing the test IDs store' do
+          release_lock
+          repo.add  # Checkin everything
+          repo.commit('Publishing latest store')
+          repo.push('origin', 'master', force: true)
+        end
       end
     end
 
@@ -124,23 +128,25 @@ module TestIds
     end
 
     def get_lock
-      return if @lock_open
-      Origen.profile 'Obtaining test IDs lock' do
-        until available_to_lock?
-          puts
-          puts "Waiting for lock, currently locked by #{lock_user} (the lock will expire in less than #{lock_minutes_remaining} #{'minute'.pluralize(lock_minutes_remaining)} if not released before that)"
-          puts
-          sleep 5
+      if !(TestIds.lsf_manual_init_shutdown) && Origen.running_locally?
+        return if @lock_open
+        Origen.profile 'Obtaining test IDs lock' do
+          until available_to_lock?(@repo)
+            puts
+            puts "Waiting for lock, currently locked by #{lock_user} (the lock will expire in less than #{lock_minutes_remaining} #{'minute'.pluralize(lock_minutes_remaining)} if not released before that)"
+            puts
+            sleep 5
+          end
+          data = {
+            'user'    => User.current.name,
+            'expires' => (Time.now + minutes(5)).to_f
+          }
+          write('lock.json', JSON.pretty_generate(data))
+          repo.commit('Obtaining lock')
+          repo.push('origin')
         end
-        data = {
-          'user'    => User.current.name,
-          'expires' => (Time.now + minutes(5)).to_f
-        }
-        write('lock.json', JSON.pretty_generate(data))
-        repo.commit('Obtaining lock')
-        repo.push('origin')
+        @lock_open = true
       end
-      @lock_open = true
     end
 
     def release_lock
@@ -151,11 +157,11 @@ module TestIds
       write('lock.json', JSON.pretty_generate(data))
     end
 
-    def available_to_lock?
+    def available_to_lock?(repo_to_use)
       result = false
       Origen.profile 'Checking for lock' do
-        repo.fetch
-        repo.reset_hard('origin/master')
+        repo_to_use.fetch
+        repo_to_use.reset_hard('origin/master')
         if lock_content && lock_user && lock_user != User.current.name
           result = Time.now.to_f > lock_expires
         else

data/lib/test_ids.rb

@@ -239,10 +239,78 @@ module TestIds
       @publish = val ? :save : :dont_save
     end
 
+    def lsf_manual_init_shutdown
+      if @lsf_manual_init_shutdown
+        true
+      end
+      false
+    end
+
     def next_in_range(range, options)
       current_configuration.allocator.next_in_range(range, options)
     end
 
+    def lsf_init(git_repo, lsf_publish)
+      @lsf_manual_init_shutdown = true
+      local_var_git_database_dir = "#{Origen.app.imports_directory}/test_ids/#{Pathname.new(git_repo).basename}"
+      FileUtils.mkdir_p(local_var_git_database_dir)
+      unless File.exist?("#{local_var_git_database_dir}/.git")
+        FileUtils.rm_rf(local_var_git_database_dir) if File.exist?(local_var_git_database_dir)
+        FileUtils.mkdir_p(local_var_git_database_dir)
+        Dir.chdir local_var_git_database_dir do
+          `git clone #{git_repo} .`
+          unless File.exist?('lock.json')
+            # Should really try to use the Git driver for this
+            exec 'touch lock.json'
+            exec 'git add lock.json'
+            exec 'git commit -m "Initial commit"'
+            exec 'git push'
+          end
+        end
+      end
+      @local = local_var_git_database_dir
+      @repo = ::Git.open(local_var_git_database_dir)
+      # Get rid of any local edits coming in here, this is only called once at the start
+      # of the program generation run.
+      # No need to pull latest as that will be done when we obtain a lock.
+      @repo.reset_hard
+      @git = Git.new(local: local_var_git_database_dir, remote: @repo)
+      if lsf_publish
+        return if @lock_open
+        Origen.profile 'Obtaining test IDs lock' do
+          until @git.available_to_lock?(@repo)
+            puts
+            puts "Waiting for lock, currently locked by #{@git.lock_user} (the lock will expire in less than #{@git.lock_minutes_remaining} #{'minute'.pluralize(@git.lock_minutes_remaining)} if not released before that)"
+            puts
+            sleep 5
+          end
+          data = {
+            'user'    => User.current.name,
+            'expires' => (Time.now + @git.minutes(5)).to_f
+          }
+          @git.write('lock.json', JSON.pretty_generate(data))
+          repo.commit('Obtaining lock')
+          repo.push('origin')
+        end
+        @lock_open = true
+      end
+    end
+
+    def lsf_shutdown(lsf_publish)
+      if lsf_publish
+        Origen.profile 'Publishing the test IDs store' do
+          data = {
+            'user'    => nil,
+            'expires' => nil
+          }
+          @git.write('lock.json', JSON.pretty_generate(data))
+          repo.add  # Checkin everything
+          repo.commit('Publishing latest store')
+          repo.push('origin', 'master', force: true)
+        end
+      end
+    end
+
     ## When set to true, all numbers generated will be checked to see if they comply
     ## with the current configuration, and if not they will be re-assigned based on the
     ## current configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_ids
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.31
 signing_key: 
 specification_version: 4
 summary: Origen plugin to assign and track test program bins and test numbers