just_one_lock 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b82b6f46a1fa00348c115108d61cf1330e5b91a2
-  data.tar.gz: 630a24221fbf60ea8bd6ab52ee465ed8aa8df401
+SHA256:
+  metadata.gz: 720c9f19a7d392419709231fb7990f0e178acad4cb33c434e9db52137e2a372d
+  data.tar.gz: b1d86cedb534ad6b81c5b9e5e59ca2e9cfa570fe1f3d585cffae2bfb36efe9ed
 SHA512:
-  metadata.gz: e640e6f06a7d434c9b227849c6817c20cc74cb7b101cc51a9c3dea1adc51bffe83b5cd3d09de5fd0fa90a7df615a3b398c10130b5b7f7799bc9900ff0e5c567a
-  data.tar.gz: c04bfc7ab6dd43e86b6da4712b22cc4e89c85bf737a6a8705fb9fd9177d3817b93a31d735ee20534ac211e7261f75f89de7e1c0aca87dee8ec53439a024c0d80
+  metadata.gz: 985e020c4dbf0b4c2a901d07d370fc26c4e34a4152bb8cb84855080592d0076d00612a8975f3562aceda0b33671175bc5d0557ca17def01c622267f77877a780
+  data.tar.gz: 1de801e3d26fa640f841f68e5960ab39a86d2b1c2669c00fbcc26d91787dccdfe17c22e412cc0edef0b4f550f5250376eccd4f7536f9a6d46ac5e5e962cc5451

data/.rubocop.yml

@@ -0,0 +1,2 @@
+AllCops:
+  TargetRubyVersion: 2.3

data/Dockerfile

@@ -0,0 +1,7 @@
+FROM httplab/ruby-dev-app:2.3
+
+VOLUME $HOME/$APP
+
+USER $USER
+
+CMD [ 'irb' ]

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in filelock.gemspec

data/Rakefile

@@ -1 +1,2 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+require 'bundler/gem_tasks'

data/bin/just_one_lock

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'gli'
 require_relative '../lib/just_one_lock'
@@ -10,25 +11,25 @@ include GLI::App
 program_desc 'Just one lock runner'
 version JustOneLock::VERSION
 
-flag [:l,:lock_dir], default_value: '/tmp'
-flag [:s,:scope]
-flag [:t,:timeout], desc: 'Timeout in seconds'
+flag [:l, :lock_dir], default_value: '/tmp'
+flag [:s, :scope]
+flag [:t, :timeout], desc: 'Timeout in seconds'
 
 desc 'Execute system command'
 command :exec do |c|
-  c.action do |global_options, options, args|
+  c.action do |global_options, _options, args|
     JustOneLock.world.directory = global_options[:lock_dir]
     scope = global_options[:scope]
     timeout = global_options[:timeout].to_f
     command_to_run = args.first
 
-    if timeout > 0
-      locker = JustOneLock::BlockingLocker.new(timeout: timeout)
-    else
-      locker = JustOneLock::NonBlockingLocker.new
-    end
+    locker = if timeout > 0
+               JustOneLock::BlockingLocker.new(timeout: timeout)
+             else
+               JustOneLock::NonBlockingLocker.new
+             end
 
-    JustOneLock::prevent_multiple_executions(scope, locker) do
+    JustOneLock.prevent_multiple_executions(scope, locker) do
       system command_to_run
     end
   end
@@ -37,4 +38,3 @@ end
 default_command :exec
 
 exit run(ARGV)
-

data/docker-compose.yml

@@ -0,0 +1,5 @@
+dev:
+  build: .
+  volumes:
+    - .:/home/apps/app
+    - ~/data/gems-2.3:/.gem

data/just_one_lock.gemspec

@@ -1,25 +1,24 @@
-# coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'just_one_lock/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "just_one_lock"
+  spec.name          = 'just_one_lock'
   spec.version       = JustOneLock::VERSION
-  spec.authors       = ["Yury Kotov"]
-  spec.email         = ["bairkan@gmail.com"]
-  spec.description   = %q{Simple solution to prevent multiple executions using flock}
-  spec.summary       = %q{Simple solution to prevent multiple executions using flock}
-  spec.homepage      = "http://github.com/beorc/just_one_lock"
-  spec.license       = "MIT"
+  spec.authors       = ['Yury Kotov']
+  spec.email         = ['bairkan@gmail.com']
+  spec.description   = 'Simple solution to prevent multiple executions using flock'
+  spec.summary       = 'Simple solution to prevent multiple executions using flock'
+  spec.homepage      = 'http://github.com/beorc/just_one_lock'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", '~> 10.3'
-  spec.add_development_dependency "rspec", '~> 3.0'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_dependency 'gli', '~> 2.11'
 end

data/lib/just_one_lock/base_locker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class JustOneLock::BaseLocker
   def already_locked(scope)
     msg = "Another process <#{scope}> already is running"
@@ -14,14 +15,13 @@ class JustOneLock::BaseLocker
     f.truncate(f.pos)
   end
 
-  def run(f, path, &block)
+  def run(f, path)
     write_pid(f)
 
     JustOneLock.before_lock(path, f)
-    result = block.call
+    result = yield
     JustOneLock.after_lock(path, f)
 
     result
   end
 end
-

data/lib/just_one_lock/blocking_locker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'timeout'
 
 class JustOneLock::BlockingLocker < JustOneLock::BaseLocker
@@ -12,8 +13,8 @@ class JustOneLock::BlockingLocker < JustOneLock::BaseLocker
   def lock(lock_path, &block)
     result = nil
 
-    File.open(lock_path, File::RDWR|File::CREAT, 0644) do |f|
-      Timeout::timeout(@timeout, JustOneLock::AlreadyLocked) { f.flock(File::LOCK_EX) }
+    File.open(lock_path, File::RDWR | File::CREAT, 0o644) do |f|
+      Timeout.timeout(@timeout, JustOneLock::AlreadyLocked) { f.flock(File::LOCK_EX) }
 
       result = run(f, lock_path, &block)
     end
@@ -21,4 +22,3 @@ class JustOneLock::BlockingLocker < JustOneLock::BaseLocker
     result
   end
 end
-

data/lib/just_one_lock/non_blocking_locker.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
 class JustOneLock::NonBlockingLocker < JustOneLock::BaseLocker
   def lock(lock_path, &block)
     result = nil
 
-    File.open(lock_path, File::RDWR|File::CREAT, 0644) do |f|
-      if f.flock(File::LOCK_NB|File::LOCK_EX)
+    File.open(lock_path, File::RDWR | File::CREAT, 0o644) do |f|
+      if f.flock(File::LOCK_NB | File::LOCK_EX)
         result = run(f, lock_path, &block)
       else
-        fail JustOneLock::AlreadyLocked
+        raise JustOneLock::AlreadyLocked
       end
     end
 
     result
   end
 end
-

data/lib/just_one_lock/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JustOneLock
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/just_one_lock/world.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class JustOneLock::World
   attr_accessor :output, :directory, :delete_files
 
@@ -12,9 +13,7 @@ class JustOneLock::World
     paths_to_delete = []
 
     @files.each do |path, f|
-      if File.exists?(path) && f.closed?
-        paths_to_delete << path
-      end
+      paths_to_delete << path if File.exist?(path) && f.closed?
     end
 
     paths_to_delete.each do |path|
@@ -27,7 +26,7 @@ class JustOneLock::World
     @files[name] = file
   end
 
-  def after_lock(name, file)
+  def after_lock(_name, _file)
     delete_unlocked_files if delete_files
   end
 

data/lib/just_one_lock.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require 'just_one_lock/version'
 require 'just_one_lock/world'
 require 'just_one_lock/base_locker'
 require 'just_one_lock/blocking_locker'
 require 'just_one_lock/non_blocking_locker'
 require 'forwardable'
+require 'pathname'
 
 module JustOneLock
   class AlreadyLocked < StandardError; end
@@ -22,7 +24,7 @@ module JustOneLock
     locker = JustOneLock::NonBlockingLocker.new,
     &block
   )
-    scope_name = scope.gsub(':', '_')
+    scope_name = scope.tr(':', '_')
     lock_path = File.join(world.directory, scope_name + '.lock')
 
     begin
@@ -32,4 +34,3 @@ module JustOneLock
     end
   end
 end
-

data/spec/just_one_lock/blocking_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'just_one_lock'
 require 'tempfile'
 require 'timeout'
@@ -61,4 +62,3 @@ describe JustOneLock::BlockingLocker do
     expect(answer).to eq(100)
   end
 end
-

data/spec/just_one_lock/locking_object.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 shared_examples 'a locking object' do
@@ -17,7 +18,6 @@ shared_examples 'a locking object' do
   it 'returns value returned by block' do
     Dir.mktmpdir do |lock_dir|
       lockpath = File.join(lock_dir, 'sample.lock')
-      answer = 0
 
       answer = locker.lock lockpath do
         42
@@ -67,10 +67,8 @@ shared_examples 'a locking object' do
         end
       end
 
-      Timeout::timeout(1) do
-        while locked == false
-          sleep 0.1
-        end
+      Timeout.timeout(1) do
+        sleep 0.1 while locked == false
       end
 
       expect do
@@ -88,27 +86,25 @@ shared_examples 'a locking object' do
 
     it 'should unblock files when killing processes' do
       lockpath = Tempfile.new(['sample', '.lock']).path
-      dir, scope = dir_and_scope(lockpath)
+      _dir, scope = dir_and_scope(lockpath)
 
-      pid = fork {
-        JustOneLock::prevent_multiple_executions(scope, locker) do
+      pid = fork do
+        JustOneLock.prevent_multiple_executions(scope, locker) do
           sleep 10
         end
-      }
+      end
 
-      Timeout::timeout(1) do
-        while !File.exist?(lockpath)
-          sleep 0.1
-        end
+      Timeout.timeout(1) do
+        sleep 0.1 until File.exist?(lockpath)
       end
 
       answer = 0
 
-      thread = Thread.new {
-        JustOneLock::prevent_multiple_executions(scope, locker) do
+      thread = Thread.new do
+        JustOneLock.prevent_multiple_executions(scope, locker) do
           answer += 42
         end
-      }
+      end
 
       expect(answer).to eq(0)
       Process.kill(9, pid)
@@ -152,5 +148,3 @@ shared_examples 'a locking object' do
     expect(File.exist?(filename)).to eq(true)
   end
 end
-
-

data/spec/just_one_lock/non_blocking_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'just_one_lock'
 require 'tempfile'
 require 'timeout'
@@ -7,4 +8,3 @@ describe JustOneLock::NonBlockingLocker do
   let(:locker) { JustOneLock::NonBlockingLocker.new }
   it_behaves_like 'a locking object'
 end
-

data/spec/just_one_lock_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'just_one_lock'
 require 'tempfile'
 require 'timeout'

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Helper because File.write won't work for older Ruby
 def write(filename, contents)
   File.open(filename.to_s, 'w') { |f| f.write(contents) }
@@ -12,13 +13,13 @@ def dir_and_scope(lockpath)
 end
 
 def parallel(n = 2, lockpath: Tempfile.new(['sample', '.lock']).path, &block)
-  Timeout::timeout(5) do
+  Timeout.timeout(5) do
     dir, scope = dir_and_scope(lockpath)
     JustOneLock.world.directory = dir
 
     (1..n).map do
       Thread.new do
-        JustOneLock::prevent_multiple_executions(scope, locker, &block)
+        JustOneLock.prevent_multiple_executions(scope, locker, &block)
       end
     end.map(&:join)
   end
@@ -27,14 +28,14 @@ def parallel(n = 2, lockpath: Tempfile.new(['sample', '.lock']).path, &block)
 end
 
 def parallel_forks(n = 2, lockpath: Tempfile.new(['sample', '.lock']).path, &block)
-  Timeout::timeout(5) do
+  Timeout.timeout(5) do
     dir, scope = dir_and_scope(lockpath)
     JustOneLock.world.directory = dir
 
     (1..n).map do
-      fork {
-        JustOneLock::prevent_multiple_executions(scope, locker, &block)
-      }
+      fork do
+        JustOneLock.prevent_multiple_executions(scope, locker, &block)
+      end
     end.map do |pid|
       Process.waitpid(pid)
     end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: just_one_lock
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Yury Kotov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,12 +62,15 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/just_one_lock
+- docker-compose.yml
 - just_one_lock.gemspec
 - lib/just_one_lock.rb
 - lib/just_one_lock/base_locker.rb
@@ -98,7 +87,7 @@ homepage: http://github.com/beorc/just_one_lock
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,9 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Simple solution to prevent multiple executions using flock
 test_files: