morlock 0.0.4 → 0.0.6

data/README.markdown

@@ -28,7 +28,7 @@ With Bundler:
 
 	gem 'morlock', :require => 'morlock/rails'
 
-Or in any script after Rails has loaded:
+Or in any script:
 
 	require 'morlock/rails'
 
@@ -41,7 +41,7 @@ Possible usages:
 	handle_failed_lock unless morlock.lock(key) do
 		# We have the lock
 	end
-	
+
 	morlock.lock(key) { # We have the lock } || raise "Unable to lock!"
 
 	morlock.lock(key, :failure => failure_proc) do
@@ -49,3 +49,5 @@ Possible usages:
 	end
 
 	morlock.lock(key, :failure => failure_proc, :success => success_proc)
+
+Morlock doesn't currently do retries, but this could be added in the future.  Feel free to submit a patch!

data/lib/morlock/base.rb

@@ -11,11 +11,18 @@ class Morlock
 
   def lock(key, options = {})
     lock_obtained = @client.add(key, options[:expiration] || DEFAULT_EXPIRATION)
+    puts "Lock for #{key} #{lock_obtained ? "obtained" : "not obtained"}." if options[:verbose]
     yield if lock_obtained && block_given?
     options[:success].call if lock_obtained && options[:success]
     options[:failure].call if !lock_obtained && options[:failure]
     lock_obtained
   ensure
-    @client.delete(key) if lock_obtained
+    if lock_obtained
+      if @client.delete(key)
+        puts "Lock removed for #{key}" if options[:verbose]
+      else
+        puts "Someone else removed the lock for #{key}!" if options[:verbose]
+      end
+    end
   end
 end

data/lib/morlock/gem_client.rb

@@ -1,6 +1,6 @@
 class Morlock
-  class UnknownGemClient < StandardError;
-  end
+  class UnknownGemClient < StandardError; end
+
 
   class GemClient
     GEM_CLIENTS = []
@@ -18,16 +18,16 @@ class Morlock
         end
       end
 
-      raise UnknownGemClient.new("You provided Morlock a memcached client of an unknown type: #{client.class}")
+      raise UnknownGemClient.new("You provided Morlock with a memcached client of an unknown type: #{client.class}")
     end
 
-
     def no_server_error(e)
-      STDERR.puts "WARNING: No memcached server found; Memlock was unable to create a lock. (#{e.message})"
+      STDERR.puts "WARNING: No memcached server was found; Memlock was unable to create a lock. (#{e.message})"
       true
     end
   end
 
+
   class DalliGemClient < GemClient
     def add(key, expiration)
       @client.add(key, 1, expiration)

data/lib/morlock/rails.rb

@@ -12,6 +12,8 @@ class Morlock
             end
           end
         end
+      else
+        Rails.logger.warn "WARNING: Morlock could not load @data in #setup_for_mem_cache_store.  Perhaps we don't yet work with this version of Rails?"
       end
     end
 
@@ -39,7 +41,6 @@ class Morlock
       else
         Rails.logger.warn "WARNING: Morlock detected that you are not using the Rails ActiveSupport::Cache::MemCacheStore.  Rails.morlock will not be setup."
       end
-
     end
 
     config.after_initialize do

data/lib/morlock/version.rb

@@ -1,3 +1,3 @@
 class Morlock
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morlock
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70284346550040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284346550040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70284346549520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284346549520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - pair+andrew+chris@mavenlink.com
@@ -74,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: morlock
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Distributed locking with memcached.