travis-lock 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c983c384c38f7bb07cddd92b3ea775570ff2aec
-  data.tar.gz: 21b952b4ce5c7eeed44d21d4db04e6b4e920f428
+  metadata.gz: 438cbc91b63a790889bc58d8a5631f59ff394226
+  data.tar.gz: 9df4223ebb7224febae75e1248d075c3387a0b4e
 SHA512:
-  metadata.gz: 490a9cb44c09b52426876d131d30c118e3e279a82dd75d7c9cc30d0d6553d5278ba4e9b8d686d34683a18e370727e09a6e2e1ea124365f359a4aaf23a2c2f3c0
-  data.tar.gz: afccd06931aaa156e0e6fbafa590d3929e0a0fc903f3386554499d15277e862f6ab6d1ee09822ae9cf0042e91c134e1a07959def5a58f3522b8439aaa48d590d
+  metadata.gz: f671cffce832b81c01af24dd53859400434e105fdf4cf78f9e863b7b2cc83ca1801d05cfd9f9c8a0296368a72d1bd3a2e529c01396a6eceb9dd6d29af7bdb3ab
+  data.tar.gz: dfe0e317939a893bc77c9f4cec36ee571e0039826f79c25d48efb4e16392ebdc7218af74b72c18b5b77d911df7a404ecac717d3397ad744cfa02f4f0b2ac4c41

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'activerecord'
 gem 'redlock'
 
 platform :ruby do

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-lock (0.1.4)
-      activerecord (~> 4.0)
+    travis-lock (0.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -26,7 +25,7 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     metaclass (0.0.4)
-    minitest (5.8.0)
+    minitest (5.8.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     pg (0.18.3)
@@ -54,6 +53,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
   mocha (~> 1.1)
   pg
   redlock

data/lib/travis/lock.rb

@@ -6,7 +6,7 @@ module Travis
   module Lock
     class Timeout < StandardError
       def initialize(name, options)
-        super("Could not obtain lock for #{name}: #{options.map { |*pair| pair.join('=') }.join(' ')}")
+        super("Could not obtain lock for #{name}: #{options.map { |pair| pair.join('=') }.join(' ')}")
       end
     end
 
@@ -16,7 +16,7 @@ module Travis
 
     def exclusive(name, options = {}, &block)
       options[:strategy] ||= Lock.default_strategy || :none
-      const_get(camelize(options[:strategy])).new(name, options).exclusive(&block)
+      Lock.const_get(camelize(options[:strategy])).new(name, options).exclusive(&block)
     end
 
     private

data/lib/travis/lock/postgresql.rb

@@ -3,8 +3,12 @@
 # 13.3.4. Advisory Locks : http://www.postgresql.org/docs/9.3/static/explicit-locking.html
 # http://www.postgresql.org/docs/9.3/static/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS
 
+begin
+  require 'active_record'
+rescue LoadError
+end
+
 require 'zlib'
-require 'active_record'
 require 'travis/lock/support/retry'
 
 module Travis

data/lib/travis/lock/redis.rb

@@ -8,31 +8,38 @@ module Travis
   module Lock
     class Redis
       class LockError < StandardError
+        attr_reader :key
+
         def initialize(key)
+          @key = key
           super("Could not obtain lock for #{key.inspect} on Redis.")
         end
       end
 
-      extend MonitorMixin
+      def self.clients
+        @clients ||= {}
+      end
 
       DEFAULTS = {
         ttl:      5 * 60,
         retries:  5,
-        interval: 0.1
+        interval: 0.1,
+        timeout:  0.5
       }
 
-      attr_reader :name, :config, :retried
+      attr_reader :name, :config, :retried, :monitor
 
       def initialize(name, config)
         @name    = name
         @config  = DEFAULTS.merge(config)
         @retried = 0
+        @monitor = Monitor.new
       end
 
       def exclusive
         retrying do
           client.lock(name, config[:ttl]) do |lock|
-            lock ? yield : raise(LockError.new(name))
+            lock ? yield(lock) : raise(LockError.new(name))
           end
         end
       end
@@ -40,7 +47,9 @@ module Travis
       private
 
         def client
-          Redlock::Client.new([url])
+          monitor.synchronize do
+            self.class.clients[url] ||= Redlock::Client.new([url], redis_timeout: config[:timeout])
+          end
         end
 
         def url

data/lib/travis/lock/support/retry.rb

@@ -26,7 +26,7 @@ module Travis
       end
 
       def timeout!
-        fail Timeout.new(name, options)
+        fail Timeout.new(name, options || {})
       end
     end
   end

data/lib/travis/lock/version.rb

@@ -1,5 +1,5 @@
 module Travis
   module Lock
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/support/database.rb

@@ -1,7 +1,10 @@
-require 'active_record'
+begin
+  require 'active_record'
 
-ActiveRecord::Base.establish_connection(
-  adapter:  'postgresql',
-  database: 'travis_test',
-  pool:     50
-)
+  ActiveRecord::Base.establish_connection(
+    adapter:  'postgresql',
+    database: 'travis_test',
+    pool:     50
+  )
+rescue LoadError
+end

data/spec/travis/lock/redis_spec.rb

@@ -4,6 +4,8 @@ describe Travis::Lock::Redis do
   let(:lock)   { described_class.new(name, config) }
   let(:name)   { 'name' }
 
+  after { Travis::Lock::Redis.instance_variable_set(:@clients, nil) }
+
   it 'yields' do
     lock.exclusive { @called = true }
     expect(@called).to eq(true)

data/travis-lock.gemspec

@@ -9,14 +9,12 @@ Gem::Specification.new do |s|
   s.authors      = ["Travis CI"]
   s.email        = "contact@travis-ci.org"
   s.homepage     = "https://github.com/travis-ci/travis-lock"
-  s.summary      = "Travis CI config"
+  s.summary      = "Locks for use at Travis CI"
   s.description  = "#{s.summary}."
-  s.license      = "MIT"
+  s.licenses     = ["MIT"]
 
   s.files        = Dir['{lib/**/*,spec/**/*,[A-Z]*}']
   s.platform     = Gem::Platform::RUBY
   s.require_path = 'lib'
   s.rubyforge_project = '[none]'
-
-  s.add_dependency 'activerecord' , '~> 4.0'
 end

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: travis-lock
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-description: Travis CI config.
+date: 2016-10-24 00:00:00.000000000 Z
+dependencies: []
+description: Locks for use at Travis CI.
 email: contact@travis-ci.org
 executables: []
 extensions: []
@@ -69,6 +55,6 @@ rubyforge_project: "[none]"
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Travis CI config
+summary: Locks for use at Travis CI
 test_files: []
 has_rdoc: