futex 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a40f777d578131870588931a9f18fde1960ba7a5219b5b5cd50dd97a7b9fc07
-  data.tar.gz: 0bf2196fca978a7a75b63faccd92ca4115510fcedf24c639a2d1c1251bf420b4
+  metadata.gz: 621fe1e76d09dd787dc6e5a76b7137d44f981ac303d5c0e825a0af6d885695ca
+  data.tar.gz: 0ab8b3899131e5e5514e2ede85cc7f18825a74915fa59b26e50e4712c1e0f0c8
 SHA512:
-  metadata.gz: 49791caf45a0b5c250aee714870bd6315c359b6c5e32e93a69663d15490ec0d56b9ede3d0726e1fd90c5f8231b46bd29a3accc8a2bd6d4407834e8498174543c
-  data.tar.gz: 85296003d7fb88544f1365ca1b9f026ece2fc1eebf2f532bf82fe7a947f14f92b1d45054fff516cf1eabc2f800817c60b949773cdb686abee58d06cae8202f2a
+  metadata.gz: 8b2a86b5382799a2b3f7591d0408bae3a1fc3f9b2f01b99b24e18b0598de50d9a04bf2904619ad135322346de41ee72e3b96a1de71fd9b74046495f1203e2ed6
+  data.tar.gz: a9fa21e4a920d835454fa47f458933e1810344677e870a8df7c45f1919db4dfc3e6324b5a6876e6ffa9bbbbce4bf0506e755afbab10e25e6fb7d426195ab6c93

data/.rubocop.yml

@@ -13,7 +13,7 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Max: 50
 Metrics/ClassLength:
-  Max: 150
+  Max: 180
 Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/PerceivedComplexity:

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.8.2'
+  s.version = '0.8.3'
   s.license = 'MIT'
   s.summary = 'File-based mutex'
   s.description = 'Ruby Gem for file-based locking'
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'openssl', '2.1.2'
   s.add_development_dependency 'rake', '12.3.1'
   s.add_development_dependency 'rdoc', '4.3.0'
-  s.add_development_dependency 'rubocop', '0.60.0'
-  s.add_development_dependency 'rubocop-rspec', '1.30.1'
+  s.add_development_dependency 'rubocop', '0.62.0'
+  s.add_development_dependency 'rubocop-rspec', '1.31.0'
   s.add_development_dependency 'threads', '0.3.0'
 end

data/lib/futex.rb

@@ -67,6 +67,9 @@ class Futex
     end
   end
 
+  # Global file for locks counting
+  COUNTS = File.join(Dir.tmpdir, 'futex.lock').freeze
+
   # Creates a new instance of the class.
   def initialize(path, log: STDOUT, timeout: 16, sleep: 0.005,
     lock: path + '.lock', logging: false)
@@ -163,41 +166,40 @@ access to #{@path}, #{age(start)} already: #{IO.read(@lock)} \
   def open_synchronized(path)
     path = File.absolute_path(path)
     file = nil
-    synchronized do |ref_counts_file|
+    synchronized do |counts|
       file = File.open(path, File::CREAT | File::RDWR)
-      ref_counts = deserialize(File.read(ref_counts_file.path))
-      ref_counts[path] = (ref_counts[path] || 0) + 1
-      File.write(ref_counts_file.path, serialize(ref_counts))
+      refs = deserialize(File.read(counts.path))
+      refs[path] = (refs[path] || 0) + 1
+      File.write(counts.path, serialize(refs))
     end
     yield file
   ensure
-    synchronized do |ref_counts_file|
+    synchronized do |counts|
       file.close
-      ref_counts = deserialize(File.read(ref_counts_file.path))
-      ref_counts[path] -= 1
-      if ref_counts[path].zero?
+      refs = deserialize(File.read(counts.path))
+      refs[path] -= 1
+      if refs[path].zero?
         FileUtils.rm(path, force: true)
-        ref_counts.delete(path)
+        refs.delete(path)
       end
-      File.write(ref_counts_file.path, serialize(ref_counts))
+      File.write(counts.path, serialize(refs))
     end
   end
 
   def synchronized
-    ref_counts_file = File.join(Dir.tmpdir, '.futex.lock')
-    File.open(ref_counts_file, File::CREAT | File::RDWR) do |f|
+    File.open(COUNTS, File::CREAT | File::RDWR) do |f|
       f.flock(File::LOCK_EX)
       yield f
     end
   end
 
   def serialize(data)
-    # NOTE: JSON is just an example,
-    # use whatever serialization is more appropriate here
     data.to_json
   end
 
   def deserialize(data)
     data.empty? ? {} : JSON.parse(data)
+  rescue JSON::ParserError
+    {}
   end
 end

data/test/test_futex.rb

@@ -191,6 +191,15 @@ class FutexTest < Minitest::Test
     end
   end
 
+  def test_works_with_broken_counts_file
+    IO.write(Futex::COUNTS, 'fds')
+    Dir.mktmpdir do |dir|
+      Futex.new(File.join(dir, 'hey.txt')).open do |f|
+        assert(!File.exist?(f))
+      end
+    end
+  end
+
   private
 
   def hash(text)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futex
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.62.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.31.0
 - !ruby/object:Gem::Dependency
   name: threads
   requirement: !ruby/object:Gem::Requirement
@@ -148,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 2
 summary: File-based mutex