zfben_rails_rake 0.0.16 → 0.0.17

data/lib/zfben_rails_rake/tasks/resque.rb

@@ -1,44 +1,53 @@
 if File.exists?(ROOT + '/config/initializers/resque.rb')
+  require ROOT + '/config/initializers/resque.rb'
+  require 'resque/tasks'
+  if defined?(Resque::Scheduler)
+    require 'resque_scheduler/tasks'
+  end
   namespace :resque do
-    desc 'Start Resque for debug'
-    task :debug => :environment do
-      require ROOT + '/config/initializers/resque.rb'
-      worker = Resque::Worker.new('*')
-      worker.work
+    task :setup => :environment
+
+    task :_work => ['resque:preload', 'resque:setup'] do
+      work = Resque::Worker.new('*')
+      Process.daemon(true)
+      File.open(ROOT + '/tmp/resque.pid', 'w') { |f| f << work.pid }
+      work.work(5)
+    end
+
+    if defined?(Resque::Scheduler)
+      task :_scheduler => 'resque:setup' do
+        Process.daemon(true)
+        File.open(ROOT + '/tmp/scheduler.pid', 'w') { |f| f << Process.pid.to_s }
+        Resque::Scheduler.run
+      end
     end
 
     desc 'Start Resque daemon worker'
     task :start => 'resque:stop' do
-      RAILS_ENV = 'production'
-      Rake::Task[:environment].execute
-      work = fork do
-        worker = Resque::Worker.new('*')
-        Process.daemon true
-        File.open(ROOT + '/tmp/resque.pid', 'w') { |f| f << Process.pid.to_s }
-        worker.work
+      sys "bash -c 'RAILS_ENV=production rake resque:_work'"
+      if defined?(Resque::Scheduler)
+        sys "bash -c 'RAILS_ENV=production rake resque:_scheduler'"
       end
-      print "Resque worker running at #{work}\n"
     end
 
     desc 'Stop Resque worker'
     task :stop do
-      path = ROOT + '/tmp/resque.pid'
-      if File.exists?(path)
-        sys "kill `cat #{path}`;rm #{path}"
+      ['resque', 'scheduler'].each do |name|
+        path = ROOT + '/tmp/' + name + '.pid'
+        if File.exists?(path)
+          sys "kill `cat #{path}`;rm #{path}"
+        end
       end
     end
 
     desc 'Clear Resque data'
     task :clear do
-      require ROOT + '/config/initializers/resque.rb'
       Resque.redis.keys('*').each{ |k| Resque.redis.del k }
     end
 
     desc 'Start Resque web interface'
     task :web do
-      require ROOT + '/config/initializers/resque.rb'
-      require 'resque/server'
-      Resque::Server.run!
+      sys "RAILS_ENV=production resque-web #{ROOT}/config/initializers/resque.rb"
     end
   end
 end

data/zfben_rails_rake.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'zfben_rails_rake'
-  s.version     = '0.0.16'
+  s.version     = '0.0.17'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Ben']
   s.email       = ['ben@zfben.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_rails_rake
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000 Z
+date: 2011-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &20644000 !ruby/object:Gem::Requirement
+  requirement: &8563300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20644000
+  version_requirements: *8563300
 description: ''
 email:
 - ben@zfben.com