backburner 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Version 0.4.1 (June 28 2013)
+
+ * FIX #43 Properly support CLI options and smart load the app environment.
+
 ## Version 0.4.0 (June 28 2013)
 
 NOTE: This is the start of working with @bradgessler to improve backburner and merge with quebert

data/README.md

@@ -238,10 +238,11 @@ $ QUEUES=newsletter-sender,push-notifier rake backburner:work
 You can also run the backburner binary for a convenient worker:
 
 ```
-bundle exec backburner newsletter-sender,push-notifier -d -P /var/run/backburner.pid -l /var/log/backburner.log
+bundle exec backburner -q newsletter-sender,push-notifier -d -P /var/run/backburner.pid -l /var/log/backburner.log
 ```
 
-This will daemonize the worker and store the pid and logs automatically.
+This will daemonize the worker and store the pid and logs automatically. For Rails and Padrino, the environment should
+load automatically. For other cases, use the `-r` flag to specify a file to require.
 
 ### Persistence
 

data/bin/backburner

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'backburner'
-require 'dante'
+require 'backburner/cli'
 
 # bundle exec backburner foo,bar
-queues = (ARGV.first ? ARGV.first.split(',') : nil) rescue nil
-Dante.run('backburner') do |opts|
-  Backburner.work(queues)
-end
+Backburner::CLI.start(ARGV)

data/lib/backburner/cli.rb

@@ -0,0 +1,52 @@
+require 'dante'
+
+module Backburner
+  class CLI
+
+    def self.start(args)
+      runner = Dante::Runner.new('backburner')
+      runner.description = "Execute a backburner worker process"
+      runner.with_options do |opts|
+        opts.on("-r", "--require PATH", String, "The path to load as the environment.") do |req|
+          options[:require] = req
+        end
+        opts.on("-q", "--queues PATH", String, "The specific queues to work.") do |queues|
+          options[:queues] = queues
+        end
+      end
+      runner.execute do |opts|
+        queues = (opts[:queues] ? opts[:queues].split(',') : nil) rescue nil
+        load_enviroment(opts[:require])
+        p queues
+        Backburner.work(queues)
+      end
+    end
+
+    protected
+
+      def self.load_enviroment(file = nil)
+        file ||= "."
+        if File.directory?(file) && File.exists?(File.expand_path("#{file}/config/environment.rb"))
+          require "rails"
+          require File.expand_path("#{file}/config/environment.rb")
+          if defined?(::Rails) && ::Rails.respond_to?(:application)
+            # Rails 3
+            ::Rails.application.eager_load!
+          elsif defined?(::Rails::Initializer)
+            # Rails 2.3
+            $rails_rake_task = false
+            ::Rails::Initializer.run :load_application_classes
+          end
+        elsif File.directory?(file) && File.exists?(File.expand_path("#{file}/config/boot.rb"))
+          if defined?(::Padrino)
+            # Padrino
+            require "padrino"
+            require File.expand_path("#{file}/config/boot.rb")
+          end
+        elsif File.file?(file)
+          require File.expand_path(file)
+        end
+      end
+
+  end
+end

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backburner
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -121,6 +121,7 @@ files:
 - examples/stress.rb
 - lib/backburner.rb
 - lib/backburner/async_proxy.rb
+- lib/backburner/cli.rb
 - lib/backburner/configuration.rb
 - lib/backburner/connection.rb
 - lib/backburner/helpers.rb
@@ -168,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3112315075043673734
+      hash: -3041917192474660022
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3112315075043673734
+      hash: -3041917192474660022
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25