resque-concurrent-restriction 0.5.4 → 0.5.5

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+#  - jruby-18mode # JRuby in 1.8 mode
+#  - jruby-19mode # JRuby in 1.9 mode
+#  - rbx-18mode
+#  - rbx-19mode
+script: bundle exec rspec spec

data/lib/resque/plugins/concurrent_restriction/concurrent_restriction_job.rb

@@ -130,7 +130,7 @@ module Resque
         "concurrent.runnable#{key}"
       end
 
-      # Encodes the job intot he restriction queue
+      # Encodes the job into the restriction queue
       def encode(job)
         item = {:queue => job.queue, :payload => job.payload}
         Resque.encode(item)
@@ -189,7 +189,6 @@ module Resque
         decrement_queue_count(queue)
 
         # increment by one to indicate that we are running
-        # do this before update_queues_available so that the current queue gets cleaned
         increment_running_count(tracking_key) if str
 
         decode(str)
@@ -226,10 +225,15 @@ module Resque
         return restricted
       end
 
+      # The value in redis is the number of jobs currently running
+      # If we increment past that, we are restricted.  Incrementing is only done
+      # after the job is cleared for execution due to checking the runnable
+      # state, and post increment we setup runnable for future jobs based on
+      # the new "restricted" value  
       def increment_running_count(tracking_key)
         count_key = running_count_key(tracking_key)
         value = Resque.redis.incr(count_key)
-        restricted = (value > concurrent_limit)
+        restricted = (value >= concurrent_limit)
         mark_runnable(tracking_key, !restricted)
         return restricted
       end
@@ -351,7 +355,7 @@ module Resque
             end
             trying = false
           else
-            sleep (rand(1000) * 0.0001 * exp_backoff)
+            sleep(rand(1000) * 0.0001 * exp_backoff)
             exp_backoff *= 2
           end
         end
@@ -391,7 +395,7 @@ module Resque
         lock_key = lock_key(tracking_key)
 
         run_atomically(lock_key) do
-
+          
           # since we don't have a lock when we get the runnable,
           # we need to check it again
           still_runnable = runnable?(tracking_key, queue)

data/lib/resque/plugins/concurrent_restriction/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module ConcurrentRestriction
-      VERSION = "0.5.4"
+      VERSION = "0.5.5"
     end
   end
 end

data/resque-concurrent-restriction.gemspec

@@ -21,7 +21,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("resque", '~> 1.10')
+
+  s.add_development_dependency('json')
   s.add_development_dependency('rspec', '~> 2.5')
   s.add_development_dependency('awesome_print')
 
+  # Needed for testing newer resque on ruby 1.8.7
+  s.add_development_dependency('json')
+
 end

data/spec/concurrent_restriction_job_spec.rb

@@ -61,7 +61,7 @@ describe Resque::Plugins::ConcurrentRestriction do
 
     it "should encode jobs correctly" do
       job = Resque::Job.new("somequeue", {"class" => "RestrictionJob", "args" => [1, 2, 3]})
-      ConcurrentRestrictionJob.encode(job).should == '{"queue":"somequeue","payload":{"class":"RestrictionJob","args":[1,2,3]}}'
+      JSON.parse(ConcurrentRestrictionJob.encode(job)).should == JSON.parse('{"queue":"somequeue","payload":{"class":"RestrictionJob","args":[1,2,3]}}')
     end
 
     it "should decode jobs correctly" do
@@ -177,23 +177,30 @@ describe Resque::Plugins::ConcurrentRestriction do
     end
 
     it "should increment running count" do
-      ConcurrentRestrictionJob.stub!(:concurrent_limit).and_return(1)
+      ConcurrentRestrictionJob.stub!(:concurrent_limit).and_return(2)
       ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 0
       ConcurrentRestrictionJob.increment_running_count(ConcurrentRestrictionJob.tracking_key).should == false
       ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 1
       ConcurrentRestrictionJob.increment_running_count(ConcurrentRestrictionJob.tracking_key).should == true
       ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 2
+      ConcurrentRestrictionJob.increment_running_count(ConcurrentRestrictionJob.tracking_key).should == true
+      ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 3
     end
 
     it "should decrement running count" do
-      ConcurrentRestrictionJob.stub!(:concurrent_limit).and_return(1)
-      ConcurrentRestrictionJob.set_running_count(ConcurrentRestrictionJob.tracking_key, 2)
+      ConcurrentRestrictionJob.stub!(:concurrent_limit).and_return(2)
+      ConcurrentRestrictionJob.set_running_count(ConcurrentRestrictionJob.tracking_key, 3)
       ConcurrentRestrictionJob.decrement_running_count(ConcurrentRestrictionJob.tracking_key).should == true
-      ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 1
+      ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 2
       ConcurrentRestrictionJob.decrement_running_count(ConcurrentRestrictionJob.tracking_key).should == false
-      ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 0
+      ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 1
       ConcurrentRestrictionJob.decrement_running_count(ConcurrentRestrictionJob.tracking_key).should == false
       ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 0
+    end
+
+    it "should not decrement running count below 0" do
+      ConcurrentRestrictionJob.stub!(:concurrent_limit).and_return(1)
+      ConcurrentRestrictionJob.set_running_count(ConcurrentRestrictionJob.tracking_key, 0)
       ConcurrentRestrictionJob.decrement_running_count(ConcurrentRestrictionJob.tracking_key).should == false
       ConcurrentRestrictionJob.running_count(ConcurrentRestrictionJob.tracking_key).should == 0
     end

data/spec/redis-test.conf

@@ -21,7 +21,7 @@ daemonize yes
 pidfile ./redis.pid
 
 # Accept connections on the specified port, default is 6379
-port 9736
+port 6379
 
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for incoming connections.

data/spec/resque_worker_extensions_spec.rb

@@ -143,41 +143,78 @@ describe Resque::Plugins::ConcurrentRestriction::Worker do
 
   it "should run multiple jobs concurrently" do
     7.times {|i| Resque.enqueue(MultipleConcurrentRestrictionJob, i) }
-
+  
     7.times do
        unless child = fork
-         Resque.redis = 'localhost:9736'
+         Resque.redis.client.connect
          run_resque_queue('*')
          exit!
        end
     end
     sleep 0.25
-
+  
     MultipleConcurrentRestrictionJob.total_run_count.should == 4
     MultipleConcurrentRestrictionJob.running_count(MultipleConcurrentRestrictionJob.tracking_key).should == 4
     MultipleConcurrentRestrictionJob.restriction_queue(MultipleConcurrentRestrictionJob.tracking_key, :normal).size.should == 3
-
+  
     Process.waitall
-
+  
     3.times do
        unless child = fork
-         Resque.redis = 'localhost:9736'
+         Resque.redis.client.connect
          run_resque_queue('*')
          exit!
        end
     end
     sleep 0.25
-
+  
     MultipleConcurrentRestrictionJob.total_run_count.should == 7
     MultipleConcurrentRestrictionJob.running_count(MultipleConcurrentRestrictionJob.tracking_key).should == 3
     MultipleConcurrentRestrictionJob.restriction_queue(MultipleConcurrentRestrictionJob.tracking_key, :normal).size.should == 0
-
+  
     Process.waitall
-
+  
     MultipleConcurrentRestrictionJob.running_count(MultipleConcurrentRestrictionJob.tracking_key).should == 0
     MultipleConcurrentRestrictionJob.total_run_count.should == 7
   end
 
+  it "should run only one concurrent job" do
+    5.times {|i| Resque.enqueue(OneConcurrentRestrictionJob, i) }
+    5.times do
+      unless child = fork
+        Resque.redis.client.connect
+        run_resque_queue('*')
+        exit!
+      end
+    end
+    sleep 0.25
+
+    OneConcurrentRestrictionJob.total_run_count.should == 1
+    OneConcurrentRestrictionJob.running_count(OneConcurrentRestrictionJob.tracking_key).should == 1
+    OneConcurrentRestrictionJob.restriction_queue(OneConcurrentRestrictionJob.tracking_key, :normal).size.should == 4
+
+    Process.waitall
+
+    2.times do
+      unless child = fork
+        Resque.redis.client.connect
+        run_resque_queue('*')
+        exit!
+      end
+    end
+    sleep 0.25
+
+    OneConcurrentRestrictionJob.total_run_count.should == 2
+    OneConcurrentRestrictionJob.running_count(OneConcurrentRestrictionJob.tracking_key).should == 1
+    OneConcurrentRestrictionJob.restriction_queue(OneConcurrentRestrictionJob.tracking_key, :normal).size.should == 3
+
+    Process.waitall
+
+    OneConcurrentRestrictionJob.running_count(OneConcurrentRestrictionJob.tracking_key).should == 0
+    OneConcurrentRestrictionJob.total_run_count.should == 2
+
+  end
+
   it "should decrement execution number when concurrent job fails" do
     run_resque_job(ConcurrentRestrictionJob, "bad")
     Resque.redis.lrange("failed", 0, -1).size.should == 1

data/spec/spec_helper.rb

@@ -1,26 +1,33 @@
 require 'rspec'
 require 'ap'
 
-spec_dir = File.dirname(File.expand_path(__FILE__))
-REDIS_CMD = "redis-server #{spec_dir}/redis-test.conf"
-
-puts "Starting redis for testing at localhost:9736..."
-puts `cd #{spec_dir}; #{REDIS_CMD}`
-
-require 'resque'
-Resque.redis = 'localhost:9736'
 require 'resque-concurrent-restriction'
 
-# Schedule the redis server for shutdown when tests are all finished.
-at_exit do
-  pid = File.read("#{spec_dir}/redis.pid").to_i rescue nil
-  system ("kill -9 #{pid}") if pid != 0
-  File.delete("#{spec_dir}/redis.pid") rescue nil
-  File.delete("#{spec_dir}/redis-server.log") rescue nil
-  File.delete("#{spec_dir}/dump.rdb") rescue nil
+# No need to start redis when running in Travis
+unless ENV['CI']
+
+  begin
+    Resque.queues
+  rescue Errno::ECONNREFUSED
+    spec_dir = File.dirname(File.expand_path(__FILE__))
+    REDIS_CMD = "redis-server #{spec_dir}/redis-test.conf"
+    
+    puts "Starting redis for testing at localhost..."
+    puts `cd #{spec_dir}; #{REDIS_CMD}`
+    
+    # Schedule the redis server for shutdown when tests are all finished.
+    at_exit do
+      puts 'Stopping redis'
+      pid = File.read("#{spec_dir}/redis.pid").to_i rescue nil
+      system ("kill -9 #{pid}") if pid.to_i != 0
+      File.delete("#{spec_dir}/redis.pid") rescue nil
+      File.delete("#{spec_dir}/redis-server.log") rescue nil
+      File.delete("#{spec_dir}/dump.rdb") rescue nil
+    end
+  end
+  
 end
 
-
 ##
 # Helper to perform job classes
 #
@@ -160,3 +167,15 @@ class MultipleConcurrentRestrictionJob
     sleep 0.5
   end
 end
+
+class OneConcurrentRestrictionJob
+  extend RunCountHelper
+  extend Resque::Plugins::ConcurrentRestriction
+  concurrent 1
+
+  @queue = 'normal'
+
+  def self.perform(*args)
+    sleep 0.5
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-concurrent-restriction
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000 -04:00
-default_executable: 
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2168987840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,31 @@ dependencies:
         version: '1.10'
   type: :runtime
   prerelease: false
-  version_requirements: *2168987840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168987340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +53,31 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2168987340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2168986960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168986960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A resque plugin for limiting how many of a specific job can run concurrently
 email:
 - matt@conwaysplace.com
@@ -53,6 +99,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -67,7 +114,6 @@ files:
 - spec/resque_worker_extensions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/wr0ngway/resque-concurrent-restriction
 licenses: []
 post_install_message: 
@@ -88,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: resque-concurrent-restriction
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A resque plugin for limiting how many of a specific job can run concurrently
@@ -98,3 +144,4 @@ test_files:
 - spec/resque_worker_extensions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: