futex 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e19f93d6754a7535a3a7824b2ba55aa6fb8fcf00e63b04011af936865e26895f
-  data.tar.gz: da61f106a45c5da30d76891f88f3adf389c1610c852604326b3d182eadfe1215
+  metadata.gz: 6fe725623e9222ab65747891baf33b18b02aa14b4b9839386b14b9b40689d677
+  data.tar.gz: a56328499e4fe088514b7c4bd6c8cd79165c58f7e18ce40e12db9997e9ac580b
 SHA512:
-  metadata.gz: d1adb27a04e721ff4ba1356afd44e19731b7193938b4fba03805eab9722c1b986a20bd4e5f0343de3f685e71b95b0d4e94f34213a49007839fc4243090cc87a0
-  data.tar.gz: 29748f308f7790b67d3e33cf1827bcaea200a2b2a9f7aa977db77f08e289176fc5f65b9927ef5f88309559f59886a414bc12a0988cc0a40a236ba52edc674cc5
+  metadata.gz: 8bd6f3ced41b81b3e91489e09c7e796e45b6633181d520d3cf0912f7a69c28568ab3320a3007eb58210e00eb1396a72966f79050fb7ce09a13accde44d8ab2b6
+  data.tar.gz: '091d37893523574dbb618c6ee55e9721b1e042732e87a318bd50ae2613b3dd0252aedf8ee8ecd7e48c2a24a4f0ce6b7d44edbe93cbd66a77d7041cfd90424bcd'

data/futex.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.3.3'
   s.required_ruby_version = '>=2.3'
   s.name = 'futex'
-  s.version = '0.4.0'
+  s.version = '0.4.1'
   s.license = 'MIT'
   s.summary = 'File-based mutex'
   s.description = 'Ruby Gem for file-based locking'

data/lib/futex.rb

@@ -77,28 +77,33 @@ class Futex
         sleep(@sleep)
         cycle += 1
         if Time.now - start > @timeout
-          raise "##{Process.pid}/#{Thread.current.name} can't get \
-exclusive access to the file #{@path} \
+          raise "#{badge} can't get exclusive access to the file #{@path} \
 because of the lock at #{@lock}, after #{age(start)} \
 of waiting: #{IO.read(@lock)}"
         end
         if (cycle % step).zero? && Time.now - start > @timeout / 2
-          debug("##{Process.pid}/#{Thread.current.name} still waiting for \
+          debug("#{badge} still waiting for \
 exclusive access to #{@path}, #{age(start)} already: #{IO.read(@lock)}")
         end
       end
-      debug("Locked by \"#{Thread.current.name}\" in #{age(start)}: #{@path} \
+      debug("Locked by #{badge} in #{age(start)}: #{@path} \
 (attempt no.#{cycle})")
-      File.write(@lock, "##{Process.pid}/#{Thread.current.name}")
+      File.write(@lock, badge)
       acq = Time.now
       res = yield(@path)
-      debug("Unlocked by \"#{Thread.current.name}\" in #{age(acq)}: #{@path}")
+      debug("Unlocked by #{badge} in #{age(acq)}: #{@path}")
       res
     end
   end
 
   private
 
+  def badge
+    tname = Thread.current.name
+    tname = 'nil' if tname.nil?
+    "##{Process.pid}/#{tname}"
+  end
+
   def age(time)
     "#{((Time.now - time) * 1000).round}ms"
   end

data/test/test_futex.rb

@@ -61,6 +61,24 @@ class FutexTest < Minitest::Test
     end
   end
 
+  def test_raises_if_cant_lock
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, 'the/simple/file.txt')
+      Thread.start do
+        Futex.new(path).open do
+          sleep 10
+        end
+      end
+      sleep 0.1
+      ex = assert_raises do
+        Futex.new(path, timeout: 0.1).open do |f|
+          # Will never reach this point
+        end
+      end
+      assert(ex.message.include?('can\'t get exclusive access to the file'), ex)
+    end
+  end
+
   def test_non_exclusive_locking
     Dir.mktmpdir do |dir|
       path = File.join(dir, 'g/e/f/file.txt')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futex
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest