ealdent-resque-lock 0.1.2 → 1.0.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Chris Wanstrath
+Copyright (c) Chris Wanstrath, Ray Krueger
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,7 +3,7 @@ Resque Lock
 
 A [Resque][rq] plugin. Requires Resque 1.7.0.
 
-If you want only one instance of your job running at a time, extend it
+If you want only one instance of your job queued at a time, extend it
 with this module.
 
 
@@ -19,10 +19,8 @@ For example:
       end
     end
 
-While other UpdateNetworkGraph jobs will be placed on the queue,
-the Locked class will check Redis to see if any others are
-executing with the same arguments before beginning. If another
-is executing the job will be aborted.
+While this job is queued or running, no other UpdateNetworkGraph
+jobs with the same arguments will be placed on the queue.
 
 If you want to define the key yourself you can override the
 `lock` class method in your subclass, e.g.
@@ -41,7 +39,7 @@ If you want to define the key yourself you can override the
     end
 
 The above modification will ensure only one job of class
-UpdateNetworkGraph is running at a time, regardless of the
+UpdateNetworkGraph is queued at a time, regardless of the
 repo_id. Normally a job is locked using a combination of its
 class name and arguments.
 

data/Rakefile

@@ -24,26 +24,3 @@ else
     t.verbose = false
   end
 end
-
-#
-# Gems
-#
-
-begin
-  require 'mg'
-  MG.new("resque-lock.gemspec")
-
-  desc "Build a gem."
-  task :gem => :package
-
-  # Ensure tests pass before pushing a gem.
-  task :gemcutter => :test
-
-  desc "Push a new version to Gemcutter and publish docs."
-  task :publish => :gemcutter do
-    sh "git push origin master --tags"
-  end
-rescue LoadError
-  warn "mg not available."
-  warn "Install it with: gem i mg"
-end

data/lib/resque/plugins/lock.rb

@@ -1,6 +1,6 @@
 module Resque
   module Plugins
-    # If you want only one instance of your job running at a time,
+    # If you want only one instance of your job queued at a time,
     # extend it with this module.
     #
     # For example:
@@ -15,10 +15,10 @@ module Resque
     #   end
     # end
     #
-    # While other UpdateNetworkGraph jobs will be placed on the queue,
-    # the Lock class will check Redis to see if any others are
-    # executing with the same arguments before beginning. If another
-    # is executing the job will be aborted.
+    # No other UpdateNetworkGraph jobs will be placed on the queue,
+    # the QueueLock class will check Redis to see if any others are
+    # queued with the same arguments before queueing. If another
+    # is queued the enqueue will be aborted.
     #
     # If you want to define the key yourself you can override the
     # `lock` class method in your subclass, e.g.
@@ -48,16 +48,11 @@ module Resque
         "lock:#{name}-#{args.to_s}"
       end
 
-      # Convenience method, not used internally.
-      def locked?(*args)
-        Resque.redis.exists(lock(*args))
+      def before_enqueue_lock(*args)
+        Resque.redis.setnx(lock(*args), true)
       end
 
-      # Where the magic happens.
       def around_perform_lock(*args)
-        # Abort if another job has created a lock.
-        return unless Resque.redis.setnx(lock(*args), Time.now.utc)
-
         begin
           yield
         ensure
@@ -69,3 +64,4 @@ module Resque
     end
   end
 end
+

data/test/lock_test.rb

@@ -4,17 +4,21 @@ require 'resque/plugins/lock'
 
 $counter = 0
 
-class Job
-  extend Resque::Plugins::Lock
-  @queue = :test
+class LockTest < Test::Unit::TestCase
+  class Job
+    extend Resque::Plugins::Lock
+    @queue = :lock_test
 
-  def self.perform
-    $counter += 1
-    sleep 1
+    def self.perform
+      raise "Woah woah woah, that wasn't supposed to happen"
+    end
+  end
+
+  def setup
+    Resque.redis.del('queue:lock_test')
+    Resque.redis.del(Job.lock)
   end
-end
 
-class LockTest < Test::Unit::TestCase
   def test_lint
     assert_nothing_raised do
       Resque::Plugin.lint(Resque::Plugins::Lock)
@@ -24,19 +28,13 @@ class LockTest < Test::Unit::TestCase
   def test_version
     major, minor, patch = Resque::Version.split('.')
     assert_equal 1, major.to_i
-    assert minor.to_i >= 7
+    assert minor.to_i >= 17
+    assert Resque::Plugin.respond_to?(:before_enqueue_hooks)
   end
 
   def test_lock
     3.times { Resque.enqueue(Job) }
-    worker = Resque::Worker.new(:test)
-
-    workers = []
-    3.times do
-      workers << Thread.new { worker.process }
-    end
-    workers.each { |t| t.join }
 
-    assert_equal 1, $counter
+    assert_equal 1, Resque.redis.llen('queue:lock_test')
   end
 end

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: ealdent-resque-lock
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
-  - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Chris Wanstrath
+- Ray Krueger
 - Jason Adams
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -04:00
+date: 2011-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
 description: |
   A Resque plugin. If you want only one instance of your job
-  running at a time, extend it with this module.  This version
+  queued at a time, extend it with this module. This version
   stores the timestamp in the lock.
   
   For example:
@@ -78,9 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: A Resque plugin for ensuring only one instance of your job is running at a time.
+summary: A fork by Jason Adams of a Resque plugin for ensuring only one instance of your job is running at a time.
 test_files: []