futex 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047a5eec58f0138706f3e1ae934cccde006f2106a42859f6f0fce0371b7459fc
-  data.tar.gz: 9bd6d01c2f45511ede96555fa20b0cf0d7426873cfef1a0a4ac645d78f6d38a8
+  metadata.gz: 92dabfba9a9b06fbe28ef35bc6add8eab32cb2720c4369b40bc2e491c6c3a6a0
+  data.tar.gz: 2a52f78833399ba74f218fcd9ab370703d781f455fd44500f8f3639ff6c2294a
 SHA512:
-  metadata.gz: a959ddda978d3dc620b3dbcc5c2e780b6d47d1a9803a1c8aa4220037c7dca3319a703c5341b0f79407611ef775094f46f4fe9a5a6686a91ecb5867d1309c3929
-  data.tar.gz: b3e53ad7e41c7c04554930515f49d1acd912f07f8103554fd399e299cbb31164e960f3e5531be8408ce93d9eecf8facfa92ebb1d5cc8895bae8120e6a4b94937
+  metadata.gz: ce76e8fc437c55952863c2509fd1c448577419542d9cec5d4c540545d8148ad3504d084b5488599633e8653d3060e84f64dab371ee8bd3e320fb97be6ae77062
+  data.tar.gz: 61896f299d5ab8b93bf066f7868a6ac67a68357d1e0fc5589b9aaffb8634b5fe46b114e9a0ab97d290c6aaec85b4250534fd632d10a3d770e3e51ad6e302be7f

data/.rubocop.yml

@@ -9,7 +9,7 @@ Layout/MultilineMethodCallIndentation:
 Metrics/AbcSize:
   Max: 50
 Metrics/MethodLength:
-  Max: 30
+  Max: 40
 Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/PerceivedComplexity:

data/appveyor.yml

@@ -15,18 +15,7 @@ environment:
 install:
   - ps: |
       $Env:PATH = "C:\Ruby${Env:ruby_version}\bin;${Env:PATH}"
-      if ($Env:ruby_version -match "^23" ) {
-        # RubyInstaller; download OpenSSL headers from OpenKnapsack Project
-        $Env:openssl_dir = "C:\Ruby${Env:ruby_version}"
-        appveyor DownloadFile http://dl.bintray.com/oneclick/OpenKnapsack/x64/openssl-1.0.2j-x64-windows.tar.lzma
-        7z e openssl-1.0.2j-x64-windows.tar.lzma
-        7z x -y -oC:\Ruby${Env:ruby_version} openssl-1.0.2j-x64-windows.tar
-      } else {
-        # RubyInstaller2; openssl package seems to be installed already
-        $Env:openssl_dir = "C:\msys64\mingw64"
-      }
   - bundle config --local path vendor/bundle
-  - bundle config build.openssl --with-openssl-dir=%openssl_dir%
   - ruby -v
   - bundle -v
 build_script:

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.3'
+  s.version = '0.5.0'
   s.license = 'MIT'
   s.summary = 'File-based mutex'
   s.description = 'Ruby Gem for file-based locking'

data/lib/futex.rb

@@ -70,6 +70,8 @@ class Futex
     start = Time.now
     prefix = exclusive ? '' : 'non-'
     b = badge(exclusive)
+    Thread.current.thread_variable_set(:futex_lock, @lock)
+    Thread.current.thread_variable_set(:futex_badge, b)
     File.open(@lock, File::CREAT | File::RDWR) do |f|
       cycle = 0
       loop do
@@ -78,6 +80,8 @@ class Futex
         end
         sleep(@sleep)
         cycle += 1
+        Thread.current.thread_variable_set(:futex_cycle, cycle)
+        Thread.current.thread_variable_set(:futex_time, Time.now - start)
         if Time.now - start > @timeout
           raise "#{b} can't get #{prefix}exclusive access \
 to the file #{@path} because of the lock at #{@lock}, after #{age(start)} \
@@ -107,7 +111,12 @@ access to #{@path}, #{age(start)} already: #{IO.read(@lock)}")
   end
 
   def age(time)
-    "#{((Time.now - time) * 1000).round}ms"
+    sec = Time.now - time
+    return "#{(sec * 1_000_000).round}μs" if sec < 0.001
+    return "#{(sec * 1000).round}ms" if sec < 1
+    return "#{sec.round(2)}s" if sec < 60
+    return "#{(sec / 60).round}m" if sec < 60 * 60
+    "#{(sec / 3600).round}h"
   end
 
   def debug(msg)

data/test/test_futex.rb

@@ -47,6 +47,19 @@ class FutexTest < Minitest::Test
     end
   end
 
+  def test_syncs_read_only_access_to_file
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, 'file.txt')
+      text = 'Hello, world!'
+      IO.write(path, text)
+      Threads.new(2).assert do
+        Futex.new(path).open(false) do |f|
+          assert_equal(text, IO.read(f))
+        end
+      end
+    end
+  end
+
   def test_syncs_access_to_file_in_slow_motion
     Dir.mktmpdir do |dir|
       path = File.join(dir, 'a/b/c/file.txt')
@@ -113,4 +126,18 @@ class FutexTest < Minitest::Test
       assert_equal(2, Dir.new(dir).count)
     end
   end
+
+  def test_sets_thread_vars
+    Dir.mktmpdir do |dir|
+      Futex.new(File.join(dir, 'hey.txt')).open do |f|
+        assert_equal(
+          "#{f}.lock",
+          Thread.current.thread_variable_get(:futex_lock)
+        )
+        assert(
+          Thread.current.thread_variable_get(:futex_badge).end_with?('-ex/nil')
+        )
+      end
+    end
+  end
 end

metadata

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