resque-forker 2.0.0 → 2.1.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+2011-02-07 v2.1.0 No arguments necessary for resque-ctl
+
+Added some sane defaults to allow the command to run without command line
+arguments. For example, in a rails application development is easy (taf2):
+
+  $ bundle exec resque-ctl
+
+
 2011-02-02 v2.0 Now, with resque-ctl
 
 You can now run workers from the command line

data/lib/resque/forker/version.rb

@@ -1,5 +1,5 @@
 module Resque
   class Forker
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/resque/master.rb

@@ -64,7 +64,7 @@ module Resque
 
     def initialize(path)
       @config_path = path
-      @options = {}
+      @options = Master.defaults
     end
 
     def self.process(config_path)
@@ -74,27 +74,35 @@ module Resque
     end
 
     def run
-      eval(File.read(@config_path), binding)
+      self.instance_eval(File.read(@config_path), @config_path, 0)
+    rescue => e
+      raise "Config error: '#{e.message}' at #{e.backtrace[0].gsub(/:in `run'/,'')}"
     end
 
     def self.setup(options)
-      puts "running setup with: #{options.inspect}"
+      options[:runpath] = Dir.pwd if options[:runpath].nil?
 
       Resque.setup do |forker|
-        puts "calling resque setup: #{options.inspect}"
         if options[:preload_app]
-          $:.unshift options[:runpath] # Makes 1.9.2 happy
-          require options[:runpath] + "/config/environment"
-          forker.logger   = Rails.logger
+          begin
+            $:.unshift options[:runpath] # Makes 1.9.2 happy
+            require options[:runpath] + "/config/environment"
+            puts "Loaded Rails: #{Rails.env}"
+            forker.logger   = Rails.logger
+          rescue => e
+            STDERR.puts e.message
+            STDERR.puts e.backtrace.join("\n")
+            raise e
+          end
         end
 
-        File.open(options[:pidfile],"wb") {|f| f << Process.pid }
-        forker.workload = options[:worker_queues] * options[:worker_processes].to_i
+        File.open(options[:pidfile],"wb") {|f| f << Process.pid } if options[:pidfile]
+        forker.workload = options[:worker_queues] * options[:worker_processes].to_i if options[:worker_queues] && options[:worker_processes]
         forker.options.interval = options[:work_interval].to_i if options.key?(:work_interval)
       end
 
       Resque.teardown do|forker|
-        File.unlink(options[:pidfile]) if File.exist?(options[:pidfile])
+        File.unlink(options[:pidfile]) if options[:pidfile] && File.exist?(options[:pidfile]) 
       end
 
       Resque.before_first_fork do
@@ -212,9 +220,12 @@ module Resque
         :logfile => nil,
         :stderr_path => "/dev/null",
         :stdout_path => "/dev/null",
-        :runpath => "/",
         :pidfile => nil,
-        :daemon => false
+        :daemon => false,
+        :preload_app => true,
+        :worker_queues => ['*'],
+        :worker_processes => 1,
+        :work_interval => 5
       }
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-forker
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ licenses: []
 post_install_message: ""
 rdoc_options: 
 - --title
-- Resque Forker  2.0.0
+- Resque Forker  2.1.0
 - --main
 - README.rdoc
 - --webcvs