gcslock 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1068b280fd4e77bb1270880eaa80aa0145d64f35d58121329e8500ecc2321948
-  data.tar.gz: 33b5f11756a7c89f55384730322fd43aebcc810dff452c4cbf13bb05f2920aea
+  metadata.gz: 1d0120bfbfe6842595ebbdcdb1108937c61ee4e04ea71214ae0027b0ed0e68e1
+  data.tar.gz: 6002bf7b00837cf7685400909d550104ced2fc6b99fe22097589c6fde59b6ae7
 SHA512:
-  metadata.gz: de5e846755a1c556d263b6af0806b6e102bbd4c474aad7513aa3df8d84d6a8e1afb56b35cc3006e52f76508eac3bc691b5776175142f0e3d1cd9a0fb68ad40fa
-  data.tar.gz: fc5c9318fcdabb46acff6b89b54c9967ed13749c8cda75cc78699d063f233135a126013874667adc4e300c4975d82ad8da0971f1a972aed23ae01fdf236001b7
+  metadata.gz: 3bea490c78bb1e57788500046967379c4f69862e7b49c03eae367547233b811671c0316152ff231d643dbd70378775af3786d292a4d0c7d557fa3b34e53986f2
+  data.tar.gz: 9388122c6c3a2c3db1250177f4e75dc040de63cb5d0a9f839533a4bb02d7d2d9a143eec0e415466880267b0ed04a770c1437f012bb6c1aa564b4ce31c0ebca8d

data/gcslock.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0'
 
   spec.add_runtime_dependency 'google-api-client'
-  spec.add_runtime_dependency 'google-cloud-storage', '~> 1.26.1'
+  spec.add_runtime_dependency 'google-cloud-storage', '>= 1.24.0'
 
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'codecov'

data/lib/gcslock/mutex.rb

@@ -21,18 +21,21 @@ module GCSLock
       raise LockAlreadyOwnedError, "Mutex for #{@object.name} is already owned by this process" if owned?
 
       backoff = @min_backoff
-      waited = 0.0 unless timeout.nil?
+
+      now = Time.now
+      end_time = now + timeout unless timeout.nil?
 
       loop do
         return true if try_lock
-        break if !timeout.nil? && waited + backoff > timeout
+        break if !timeout.nil? && now + backoff >= end_time
         sleep(backoff)
 
         backoff_opts = [@max_backoff, backoff * 2]
 
         unless timeout.nil?
-          waited += backoff
-          backoff_opts.push(timeout - waited) if timeout > waited
+          now = Time.now
+          diff = end_time - now
+          backoff_opts.push(diff) if diff > 0
         end
 
         backoff = backoff_opts.min
@@ -45,6 +48,8 @@ module GCSLock
     def locked?
       @object.reload!
       @object.exists?
+    rescue Google::Cloud::NotFoundError
+      false
     end
 
     # Returns `true` if this lock is currently held by current thread.

data/lib/gcslock/version.rb

@@ -1,3 +1,3 @@
 module GCSLock
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/spec/gcslock/mutex_spec.rb

@@ -83,8 +83,8 @@ describe GCSLock::Mutex do
 
       it 'sleeps just the time needed to retry once at the end' do
         expect(@mutex).to receive(:owned?).once.and_return(false)
-        expect(@mutex).to receive(:sleep).exactly(2).times
-        expect(@mutex).to receive(:try_lock).exactly(3).times.and_return(false)
+        expect(@mutex).to receive(:sleep).at_least(2).times
+        expect(@mutex).to receive(:try_lock).at_least(3).times.and_return(false)
 
         expect do
           @mutex.lock(timeout: 0.03)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcslock
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Raphaël Beamonte
@@ -28,16 +28,16 @@ dependencies:
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.26.1
+        version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.26.1
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement