resque-director 2.2.3 → 2.2.4

data/Gemfile

@@ -1,12 +1,13 @@
 source "http://rubygems.org"
 
 gem 'resque', "~> 1.10"
+gem "resque-remora", "~> 0.1.0"
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec", "~> 2.10.0"
+  gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "simplecov", ">= 0"
   gem "yajl-ruby", "~>0.8.2", :platforms => :mri
   gem "json", "~>1.5.3", :platforms => :jruby
 end

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 2.2.3 (2011-09-09)
+
+* Bugfix: remove race condition where it would not have the most up to date list of workers
+
 ## 2.2.2 (2011-09-09)
 
 * Bugfix: ignore wait_time when scaling to be within limits

data/VERSION

@@ -1 +1 @@
-2.2.3
+2.2.4

data/lib/resque-director.rb

@@ -1,11 +1,7 @@
 require 'resque'
+require 'resque-remora'
 
 require 'resque/plugins/director'
 require 'resque/plugins/director/worker_tracker'
 require 'resque/plugins/director/config'
-require 'resque/plugins/director/scaler'
-require 'resque/plugins/director/push_pop'
-
-module Resque
-  include Resque::Plugins::Director::PushPop
-end
+require 'resque/plugins/director/scaler'

data/lib/resque/plugins/director.rb

@@ -1,6 +1,18 @@
 module Resque
   module Plugins
     module Director
+      include Resque::Plugins::Remora
+      
+      def attach_remora
+        {:created_at => Time.now.utc.to_i}
+      end
+
+      def process_remora(queue, job)
+        timestamp = job['created_at']
+        start_time = timestamp.nil? ? Time.now.utc : Time.at(timestamp.to_i).utc
+        after_pop_direct_workers(start_time)
+      end
+        
       def direct(options={})
         Config.setup(options)
         Config.queue = options[:queue]

data/resque-director.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{resque-director}
-  s.version = "2.2.3"
+  s.name = "resque-director"
+  s.version = "2.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Nolan Frausto}]
-  s.date = %q{2011-10-13}
-  s.description = %q{resque plugin for automatically scaling workers based on the amount of time it takes a job to go through the queue and/or the length of the queue }
-  s.email = %q{nrfrausto@gmail.com}
+  s.authors = ["Nolan Frausto"]
+  s.date = "2012-05-05"
+  s.description = "resque plugin for automatically scaling workers based on the amount of time it takes a job to go through the queue and/or the length of the queue "
+  s.email = "nrfrausto@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,51 +26,52 @@ Gem::Specification.new do |s|
     "lib/resque-director.rb",
     "lib/resque/plugins/director.rb",
     "lib/resque/plugins/director/config.rb",
-    "lib/resque/plugins/director/push_pop.rb",
     "lib/resque/plugins/director/scaler.rb",
     "lib/resque/plugins/director/worker_tracker.rb",
     "resque-director.gemspec",
     "spec/redis-test.conf",
     "spec/resque/plugins/director/config_spec.rb",
-    "spec/resque/plugins/director/push_pop_spec.rb",
     "spec/resque/plugins/director/scaler_spec.rb",
     "spec/resque/plugins/director/worker_tracker_spec.rb",
     "spec/resque/plugins/director_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/jobs.rb"
   ]
-  s.homepage = %q{http://github.com/frausto/resque-director}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{A resque plugin for automatically scaling workers}
+  s.homepage = "http://github.com/frausto/resque-director"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "A resque plugin for automatically scaling workers"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<resque>, ["~> 1.10"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<resque-remora>, ["~> 0.1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<yajl-ruby>, ["~> 0.8.2"])
       s.add_development_dependency(%q<json>, ["~> 1.5.3"])
     else
       s.add_dependency(%q<resque>, ["~> 1.10"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<resque-remora>, ["~> 0.1.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, ["~> 0.8.2"])
       s.add_dependency(%q<json>, ["~> 1.5.3"])
     end
   else
     s.add_dependency(%q<resque>, ["~> 1.10"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<resque-remora>, ["~> 0.1.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, ["~> 0.8.2"])
     s.add_dependency(%q<json>, ["~> 1.5.3"])
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: resque-director
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 3
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors: 
 - Nolan Frausto
@@ -15,117 +10,96 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2012-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: resque
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 10
         version: "1.10"
-  version_requirements: *id001
-  name: resque
+  type: :runtime
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: resque-remora
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  version_requirements: *id002
-  name: rspec
+        version: 0.1.0
+  type: :runtime
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id003
-  name: bundler
+        version: 2.10.0
+  type: :development
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: bundler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+        version: 1.1.3
+  type: :development
+  prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: jeweler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.4
+  type: :development
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: simplecov
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id005
-  name: rcov
+  type: :development
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: yajl-ruby
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
         version: 0.8.2
-  version_requirements: *id006
-  name: yajl-ruby
+  type: :development
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: json
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
         version: 1.5.3
-  version_requirements: *id007
-  name: json
+  type: :development
   prerelease: false
+  version_requirements: *id008
 description: "resque plugin for automatically scaling workers based on the amount of time it takes a job to go through the queue and/or the length of the queue "
 email: nrfrausto@gmail.com
 executables: []
@@ -145,13 +119,11 @@ files:
 - lib/resque-director.rb
 - lib/resque/plugins/director.rb
 - lib/resque/plugins/director/config.rb
-- lib/resque/plugins/director/push_pop.rb
 - lib/resque/plugins/director/scaler.rb
 - lib/resque/plugins/director/worker_tracker.rb
 - resque-director.gemspec
 - spec/redis-test.conf
 - spec/resque/plugins/director/config_spec.rb
-- spec/resque/plugins/director/push_pop_spec.rb
 - spec/resque/plugins/director/scaler_spec.rb
 - spec/resque/plugins/director/worker_tracker_spec.rb
 - spec/resque/plugins/director_spec.rb
@@ -170,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2861306429834219019
       segments: 
       - 0
       version: "0"
@@ -179,14 +151,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A resque plugin for automatically scaling workers

data/lib/resque/plugins/director/push_pop.rb

@@ -1,37 +0,0 @@
-module Resque
-  module Plugins
-    module Director
-      module PushPop
-
-        def self.included(base)
-          base.class_eval do
-            alias_method :original_pop, :pop
-            alias_method :original_push, :push
-            extend ClassMethods
-          end
-        end
-
-        module ClassMethods 
-          def push(queue, item)
-            item[:created_at] = Time.now.utc.to_i if item.respond_to?(:[]=)
-            original_push queue, item
-          end
-          
-          def pop(queue)
-            job = original_pop(queue)
-            begin 
-              timestamp = job['created_at']
-              start_time = timestamp.nil? ? Time.now.utc : Time.at(timestamp.to_i).utc
-              job_class = constantize(job['class'])
-              if job_class && job_class.respond_to?(:after_pop_direct_workers) && job_class.respond_to?(:direct)
-                job_class.after_pop_direct_workers(start_time)
-              end
-            rescue
-            end
-            job
-          end
-        end
-      end
-    end
-  end
-end

data/spec/resque/plugins/director/push_pop_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe Resque::Plugins::Director::PushPop do
-  subject { Resque::Plugins::Director::PushPop }
-  
-  before do
-    Resque::Plugins::Director::Config.queue = "test"
-    @now = Time.now
-    Time.stub(:now => @now)
-    @timestamp = @now.utc.to_i
-  end
-  
-  describe "#push" do
-    it "should add the start timestamp to the end of the job" do
-      Resque.enqueue(TestJob, "arg1")
-      Resque.redis.lindex("queue:test",0).should =~ /^\{.*\"created_at\":#{@timestamp}/
-    end
-  end
-  
-  describe "#pop" do
-    it "should direct workers using the timestamp" do
-      Resque.enqueue(TestJob, "arg1")
-      expected_time = Time.at(@timestamp).utc
-      TestJob.should_receive(:after_pop_direct_workers).with(expected_time)
-      Resque.pop("test").should == {"args"=>["arg1"], "class"=>"TestJob", "created_at"=>@timestamp}
-    end
-    
-    it "should direct workers with current time if no start time" do
-      Resque.should_receive(:original_pop).and_return({'args' => [], 'class' => 'TestJob'})
-      TestJob.should_receive(:after_pop_direct_workers).with(@now)
-      Resque.pop("test").should == {"args"=>[], "class"=>"TestJob"}
-    end
-    
-    it "should not direct workers if the job is not directed" do
-      Resque.enqueue(NonDirectedTestJob, "arg1")
-      NonDirectedTestJob.should_not_receive(:after_pop_direct_workers)
-      Resque.pop("non_directed").should include({"args"=>["arg1"], "class"=>"NonDirectedTestJob"})
-    end
-    
-    it "should return the job properly if an exception is thrown in the direction logic" do
-      Resque.enqueue(TestJob, "arg1")
-      TestJob.should_receive(:after_pop_direct_workers).and_throw(:Exception)
-      Resque.pop("test").should include({"args"=>["arg1"], "class"=>"TestJob"})
-    end
-  end
-end