quebert 0.0.1 → 0.0.3

data/Gemfile

@@ -1,7 +1,6 @@
 source :rubygems
 
 gem 'json'
-gem 'optitron'
 gem 'beanstalk-client'
 
 group :test do

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.authors = ["Brad Gessler"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_dependency "json"
-    gem.add_dependency "optitron"
     gem.add_dependency "beanstalk-client"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/lib/quebert/command_line_runner.rb

@@ -1,27 +1,58 @@
-require 'optitron'
-
 module Quebert
-  class CommandLineRunner < Optitron::CLI
+  class CommandLineRunner
     
-    desc "Starts a quebert worker"
-    opt "pid-file",     :type => :string
-    opt "log-file",     :type => :string
-    opt "config-file",  :type => :string
-    opt "chdir",        :type => :string
-    def worker
-      if dir = params['chdir']
-        Dir.chdir dir
+    attr_accessor :arguments, :command, :options
+    
+    def initialize(argv)
+      @argv = argv
+      
+      # Default options values
+      @options = {
+        :chdir  => Dir.pwd
+      }
+      
+      parse!
+    end
+    
+    def parser
+      @parser ||= OptionParser.new do |opts|
+        opts.banner = "Usage: quebert [options]"
+        
+        opts.separator ""
+        
+        opts.on("-l", "--log FILE", "File to redirect output " +                      
+                                    "(default: #{@options[:log]})")                   { |file| @options[:log] = file }
+        opts.on("-P", "--pid FILE", "File to store PID " +                            
+                                    "(default: #{@options[:pid]})")                   { |file| @options[:pid] = file }
+        opts.on("-C", "--config FILE", "Load options from config file")               { |file| @options[:config] = file }
+        opts.on("-c", "--chdir DIR", "Change to dir before starting")                 { |dir| @options[:chdir] = File.expand_path(dir) }
       end
+    end
+    
+    # Parse the options.
+    def parse!
+      parser.parse! @argv
+      @command   = @argv.shift
+      @arguments = @argv
+    end
+    
+    def self.dispatch(args = ARGV)
+      runner = new(args)
+      params = runner.options
       
-      if pid_file = params['pid-file']
+      if dir = params[:chdir]
+        Dir.chdir dir
+      end
+
+      if pid_file = params[:pid]
         Support::PidFile.new(pid_file).write!
       end
-      
-      if log_path = params['log-file']
+
+      if log_path = params[:log]
         Quebert.config.log_file_path = log_path
       end
-      
-      if config = params['config-file'] || auto_config
+
+      if config = params[:config] || auto_config
         require config
       end
       
@@ -29,10 +60,10 @@ module Quebert
     end
     
   private
-    def auto_config
+    def self.auto_config
       rails_env_path = './config/environment.rb'
       if File.exists?(rails_env_path)
-        Quebert.logger.info "Detected Rails! Setting config-file=#{File.expand_path(rails_env_path)}"
+        Quebert.logger.info "Detected Rails! Setting config-file=#{rails_env_path}"
         rails_env_path
       end
     end

data/lib/quebert/configuration.rb

@@ -2,7 +2,7 @@ require 'logger'
 
 module Quebert
   class Configuration
-    attr_accessor :backend, :logger
+    attr_accessor :backend, :logger, :worker
     
     def logger
       @logger ||= Logger.new($stdout)
@@ -22,6 +22,10 @@ module Quebert
       self
     end
     
+    def worker
+      @worker ||= Struct.new(:exception_handler).new
+    end
+    
     def self.from_hash(hash)
       new.from_hash(hash) # Config this puppy up from a config hash
     end

data/lib/quebert/worker.rb

@@ -24,10 +24,7 @@ module Quebert
     end
     
   protected
-    def log(job, message, level=:info)
-      logger.send(level, "#{job.class.name}##{job.object_id}: #{message}")
-    end
-    
+    # Setup a bunch of stuff with Quebert config defaults the we can override later.
     def logger
       @logger ||= Quebert.logger
     end
@@ -35,5 +32,14 @@ module Quebert
     def backend
       @backend ||= Quebert.config.backend
     end
+    
+    def exception_handler
+      @exception_handler ||= Quebert.config.worker.exception_handler
+    end
+    
+    # Making logging jobs a tiny bit easier..
+    def log(job, message, level=:info)
+      logger.send(level, "#{job.class.name}##{job.object_id}: #{message}")
+    end
   end
 end

data/quebert.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quebert}
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Gessler"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-10-05}
   s.default_executable = %q{quebert}
   s.description = %q{A worker queue framework built around beanstalkd}
   s.email = %q{brad@bradgessler.com}
@@ -81,18 +81,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<optitron>, [">= 0"])
       s.add_runtime_dependency(%q<beanstalk-client>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<optitron>, [">= 0"])
       s.add_dependency(%q<beanstalk-client>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<optitron>, [">= 0"])
     s.add_dependency(%q<beanstalk-client>, [">= 0"])
   end
 end

data/spec/command_line_runner_spec.rb

@@ -9,7 +9,7 @@ describe CommandLineRunner do
     it "should write log file" do
       clean_file 'log.log' do
         lambda{
-          CommandLineRunner.dispatch(%w(worker --log-file=log.log))
+          CommandLineRunner.dispatch(%w(worker --log log.log))
         }.should change { File.read('log.log') if File.exists?('log.log') }
       end
     end
@@ -19,14 +19,14 @@ describe CommandLineRunner do
     it "should write pid" do
       clean_file 'pid.pid' do
         File.exists?('pid').should be_false
-        CommandLineRunner.dispatch(%w(worker --pid-file=pid.pid))
+        CommandLineRunner.dispatch(%w(worker --pid pid.pid))
         Support::PidFile.read('pid.pid').should eql(Process.pid)
       end
     end
     
     it "should remove stale" do
       clean_file 'pid.pid', "-1" do
-        CommandLineRunner.dispatch(%w(worker --pid-file=pid.pid))
+        CommandLineRunner.dispatch(%w(worker --pid pid.pid))
         Support::PidFile.read('pid.pid').should eql(Process.pid)
       end
     end
@@ -34,7 +34,7 @@ describe CommandLineRunner do
     it "should complain if the pid is already running" do
       clean_file 'pid.pid', Process.pid do
         lambda{
-          CommandLineRunner.dispatch(%w(worker --pid-file=pid.pid))
+          CommandLineRunner.dispatch(%w(worker --pid pid.pid))
         }.should raise_exception(Support::PidFile::ProcessRunning)
         Support::PidFile.read('pid.pid').should eql(Process.pid)
       end
@@ -53,7 +53,7 @@ describe CommandLineRunner do
     it "should run config file" do
       clean_file './super_awesome.rb', "raise 'SuperAwesome'" do
         lambda{
-          CommandLineRunner.dispatch(%w(worker --config-file=super_awesome.rb))
+          CommandLineRunner.dispatch(%w(worker --config super_awesome.rb))
         }.should raise_exception('SuperAwesome')
       end
     end
@@ -66,7 +66,7 @@ describe CommandLineRunner do
     end
     
     it "should change chdir" do
-      CommandLineRunner.dispatch(%w(worker --chdir=/))
+      CommandLineRunner.dispatch(%w(worker --chdir /))
       Dir.pwd.should eql('/')
     end
     

data/spec/worker_spec.rb

@@ -17,6 +17,13 @@ describe Worker do
       @q.put Exceptional
       lambda{ @w.start }.should raise_exception
     end
+
+    it "should default to Quebert.config.worker.exception_handler handler" do
+      @q.put Exceptional
+      Quebert.config.worker.exception_handler = Proc.new{|e| e.should be_instance_of(Exception) }
+      @w.exception_handler = Proc.new{|e| e.should be_instance_of(Exception) }
+      lambda{ @w.start }.should_not raise_exception
+    end
     
     it "should intercept exceptions" do
       @q.put Exceptional

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quebert
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Brad Gessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -07:00
+date: 2010-10-05 00:00:00 -07:00
 default_executable: quebert
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: optitron
+  name: beanstalk-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,20 +62,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: beanstalk-client
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: A worker queue framework built around beanstalkd
 email: brad@bradgessler.com
 executables: