lock_manager 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6182864c1d1e43eda6276e9459037dd7c0aaf176
-  data.tar.gz: 6b6eb4cc2823147881e540080ddc930c2d942dcc
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWUzNGQ5YjE1YjViMmUzYjBiOTgzMWNkZjg5OTcxNDc1NjNmM2Q5MQ==
+  data.tar.gz: !binary |-
+    OGY2NTY2ZTNmZTRiMjU1ZjM5MmNlOWJhZjc5NmY5NWFlMzZjOGQyMQ==
 SHA512:
-  metadata.gz: 9bdb3020bb25b41f471c102864f86a93eefb4948ccf204d19d16b155be91c4a84fbaa9deb53ac65be109fd4b3e1f918e446c091ce5ab3f9542f03b93e6767f6b
-  data.tar.gz: 0fe35dfea4dd4c5768e32f665b9859ab89f7973bfb14d288fb5c04dd50db4a2a02b49aab49c15e12bb0b819f215d8b1c951de25f2ad5b1286fd5b1dd787d6577
+  metadata.gz: !binary |-
+    MTUzNGI1YTg4YzFmMzA0MzFkZGFhMjczNzM2NjEwYmY5OGFhYjMyOTI1NmRh
+    MzU4ZGFmOTYxMjdiZWUxNWU5OWViYzM0YmJlMDk4YmY3ODMzOTRhNjVmNTcz
+    Mjc0MWI1M2I3NDkzZTJmOTM2ZjMzNmJkMTI2NTE4NWE2ZDhlNzY=
+  data.tar.gz: !binary |-
+    ZjYyNTMyNWFlNTE3ZDkxZTJmYjUyNWU2NjQwMzAwMWU0ZTY2MDUwNjJlM2Nh
+    NmM1MjBkMWUzOGI0MjA4ZWMzMjBiODIyMjJjNmM0OTc0ZjYyOWY0ZmU4Yzg5
+    NzBhZjFlOWIxMDIxOTVlZDFiY2QzOWU2MDhhYmM4ZWNiZmYyODg=

data/README.md

@@ -1,5 +1,7 @@
 # Lock Manager
 
+[![Build Status](https://travis-ci.org/puppetlabs/lock_manager.svg?branch=master)](https://travis-ci.org/puppetlabs/lock_manager)
+
 Lock manager is designed to be a small helper gem that provides common methods
 for locking and unlocking hardware.
 

data/lib/lock_manager/connection.rb

@@ -8,7 +8,7 @@ class LockManager
         require 'lock_manager/redis_connection'
         LockManager::RedisConnection
       else
-        fail ArgumentError, "Unknown connection type: #{type}"
+        raise ArgumentError, "Unknown connection type: #{type}"
       end
     end
 
@@ -17,15 +17,15 @@ class LockManager
     end
 
     def write(key, value)
-      fail "Not implemented: write(#{key}, #{value})"
+      raise "Not implemented: write(#{key}, #{value})"
     end
 
     def read(key)
-      fail "Not implemented: read(#{key})"
+      raise "Not implemented: read(#{key})"
     end
 
     def remove(key)
-      fail "Not implemented: remove(#{key})"
+      raise "Not implemented: remove(#{key})"
     end
   end
 end

data/lib/lock_manager/redis_connection.rb

@@ -6,7 +6,7 @@ class LockManager
 
     def initialize(options = {})
       super
-      fail ArgumentError, ':server option is mandatory for redis connections' unless options[:server]
+      raise ArgumentError, ':server option is mandatory for redis connections' unless options[:server]
       @server = options[:server]
       @port = options[:port]
     end

data/lib/lock_manager/worker.rb

@@ -7,7 +7,7 @@ class LockManager
     def initialize(connection, host)
       @connection = connection
       if host =~ Regexp.union(Resolv::IPv4::Regex, Resolv::IPv6::Regex)
-        fail ArgumentError, 'Please use a DNS name rather than an IP address.'
+        raise ArgumentError, 'Please use a DNS name rather than an IP address.'
       else
         # Using the shortname of the host has the downside of being unable to
         # lock two hosts with the same shortname and different domains.
@@ -70,17 +70,16 @@ class LockManager
       result['user']
     end
 
-    def polling_lock(user, reason = nil)
+    def polling_lock(user, reason = nil, max_sleep = 600)
       sleep_duration = 1
+      return lock(user, reason) unless locked?
       loop do
-        if locked?
-          log "#{host} is locked..."
-          log "waiting #{sleep_duration} seconds."
-          sleep sleep_duration
-          sleep_duration *= 2
-        else
-          break
-        end
+        log "#{host} is locked..."
+        log "waiting #{sleep_duration} seconds."
+        sleep sleep_duration
+        sleep_duration *= 2
+        sleep_duration = max_sleep if sleep_duration > max_sleep
+        break unless locked?
       end
       lock(user, reason)
     end

data/lib/lock_manager.rb

@@ -30,7 +30,7 @@ class LockManager
   end
 
   def connection
-    fail ArgumentError, ':type option is required' unless options[:type]
+    raise ArgumentError, ':type option is required' unless options[:type]
     @connection ||= LockManager::Connection.connection_class(options[:type]).new(options)
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,7 @@
+
+require 'simplecov'
+SimpleCov.start
+
 require 'minitest/autorun'
 require 'json'
 require 'lock_manager'

data/test/test_poll.rb

@@ -11,6 +11,13 @@ class TestLockManagerPoll < MiniTest::Test
   end
 
   def test_polling_lock_when_locked_already
-    skip "I don't know how to test the case where it is locked, since it just blocks"
+    assert_raises Timeout::Error do
+      Timeout.timeout(3) do
+        @rlm.lock('pe-aix-72-builder', 'stahnma')
+        @rlm.polling_lock('pe-aix-72-builder', 'stahnma')
+      end
+    end
+
+    assert @rlm.locked?('pe-aix-72-builder')
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: lock_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 description: A simple interface for locking hardware resources available via ruby
@@ -81,24 +81,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: Simply system for locking and unlocking hardware resources.
 test_files:
-- test/test_redis_connect.rb
-- test/test_unlock.rb
-- test/test_show.rb
 - test/test_lock.rb
-- test/test_helper.rb
+- test/test_show.rb
 - test/test_poll.rb
+- test/test_helper.rb
+- test/test_unlock.rb
+- test/test_redis_connect.rb
+has_rdoc: