ayl-beanstalk 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/ayl-beanstalk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ayl-beanstalk"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["j0hnds@gmail.com"]
-  s.date = "2012-03-06"
+  s.date = "2012-03-09"
   s.description = "Ayl extension to provide beanstalk support."
   s.email = "j0hnds@gmail.com"
   s.executables = ["ayl_beanstalk", "ayl_worker", "ayl_worker_control"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/ayl-beanstalk/engine.rb",
     "lib/ayl-beanstalk/pool.rb",
     "lib/ayl-beanstalk/worker.rb",
+    "spec/ayl_worker_control_spec.rb",
     "spec/ayl_worker_spec.rb",
     "spec/command_line_spec.rb",
     "spec/engine_spec.rb",

data/bin/ayl_worker_control

@@ -11,4 +11,14 @@ options = Ayl::CommandLine.parse! Ayl::CommandLine.grab_app_arguments
 raise "Must specify the path to the PID file" if options[:pid_path].nil?
 raise "PID path does not exist" if !File.exists?(options[:pid_path])
 
-Daemons.run(spath, :log_dir => '/tmp', :log_output => true, :dir_mode => :normal, :dir => options[:pid_path])
+daemon_options = {
+  :log_dir => '/tmp', 
+  :log_output => true, 
+  :dir_mode => :normal, 
+  :dir => options[:pid_path],
+  :multiple => true
+}
+
+daemon_options.merge!({ :app_name => options[:app_name] }) if options.has_key?(:app_name)
+
+Daemons.run(spath, daemon_options)

data/lib/ayl-beanstalk/command_line.rb

@@ -53,6 +53,10 @@ module Ayl
             options[:pid_path] = pid_path
           end
 
+          opts.on '-n', '--name NAME', 'The name to use for the worker daemon (overrides script name)', do | name |
+            options[:app_name] = name
+          end
+
           opts.on '-h', '--help', 'Display the help message' do
             puts opts
             exit(0)

data/spec/ayl_worker_control_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'daemons'
+require 'ayl-beanstalk/command_line'
+
+describe 'ayl_worker_control script' do
+
+  before(:each) do
+    ARGV.clear
+    @ayl_control_script = File.expand_path('../bin/ayl_worker_control', File.dirname(__FILE__))
+  end
+
+  context 'handling command line' do
+
+    it "should honor the use of the -a option to name the daemon" do
+      ARGV.concat [ '--', '--pid-path', '/tmp', '--name', 'the_name' ]
+      Daemons.should_receive(:run).with(anything, { :log_dir => '/tmp', :log_output => true, :dir_mode => :normal, :dir => '/tmp', :app_name => 'the_name' })
+
+      load(@ayl_control_script, true)
+    end
+
+    it "should assume the use of the script for the daemon name if no name argument is specified" do
+      ARGV.concat [ '--', '--pid-path', '/tmp' ]
+      Daemons.should_receive(:run).with(anything, { :log_dir => '/tmp', :log_output => true, :dir_mode => :normal, :dir => '/tmp' })
+
+      load(@ayl_control_script, true)
+    end
+
+  end
+
+end

data/spec/command_line_spec.rb

@@ -23,15 +23,15 @@ describe Ayl::CommandLine do
   context "when parsing the command line" do
 
     it "should extract the correct options from the command line when the short options are used" do
-      argv = %w{ -t tube_name -e development -a app_path -r -c config/environment -p pid_path }
+      argv = %w{ -t tube_name -e development -a app_path -r -c config/environment -p pid_path -n the_name }
       parsed_options = Ayl::CommandLine.parse!(argv)
-      parsed_options.should == { :tube => 'tube_name', :env => 'development', :app_path => 'app_path', :rails_app => true, :app_require => 'config/environment', :pid_path => 'pid_path' }
+      parsed_options.should == { :tube => 'tube_name', :env => 'development', :app_path => 'app_path', :rails_app => true, :app_require => 'config/environment', :pid_path => 'pid_path', :app_name => 'the_name' }
     end
 
     it "should extract the correct options from the command line when the long options are used" do
-      argv = %w{ --tube tube_name --environment development --app-path app_path --rails --require config/environment --pid-path pid_path }
+      argv = %w{ --tube tube_name --environment development --app-path app_path --rails --require config/environment --pid-path pid_path --name the_name }
       parsed_options = Ayl::CommandLine.parse!(argv)
-      parsed_options.should == { :tube => 'tube_name', :env => 'development', :app_path => 'app_path', :rails_app => true, :app_require => 'config/environment', :pid_path => 'pid_path' }
+      parsed_options.should == { :tube => 'tube_name', :env => 'development', :app_path => 'app_path', :rails_app => true, :app_require => 'config/environment', :pid_path => 'pid_path', :app_name => 'the_name' }
     end
 
     it "should raise an exception if invalid arguments are provided" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ayl-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-03-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ayl
-  requirement: &75023090 !ruby/object:Gem::Requirement
+  requirement: &84206020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *75023090
+  version_requirements: *84206020
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &75022810 !ruby/object:Gem::Requirement
+  requirement: &84205740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *75022810
+  version_requirements: *84205740
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &75022550 !ruby/object:Gem::Requirement
+  requirement: &84205400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *75022550
+  version_requirements: *84205400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75022280 !ruby/object:Gem::Requirement
+  requirement: &84205080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *75022280
+  version_requirements: *84205080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75021930 !ruby/object:Gem::Requirement
+  requirement: &84204740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *75021930
+  version_requirements: *84204740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &75021620 !ruby/object:Gem::Requirement
+  requirement: &84204380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *75021620
+  version_requirements: *84204380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &75021290 !ruby/object:Gem::Requirement
+  requirement: &84204030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75021290
+  version_requirements: *84204030
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &75020960 !ruby/object:Gem::Requirement
+  requirement: &84197390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75020960
+  version_requirements: *84197390
 description: Ayl extension to provide beanstalk support.
 email: j0hnds@gmail.com
 executables:
@@ -127,6 +127,7 @@ files:
 - lib/ayl-beanstalk/engine.rb
 - lib/ayl-beanstalk/pool.rb
 - lib/ayl-beanstalk/worker.rb
+- spec/ayl_worker_control_spec.rb
 - spec/ayl_worker_spec.rb
 - spec/command_line_spec.rb
 - spec/engine_spec.rb
@@ -149,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1045641297
+      hash: 347162333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: