workless 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ea1dd3f5f583daec32776ca0f8b27844c8605ffb
+  data.tar.gz: 4b4c6e03730f39e7f7e5163bb2a1b76571906a25
+SHA512:
+  metadata.gz: 3f1cce18096c12ac5076792ae9aa2c6f63a67b097dfe01192e9a3439e334a0c1a928c84f2e2cf172237c86a033be747a97fb34118ab9b9cf495d1c219cbee8b8
+  data.tar.gz: 220d5ae97dd5b358efb3c6a7f38c1a6b2a5a20b2df6ce99164bb112bb78127c546e11be8456c9bf326b43e407acad3de004dd5ab94191ed6ed7de434df06d072

data/README.md

@@ -11,6 +11,7 @@ By adding the gem to your project and configuring our Heroku app with some confi
 
 ## Updates
 
+* Version 1.2.2 includes after_commit fix by @collectiveip
 * Version 1.2.1 includes support for Rails 4 & DJ 4 by @florentmorin
 * Version 1.2.0 includes new support for Sequel by @davidakachaos
 * Version 1.1.3 includes changes by @radanskoric to reduce number of heroku api calls
@@ -54,7 +55,7 @@ gem "delayed_job_active_record"
 gem "workless", "~> 1.1.3"
 </pre>
 
-If you don't specify delayed_job in your Gemfile workless will bring it in, most likly the latest version (3.0.1)
+If you don't specify delayed_job in your Gemfile workless will bring it in, most likely the latest version (3.0.1)
 
 Add your Heroku app name / [API key](https://devcenter.heroku.com/articles/authentication) as config vars to your Heroku instance.
 
@@ -84,7 +85,7 @@ Delayed::Job.scaler = :heroku_cedar
 Delayed::Job.scaler = :local
 </pre>
 
-The local scaler uses @adamwiggins rush library http://github.com/adamwiggins/rush to start and stop workers on a local machine
+The local scaler uses @adamwiggins rush library http://github.com/adamwiggins/rush to start and stop workers on a local machine. The local scaler also relies on script/delayed_job (which in turn requires the daemon gem). If you have been using foreman to run your workers, go back and see the delayed_job [setup instructions](https://github.com/collectiveidea/delayed_job/blob/master/README.md). 
 
 The heroku scaler works on the Aspen and Bamboo stacks while the heroku_cedar scaler only works on the new Cedar stack.
 
@@ -100,6 +101,13 @@ heroku config:add WORKLESS_WORKERS_RATIO=50
 
 In this example, it will scale up to a maximum of 10 workers, firing up 1 worker for every 50 jobs on the queue. The minimum will be 0 workers, but you could set it to a higher value if you want.
 
+## How does Workless work?
+
+- `Delayed::Workless::Scaler` is mixed into the `Delayed::Job` class, which adds a bunch of callbacks to it.
+- When a job is created on the database, a `create` callback starts a worker.
+- The worker runs the job, which removes it from the database.
+- A `destroy` callback stops the worker.
+
 ## Note on Patches/Pull Requests
  
 * Please fork the project.

data/lib/workless/scaler.rb

@@ -1,20 +1,19 @@
-require 'workless/scalers/heroku'
-require 'workless/scalers/heroku_cedar'
-require 'workless/scalers/local'
-require 'workless/scalers/null'
-
 module Delayed
   module Workless
     module Scaler
 
+      autoload :Heroku,      "workless/scalers/heroku"
+      autoload :HerokuCedar, "workless/scalers/heroku_cedar"
+      autoload :Local,       "workless/scalers/local"
+      autoload :Null,        "workless/scalers/null"
+
       def self.included(base)
         base.send :extend, ClassMethods
         if base.to_s =~ /ActiveRecord/
           base.class_eval do
-            after_commit "self.class.scaler.down", :on => :destroy
+            after_commit "self.class.scaler.down", :on => [:destroy, :update], :if => Proc.new {|r| r.destroyed? or !r.failed_at.nil? }
             after_commit "self.class.scaler.up", :on => :create
-            after_commit "self.class.scaler.down", :on => :update, :unless => Proc.new {|r| r.failed_at.nil? }
-          end
+          end          
         elsif base.to_s =~ /Sequel/
           base.send(:define_method, 'after_destroy') do
             super
@@ -35,7 +34,6 @@ module Delayed
             after_update "self.class.scaler.down", :unless => Proc.new {|r| r.failed_at.nil? }
           end
         end
-
       end
 
       module ClassMethods

data/lib/workless/scalers/local.rb

@@ -3,14 +3,13 @@ require 'rush'
 module Delayed
   module Workless
     module Scaler
-
       class Local < Base
-        
-        def executable_prefix
+
+        def self.executable_prefix
           if defined? Delayed::Compatibility.executable_prefix
             Delayed::Compatibility.executable_prefix
           else
-            "script"
+            'script'
           end
         end
 
@@ -23,7 +22,7 @@ module Delayed
         end
 
         def self.down
-          unless jobs.count > 0 and workers > 0
+          if self.workers > 0 and jobs.count == 0
             Rush::Box.new[Rails.root].bash("#{executable_prefix}/delayed_job stop -i workless", :background => true)
           end
           true
@@ -32,9 +31,7 @@ module Delayed
         def self.workers
           Rush::Box.new.processes.filter(:cmdline => /delayed_job start -i workless|delayed_job.workless/).size
         end
-
       end
-  
     end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workless
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - lostboy
@@ -14,81 +13,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rush
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 description: Extension to Delayed Job to enable workers to scale up when needed
@@ -111,26 +100,25 @@ files:
 - README.md
 homepage: http://github.com/lostboy/workless
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use delayed job workers only when theyre needed on Heroku
 test_files: []