just_one_lock 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a82fccd7eba5bb06192f7ebd10819e794321b6
-  data.tar.gz: e4792fd094d7a23b6571b638fbb838c9b3a80c36
+  metadata.gz: 3e557230f996c20dc4ce8d926ce91ec498c69b16
+  data.tar.gz: 13a29e9beafc7e7bf698e354209a34379c32ae13
 SHA512:
-  metadata.gz: b370ad55949836b9c1177dabe8e09c838003ec2195a27edfbf606d8457db8f8670a90f183b6932353b0a611e26ed6df7ed35953888aeca33dfe6e093c6c8c527
-  data.tar.gz: c9708ea092dda6892be69665277c0adace654ed86bd046e9a20fe8704e177b6c592b42f546f8983facaaddeedc8e0530c08a059c2571d32ffcc68a2bf46c56ee
+  metadata.gz: 0aa440f661bc1a5dfd94399b34b163b262f2d6dada1c816e8eaf73c63c055f332a56a0cb31382c976c92faf34738d97931c3d6824a30bd23b3d6fe76020fbf3d
+  data.tar.gz: fe426d149e1881bde672fd6d32b454f2641687ccf9421d8172661dc391ef2b3e1f2589d9c583059cf63e61207757d781d8e7a38009f0a1e27f32387e7a4be763

data/Gemfile.lock

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

data/lib/just_one_lock/blocking.rb

@@ -2,7 +2,6 @@ require 'timeout'
 
 module JustOneLock::Blocking
   DEFAULT_TIMEOUT = 1
-  class AlreadyLocked < StandardError; end
 
   def self.filelock(
     lockname,
@@ -12,7 +11,7 @@ module JustOneLock::Blocking
   )
     result = nil
     File.open(lockname, File::RDWR|File::CREAT, 0644) do |f|
-      Timeout::timeout(timeout, JustOneLock::Blocking::AlreadyLocked) { f.flock(File::LOCK_EX) }
+      Timeout::timeout(timeout, JustOneLock::AlreadyLocked) { f.flock(File::LOCK_EX) }
 
       result = JustOneLock.run(f, lockname, &block)
     end
@@ -34,8 +33,8 @@ module JustOneLock::Blocking
 
     begin
       return filelock(lock_path, timeout: timeout, delete_files: delete_files, &block)
-    rescue JustOneLock::Blocking::AlreadyLocked => e
-      output.puts "Another process <#{scope}> already is running"
+    rescue JustOneLock::AlreadyLocked => e
+      JustOneLock.already_locked(output, scope)
     end
   end
 end

data/lib/just_one_lock/non_blocking.rb

@@ -27,10 +27,10 @@ module JustOneLock::NonBlocking
     scope_name = scope.gsub(':', '_')
     lock_path = File.join(lock_dir, scope_name + '.lock')
 
-    was_executed = filelock(lock_path, delete_files: delete_files, &block)
-
-    unless was_executed
-      output.puts "Another process <#{scope}> already is running"
+    begin
+      return filelock(lock_path, delete_files: delete_files, &block)
+    rescue JustOneLock::AlreadyLocked => e
+      JustOneLock.already_locked(output, scope)
     end
   end
 end

data/lib/just_one_lock/version.rb

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

data/lib/just_one_lock.rb

@@ -3,6 +3,8 @@ require 'just_one_lock/blocking'
 require 'just_one_lock/non_blocking'
 
 module JustOneLock
+  class AlreadyLocked < StandardError; end
+
   class NullStream
     class << self
       def puts(str); end
@@ -30,6 +32,12 @@ module JustOneLock
     @files.keys
   end
 
+  def self.already_locked(output, scope)
+    msg = "Another process <#{scope}> already is running"
+    output.puts msg
+    raise JustOneLock::AlreadyLocked, msg
+  end
+
   private
 
   def self.write_pid(f)

data/spec/just_one_lock/locking_object.rb

@@ -77,7 +77,7 @@ shared_examples 'a locking object' do
         JustOneLock::Blocking.filelock lockpath, timeout: 0.001 do
           answer = 0
         end
-      end.to raise_error(JustOneLock::Blocking::AlreadyLocked)
+      end.to raise_error(JustOneLock::AlreadyLocked)
 
       expect(answer).to eq(42)
     end

metadata

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