just_one_lock 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef790c43dd30dabc1e75e662d8e042ff0a49c08f
-  data.tar.gz: 77ef1490b78280b803160512b96beaa8aeea376f
+  metadata.gz: 96a82fccd7eba5bb06192f7ebd10819e794321b6
+  data.tar.gz: e4792fd094d7a23b6571b638fbb838c9b3a80c36
 SHA512:
-  metadata.gz: 7f33614e6f935dfbb3040e64f09590342988ebe8566ebaca24c315d180bd73040723d165f9ede1c1804fedde2285c4d9b257ac9924ddbc84ae5d2cf94db8f477
-  data.tar.gz: 68a3d589c4545bdcba5e5467861d8120687e69b1b7438e6b0c5f6b86f7f0854d3674c68236f824da86e7e9f60c1151dad914100ff510beb5e275b20ea1209ee8
+  metadata.gz: b370ad55949836b9c1177dabe8e09c838003ec2195a27edfbf606d8457db8f8670a90f183b6932353b0a611e26ed6df7ed35953888aeca33dfe6e093c6c8c527
+  data.tar.gz: c9708ea092dda6892be69665277c0adace654ed86bd046e9a20fe8704e177b6c592b42f546f8983facaaddeedc8e0530c08a059c2571d32ffcc68a2bf46c56ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    just_one_lock (0.0.2)
+    just_one_lock (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/just_one_lock/non_blocking.rb

@@ -21,12 +21,13 @@ module JustOneLock::NonBlocking
     lock_dir,
     scope,
     output: JustOneLock::NullStream,
+    delete_files: true,
     &block
   )
     scope_name = scope.gsub(':', '_')
     lock_path = File.join(lock_dir, scope_name + '.lock')
 
-    was_executed = filelock(lock_path, &block)
+    was_executed = filelock(lock_path, delete_files: delete_files, &block)
 
     unless was_executed
       output.puts "Another process <#{scope}> already is running"

data/lib/just_one_lock/version.rb

@@ -1,3 +1,3 @@
 module JustOneLock
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/just_one_lock.rb

@@ -12,11 +12,22 @@ module JustOneLock
   @files = {}
 
   def self.delete_unlocked_files
+    paths_to_delete = []
+
     @files.each do |path, f|
       if File.exists?(path) && f.closed?
-        File.delete(path) rescue nil
+        paths_to_delete << path
       end
     end
+
+    paths_to_delete.each do |path|
+      File.delete(path)
+      @files.delete(path)
+    end
+  end
+
+  def self.lock_paths
+    @files.keys
   end
 
   private

data/spec/just_one_lock/blocking_spec.rb

@@ -40,7 +40,7 @@ describe JustOneLock::Blocking do
     it 'should work for multiple processes' do
       write('/tmp/number.txt', '0')
 
-      parallel_forks(6, timeout: 10) do
+      parallel_forks(6) do
         number = File.read('/tmp/number.txt').to_i
         sleep(JustOneLock::Blocking::DEFAULT_TIMEOUT / 100)
         write('/tmp/number.txt', (number + 7).to_s)
@@ -55,7 +55,7 @@ describe JustOneLock::Blocking do
       write('/tmp/number.txt', '0')
 
       FORKS_NUMBER = 100
-      parallel_forks(FORKS_NUMBER, timeout: 10) do
+      parallel_forks(FORKS_NUMBER) do
         number = File.read('/tmp/number.txt').to_i
         write('/tmp/number.txt', (number + 1).to_s)
       end
@@ -64,17 +64,29 @@ describe JustOneLock::Blocking do
 
       expect(number).to eq(FORKS_NUMBER)
     end
+  end
 
-    it 'handles high amount of concurrent tasks' do
-      answer = 0
+  it 'runs in parallel without race condition' do
+    answer = 0
 
-      parallel(100, timeout: JustOneLock::Blocking::DEFAULT_TIMEOUT * 10) do
-        value = answer
-        answer = value + 1
-      end
+    parallel(2) do
+      value = answer
+      sleep(JustOneLock::Blocking::DEFAULT_TIMEOUT / 2)
+      answer = value + 21
+    end
 
-      expect(answer).to eq(100)
+    expect(answer).to eq(42)
+  end
+
+  it 'handles high amount of concurrent tasks' do
+    answer = 0
+
+    parallel(100) do
+      value = answer
+      answer = value + 1
     end
+
+    expect(answer).to eq(100)
   end
 end
 

data/spec/just_one_lock/locking_object.rb

@@ -27,18 +27,6 @@ shared_examples 'a locking object' do
     end
   end
 
-  it 'runs in parallel without race condition' do
-    answer = 0
-
-    parallel(2) do
-      value = answer
-      sleep(JustOneLock::Blocking::DEFAULT_TIMEOUT / 2)
-      answer = value + 21
-    end
-
-    expect(answer).to eq(42)
-  end
-
   it 'creates lock file on disk during block execution' do
     lockpath = Tempfile.new(['sample', '.lock']).path
     parallel(2, lockpath: lockpath) do

data/spec/just_one_lock/non_blocking_spec.rb

@@ -11,7 +11,7 @@ describe JustOneLock::NonBlocking do
       dir, scope = dir_and_scope(lockpath)
       (1..n).map do
         Thread.new do
-          JustOneLock::Blocking.prevent_multiple_executions(dir, scope, delete_files: false, &block)
+          JustOneLock::NonBlocking.prevent_multiple_executions(dir, scope, delete_files: false, &block)
         end
       end.map(&:join)
     end
@@ -25,7 +25,7 @@ describe JustOneLock::NonBlocking do
 
       (1..n).map do
         fork {
-          JustOneLock::Blocking.prevent_multiple_executions(dir, scope, delete_files: false, &block)
+          JustOneLock::NonBlocking.prevent_multiple_executions(dir, scope, delete_files: false, &block)
         }
       end.map do |pid|
         Process.waitpid(pid)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: just_one_lock
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adam Stankiewicz, Yury Kotov