test_ids 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f16ab991fee6b16b9640382bb36fc0bbb81e0c0
-  data.tar.gz: a79646e3ea535182a52daf40ae2e34b2ab126adc
+  metadata.gz: 333cf3d2877e4d220e499aa547b36fd6ac1a2dfd
+  data.tar.gz: 7496da027e3af1bce07da44b758defb8728a69a7
 SHA512:
-  metadata.gz: 3d66abb08e4d2bb1a924c4b18e20ca1510871b44e37adbcfb45ed8a5bcdc93dc1116c8102f60dfce4d8213ef3c9df9f8f24d3cbdbaea48e5b5631cb2699c1063
-  data.tar.gz: 1c69d4f165eeee47f8b805c60fea5ddca65f5e7534184bc29fabeb87f81b425005e8d28b993136a1138bdb449b7aeee5eb6403a9f2197fe9535f0a85da4d56fd
+  metadata.gz: a1068bd75d742a715d124da120a60fc5895cf59eda4bc515e2d42cc0b290be0422d93d55daf1622f50fe81b330d762536a904032fb3a306355a3895e85373127
+  data.tar.gz: d8298a548247fd3519f30335ff42253a20a6cc8476598a54c994888200655a6a1154333430bdd2867d054bc34c24fcd1da5fdc9ce241a78d39882790cc1c37d5

data/config/version.rb

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

data/lib/test_ids/git.rb

@@ -47,7 +47,7 @@ module TestIds
         release_lock
         repo.add  # Checkin everything
         repo.commit('Publishing latest store')
-        repo.push('origin')
+        repo.push('origin', 'master', force: true)
       end
     end
 
@@ -87,7 +87,8 @@ module TestIds
     def available_to_lock?
       result = false
       Origen.profile 'Checking for lock' do
-        repo.pull
+        repo.fetch
+        repo.reset_hard
         if lock_content && lock_user && lock_user != User.current.name
           result = Time.now.to_f > lock_expires
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_ids
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-12-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.25
+        version: 0.7.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.25
+        version: 0.7.40
 - !ruby/object:Gem::Dependency
   name: origen_testers
   requirement: !ruby/object:Gem::Requirement