resque-pause 0.0.3 → 0.0.4

data/Changelog.md

@@ -0,0 +1,26 @@
+Changelog
+=========
+
+### 0.0.4
+
+* improvement on job reserve to prevent fork worker when queue is paused
+* bug fix for the gem work with resque-restriction gem, and other which re-implements job reserve method
+* changing the require for load resque-web integration to
+
+```ruby
+    require 'resque-pause/server'
+```
+
+### 0.0.3
+
+* bug fix on re-enqueue the job
+* improvement on resque-web integration urls
+
+### 0.0.2
+
+* updating documentation
+* generating a good package for rubygems
+
+### 0.0.1
+
+* version was removed from rubygems, bad package

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    resque-pause (0.0.3)
+    resque-pause (0.0.4)
       resque (>= 1.9.10)
 
 GEM

data/README.md

@@ -40,7 +40,7 @@ Resque-Web integration
 You have to load ResquePause to enable the Pause tab.
 
 ```ruby
-    require 'resque_pause'
+    require 'resque-pause/server'
 ```
 
 Customise & Extend

data/lib/resque-pause.rb

@@ -1,3 +1,4 @@
 require 'resque'
 require File.expand_path(File.join('resque_pause_helper'), File.dirname(__FILE__))
-require File.expand_path(File.join('resque', 'plugins', 'pause'), File.dirname(__FILE__))
+require File.expand_path(File.join('resque-pause', 'plugins', 'pause'), File.dirname(__FILE__))
+require File.expand_path(File.join('resque-pause', 'job'), File.dirname(__FILE__))

data/lib/resque-pause/job.rb

@@ -0,0 +1,13 @@
+module Resque
+  class Job
+    class <<self
+      alias_method :origin_before_pause_reserve, :reserve
+
+      def reserve(queue)
+        return nil if ResquePauseHelper.paused?(queue)
+        origin_before_pause_reserve(queue)
+      end
+
+    end
+  end
+end

data/lib/{resque_pause → resque-pause}/server.rb

@@ -1,3 +1,7 @@
+require 'resque'
+require 'resque/server'
+require File.expand_path(File.join('../','resque_pause_helper'), File.dirname(__FILE__))
+
 # Extends Resque Web Based UI.
 # Structure has been borrowed from ResqueScheduler.
 module ResquePause

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module Pause
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/spec/{resque → resque-pause}/plugins/pause_spec.rb

@@ -13,10 +13,11 @@ describe Resque::Plugins::Pause do
     expect { Resque::Plugin.lint(Resque::Plugins::Pause) }.to_not raise_error
   end
 
-  it "should use at least resque version 1.8.0" do
+  it "should use at least resque version 1.9.10" do
     major, minor, patch = Resque::Version.split('.')
     major.to_i.should == 1
-    minor.to_i.should >= 8
+    minor.to_i.should >= 9
+    patch.to_i.should >= 10 if minor.to_i  == 9
   end
 
   it "should execute the job when queue is not paused" do
@@ -27,21 +28,33 @@ describe Resque::Plugins::Pause do
   end
 
   it "should not execute the job when queue is paused" do
+    Resque.enqueue(PauseJob)
+    Resque.size('test').should == 1
+
+    job = Resque.reserve('test')
+    ResquePauseHelper.pause('test')
+    job.perform
+
+    Resque.size('test').should == 1
+  end
+
+  it "should not reserve the job when queue is paused" do
     ResquePauseHelper.pause('test')
     Resque.enqueue(PauseJob)
     PauseJob.should_not_receive(:perform)
 
-    Resque.reserve('test').perform
+    Resque.reserve('test').should be_nil
   end
 
   it "should not change queued jobs when queue is paused" do
-    ResquePauseHelper.pause('test')
     Resque.enqueue(PauseJob, 1)
     Resque.enqueue(PauseJob, 2)
     Resque.enqueue(PauseJob, 3)
     jobs = Resque.redis.lrange('queue:test', 0, 2)
 
-    Resque.reserve('test').perform
+    job = Resque.reserve('test')
+    ResquePauseHelper.pause('test')
+    job.perform
 
     remaining_jobs = Resque.redis.lrange('queue:test', 0, 2)
     jobs.should == remaining_jobs
@@ -50,8 +63,9 @@ describe Resque::Plugins::Pause do
   it "should back to execute the job when queue is unpaused" do
     Resque.enqueue(PauseJob)
 
+    job = Resque.reserve('test')
     ResquePauseHelper.pause('test')
-    Resque.reserve('test').perform
+    job.perform
     Resque.size('test').should == 1
 
     ResquePauseHelper.unpause('test')

data/spec/resque-web_spec.rb

@@ -67,7 +67,7 @@ describe ResquePause::Server do
 
   it "should return static files" do
     get "/pause/public/pause.js"
-    last_response.body.should == File.read(File.expand_path('../lib/resque_pause/server/public/pause.js', File.dirname(__FILE__)))
+    last_response.body.should == File.read(File.expand_path('../lib/resque-pause/server/public/pause.js', File.dirname(__FILE__)))
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Wandenberg Peixoto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 -03:00
+date: 2011-06-30 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,22 +92,23 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Changelog.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - lib/resque-pause.rb
-- lib/resque/plugins/pause.rb
-- lib/resque_pause.rb
-- lib/resque_pause/server.rb
-- lib/resque_pause/server/public/pause.js
-- lib/resque_pause/server/views/pause.erb
+- lib/resque-pause/job.rb
+- lib/resque-pause/plugins/pause.rb
+- lib/resque-pause/server.rb
+- lib/resque-pause/server/public/pause.js
+- lib/resque-pause/server/views/pause.erb
 - lib/resque_pause_helper.rb
 - lib/version.rb
 - resque-pause.gemspec
 - spec/redis-test.conf
+- spec/resque-pause/plugins/pause_spec.rb
 - spec/resque-web_spec.rb
-- spec/resque/plugins/pause_spec.rb
 - spec/resque_pause_helper_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/resque_pause.rb

@@ -1,4 +0,0 @@
-require 'resque'
-require 'resque/server'
-require File.expand_path(File.join('resque_pause_helper'), File.dirname(__FILE__))
-require File.expand_path(File.join('resque_pause', 'server'), File.dirname(__FILE__))