pg_lock 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e285d50b50c70bd26a8e9ce0047cb874450ebc27dc5db28c903ef613540ecaed
-  data.tar.gz: 8a167c46ae260ac9b84e0dd442f821a7d3a9894a4a72f206cb5fd669fcbf4594
+  metadata.gz: c92e38fab7329deb1a573eafce48291e38b3198baf0ce39a4500d305a1b01081
+  data.tar.gz: 3c14d574202f72524728cc3f1ffb5af3d2dc16b6980bfa9efe130fa84a6f5c00
 SHA512:
-  metadata.gz: 23e058530b6b4029df92d8733ab7828753360c85092113a1dac14afab03ff8de6a1c926c8399a7f6833811b3963febd75bb1aeaefdfb8827ab3e44c13964e7e4
-  data.tar.gz: 7346e5463867c3a5755203c6c8e397e863d1d2756eeda5db4614dc525693d758270e02a9bb4b6ec8e686565410cec011f7be1657d480f5fcf1d35314bb0366a2
+  metadata.gz: 67be6b9ef5ff32f10cd6f8a98d6b58af010c9d03e480617372c6e43787fbdeb704d349d573d22b1e2eb7fa4c6a05c97106f6b30a7e3ff72f6247a73cba63d781
+  data.tar.gz: 17efa281393055a6facdfb44bbca361a49f00ae20454fe3557c89d3e971aeb0e6b7c742609409d6080345814bf8bc0d8ad1c09fb465d9dcacb2d37d5cd548013

data/.travis.yml

@@ -1,18 +1,21 @@
 language: ruby
+services:
+  - postgresql
 rvm:
-  - 2.1
-  - 2.2
+  - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
 
 script:
   - bundle exec rspec spec
 
+before_install:
+  - gem install bundler
+
 before_script:
   - psql -c 'create database pg_lock_test;' -U postgres
 
-addons:
-  postgresql: "9.3"
-
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # A Log of Changes!
 
+## Master - unreleased
+
+## 0.2.0
+
+- Return the result evaluated inside the block (https://github.com/heroku/pg_lock/pull/10)
+
 ## [0.1.2] - 2017-12-06
 
 - Support Rails 5 and newer PG versions [#5]

data/lib/pg_lock/version.rb

@@ -1,3 +1,3 @@
 class PgLock
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/pg_lock.rb

@@ -27,12 +27,13 @@ class PgLock
   end
   UnableToLock = UnableToLockError
 
-  def initialize(name:, attempts: 3, attempt_interval: 1, ttl: 60, connection: DEFAULT_CONNECTION_CONNECTOR.call, log: DEFAULT_LOGGER.call )
+  def initialize(name:, attempts: 3, attempt_interval: 1, ttl: 60, connection: DEFAULT_CONNECTION_CONNECTOR.call, log: DEFAULT_LOGGER.call, return_result: true)
     self.name               = name
     self.max_attempts       = [attempts, 1].max
     self.attempt_interval   = attempt_interval
     self.ttl                = ttl || 0 # set this to 0 to disable the timeout
     self.log                = log
+    self.return_result      = return_result
 
     connection or raise "Must provide a valid connection object"
     self.locket             = Locket.new(connection, [PG_LOCK_SPACE, key(name)])
@@ -41,12 +42,13 @@ class PgLock
   # Runs the given block if an advisory lock is able to be acquired.
   def lock(&block)
     if create
+      result = nil
       begin
-        Timeout::timeout(ttl, &block) if block_given?
+        result = Timeout::timeout(ttl, &block) if block_given?
       ensure
         delete
       end
-      return true
+      return_result ? result : true
     else
       return false
     end
@@ -97,6 +99,7 @@ class PgLock
     attr_accessor :ttl
     attr_accessor :name
     attr_accessor :log
+    attr_accessor :return_result
 
     def key(name)
       i = Zlib.crc32(name.to_s)

data/pg_lock.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "pg", ">= 0.15"
   spec.add_development_dependency "activerecord", ">= 2.3"
-  spec.add_development_dependency "bundler", "~> 1"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_development_dependency "rspec", "~> 3.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_lock
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - mikehale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Use Postgres advisory lock to isolate code execution across machines