guard-resque 0.0.3 → 0.0.4

data/.gitignore

@@ -2,4 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
-.rvmrc
+.rvmrc
+.rbx

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 0.0.1
+## 0.0.4
+
+ * Add a :vverbose option to distinguish from the :verbose option
+ * Add a timeout when killing Resque, to force it with SIGKILL
+ * Change the way the #spawn call is made, so it doesn't create a subshell to launch
+   Resque, which was causing issue #2
+
+## 0.0.3
 
  * Forked from guard-delayed and started guard-resque
 
@@ -9,7 +16,7 @@
 
  * Fixed options for current delayed_job version (from dbloete)
  * Environment settings needed to be passed in via RAILS_ENV=
- 
+
 ## 0.0.9 (2011-06-22)
 
  * Fixed argument passing to the start script

data/README.markdown

@@ -32,18 +32,19 @@ being active.
     guard 'resque', :environment => 'development' do
       watch(%r{^app/(.+)\.rb})
     end
-    
+
 ## Options
 
 You can customize the resque task via the following options:
 
-* `environment`: the rails environment to run the workers in (defaults to `"development"`)
+* `environment`: the rails environment to run the workers in (defaults to `nil`)
 * `task`: the name of the rake task to use (defaults to `"resque:work"`)
 * `queue`: the resque queue to run (defaults to `"*"`)
-* `count`: the number of workers to include (defaults to `"1"`)
-* `verbose`: whether to use verbose logging (defaults to `false`)
-* `trace`: whether to include `--trace` on the rake command (defaults to `false`)
-* `stop_signal`: how to kill the process when restarting (defaults to `KILL`)
+* `count`: the number of workers to include (defaults to `1`)
+* `verbose`: whether to use verbose logging (defaults to `nil`)
+* `vverbose`: whether to use very verbose logging (defaults to `nil`)
+* `trace`: whether to include `--trace` on the rake command (defaults to `nil`)
+* `stop_signal`: how to kill the process when restarting (defaults to `QUIT`)
 
 
 ## Development
@@ -63,13 +64,13 @@ you make.
  * Update the version number in `lib/guard/resque/version.rb`
  * Update `CHANGELOG.md`
  * Build the gem:
- 
+
     gem build guard-resque.gemspec
-    
+
  * Push to rubygems.org:
- 
+
     gem push guard-resque-0.x.x.gem
-    
+
 
 ## Guard::Delayed Authors
 

data/Rakefile

@@ -5,28 +5,29 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
-namespace(:spec) do
+namespace :spec do
   desc "Run all specs on multiple ruby versions (requires rvm)"
-  task(:portability) do
-    rubies = if ENV['RUBIES']
-               ENV['RUBIES'].split(' ')
-             else
-               %w[1.8.7 1.9.2 ree jruby]
-             end
-    rubies.each do |version|
-      rvm_ruby = if ENV['GEMSET']
-                   "#{version}@#{ENV['GEMSET']}"
-                 else
-                   version
-                 end
-      system <<-BASH
-        bash -c '
-          source ~/.rvm/scripts/rvm;
-          rvm #{rvm_ruby};
-          echo "--------- version #{rvm_ruby} ----------\n";
-          bundle install;
-          rake spec'
+  task :portability do
+
+    command = <<-BASH
+      source ~/.rvm/scripts/rvm;
+      rvm #{ENV['RUBIES'] || 'all'} do bundle exec rake spec
+    BASH
+    system "bash -c '#{command}'"
+
+  end
+
+  namespace :portability do
+    desc 'Installs bundler/rake and runs bundle install for all rubies'
+    task :prepare do
+      # FIXME: This isn't working for me when it gets to JRuby, specs are running fine - RL
+      command = <<-BASH
+        source ~/.rvm/scripts/rvm;
+        rvm #{ENV['RUBIES'] || 'all'} do gem install bundler rake;
+        rvm #{ENV['RUBIES'] || 'all'} do bundle install
       BASH
+
+      system "bash -c '#{command}'"
     end
   end
 end

data/guard-resque.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "guard-resque"
   s.version     = Guard::ResqueVersion::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jacques Crocker", "David Parry"]
-  s.email       = ["railsjedi@gmail.com"]
+  s.authors     = ["Jacques Crocker", "Ryan Long", "David Parry"]
+  s.email       = ["railsjedi@gmail.com", 'ryan@rtlong.com']
   s.homepage    = 'http://github.com/railsjedi/guard-resque'
   s.summary     = %q{guard gem for resque}
   s.description = %q{Guard::Resque automatically starts/stops/restarts resque worker}
@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'guard', '>= 0.8'
   s.add_dependency 'resque'
 
-  s.add_development_dependency 'bundler',       '~> 1.0.10'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec',         '~> 2.5.0'
   s.add_development_dependency 'guard-rspec',   '>= 0.2.0'
   s.add_development_dependency 'guard-bundler', '>= 0.1.1'

data/lib/guard/resque.rb

@@ -4,48 +4,68 @@ require 'guard/guard'
 module Guard
   class Resque < Guard
 
+    DEFAULT_SIGNAL = :QUIT
+    DEFAULT_QUEUE = '*'.freeze
+    DEFAULT_COUNT = 1
+    DEFAULT_TASK_SINGLE = 'resque:work'.freeze
+    DEFAULT_TASK_MULTIPLE = 'resque:workers'.freeze
+
     # Allowable options are:
-    # :environment  e.g. 'test'
-    # :task .e.g 'resque:work'
-    # :queue e.g. '*'
-    # :count e.g. 3
-    # :verbose e.g. true
-    # :trace e.g. true
-    # :stop_signal e.g. KILL
+    #  - :environment  e.g. 'test'
+    #  - :task .e.g 'resque:work'
+    #  - :queue e.g. '*'
+    #  - :count e.g. 3
+    #  - :verbose e.g. true
+    #  - :vverbose e.g. true
+    #  - :trace e.g. true
+    #  - :stop_signal e.g. :QUIT or :SIGQUIT
     def initialize(watchers = [], options = {})
       @options = options
       @pid = nil
-      @stop_signal = options[:stop_signal] || "KILL"
+      @stop_signal = options[:stop_signal] || DEFAULT_SIGNAL
+      @options[:queue] ||= DEFAULT_QUEUE
+      @options[:count] ||= DEFAULT_COUNT
+      @options[:task] ||= (@options[:count].to_i == 1) ? DEFAULT_TASK_SINGLE : DEFAULT_TASK_MULTIPLE
       super
     end
 
     def start
       stop
-      UI.info "Starting up resque..."
-      UI.info cmd
-      @pid = spawn(cmd)
+      UI.info 'Starting up resque...'
+      UI.info [ cmd, env.map{|v| v.join('=')} ].join(' ')
+
+      # launch Resque worker
+      @pid = spawn(env, cmd)
     end
 
-    # Called on Ctrl-C signal (when Guard quits)
     def stop
       if @pid
-        UI.info("Stopping resque...")
-        ::Process.kill(@stop_signal, @pid)
-        ::Process.waitpid(@pid) rescue Errno::ESRCH
-        @pid = nil
-        UI.info("Stopped process resque")
+        UI.info 'Stopping resque...'
+        ::Process.kill @stop_signal, @pid
+        begin
+          Timeout.timeout(15) do
+            ::Process.wait @pid
+          end
+        rescue Timeout::Error
+          UI.info 'Sending SIGKILL to resque, as it\'s taking too long to shutdown.'
+          ::Process.kill :KILL, @pid
+          ::Process.wait @pid
+        end
+        UI.info 'Stopped process resque'
       end
+    rescue Errno::ESRCH
+      UI.info 'Guard::Resque lost the Resque worker subprocess!'
+    ensure
+      @pid = nil
     end
 
     # Called on Ctrl-Z signal
-    # This method should be mainly used for "reload" (really!) actions like reloading passenger/spork/bundler/...
     def reload
-      UI.info "Restarting resque..."
+      UI.info 'Restarting resque...'
       restart
     end
 
     # Called on Ctrl-/ signal
-    # This method should be principally used for long action like running all specs/tests/...
     def run_all
       true
     end
@@ -63,27 +83,25 @@ module Guard
     private
 
     def cmd
-      command = "bundle exec rake "
-
-      # environment setting
-      command << "RAILS_ENV=#{@options[:environment]} " if @options[:environment]
+      command = ['bundle exec rake', @options[:task].to_s]
 
-      # queue setting
-      command << "QUEUE=#{@options[:queue] || '*'} "
+      # trace setting
+      command << '--trace' if @options[:trace]
 
-      #count setting
-      command << "COUNT=#{@options[:count] || '1'} "
+      return command.join(' ')
+    end
 
-      # verbose setting
-      command << "VVERBOSE=1 " if @options[:verbose]
+    def env
+      var = Hash.new
 
-      # task setting
-      command << "#{@options[:task] || 'resque:work'} "
+      var['QUEUE']     = @options[:queue].to_s       if @options[:queue]
+      var['COUNT']     = @options[:count].to_s       if @options[:count]
+      var['RAILS_ENV'] = @options[:environment].to_s if @options[:environment]
 
-      # trace setting
-      command << "--trace " if @options[:trace]
+      var['VERBOSE']  = '1' if @options[:verbose]
+      var['VVERBOSE'] = '1' if @options[:vverbose]
 
-      command
+      return var
     end
   end
 end

data/lib/guard/resque/templates/Guardfile

@@ -1,10 +1,12 @@
-# other available options
-# :task (defaults to resque:work)
-# :verbose 
-# :trace
-# :queue (defaults to "*")
-# :count (defaults to 1)
+### Guard::Resque
+#  available options:
+#  - :task (defaults to 'resque:work' if :count is 1; 'resque:workers', otherwise)
+#  - :verbose / :vverbose (set them to anything but false to activate their respective modes)
+#  - :trace
+#  - :queue (defaults to "*")
+#  - :count (defaults to 1)
+#  - :environment (corresponds to RAILS_ENV for the Resque worker)
 guard 'resque', :environment => 'development' do
-  watch(%r{^app/(.+)\.rb})
-  watch(%r{^lib/(.+)\.rb})
+  watch(%r{^app/(.+)\.rb$})
+  watch(%r{^lib/(.+)\.rb$})
 end

data/lib/guard/resque/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module ResqueVersion
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/guard/resque_spec.rb

@@ -1,51 +1,67 @@
 require 'spec_helper'
 
 describe Guard::Resque do
-  subject { Guard::Resque.new }
+  describe 'start' do
 
-  describe "start" do
-    before do
-      subject = Guard::Resque.new
-    end
+    it 'should accept :environment option' do
+      environment = :foo
 
-    after do
-      subject.stop
+      obj = Guard::Resque.new [], :environment => environment
+      obj.send(:env).should include 'RAILS_ENV' => environment.to_s
     end
 
-    it "should create a pid in /tmp/pids" do
-      subject.start
-      Dir.glob("tmp/pids/resque*.pid").should_not be_empty
-    end
+    it 'should accept :queue option' do
+      queue = :foo
 
-    it "should accept environment option" do
-      obj = Guard::Resque.new [], :environment => 'foo'
-      obj.send(:cmd).should match /RAILS_ENV=foo/
+      obj = Guard::Resque.new [], :queue => queue
+      obj.send(:env).should include 'QUEUE' => queue.to_s
     end
 
-    it "should accept queue option" do
-      obj = Guard::Resque.new [], :queue => 'foo'
-      obj.send(:cmd).should match /QUEUE=foo/
+    it 'should accept :count option' do
+      count = 2
+
+      obj = Guard::Resque.new [], :count => count
+      obj.send(:env).should include 'COUNT' => count.to_s
     end
 
-    it "should accept count option" do
-      obj = Guard::Resque.new [], :count => 2
-      obj.send(:cmd).should match /COUNT=2/
+    it 'should accept :vverbose option' do
+      obj = Guard::Resque.new [], :vverbose => true
+      obj.send(:env).should include 'VVERBOSE'
     end
 
-    it "should accept verbose option" do
+    it 'should accept :verbose option' do
       obj = Guard::Resque.new [], :verbose => true
-      obj.send(:cmd).should match /VVERBOSE=1/
+      obj.send(:env).should include 'VERBOSE'
     end
 
-    it "should accept trace option" do
+    it 'should accept :trace option' do
       obj = Guard::Resque.new [], :trace => true
-      obj.send(:cmd).should match /--trace/
+      obj.send(:cmd).should include '--trace'
+    end
+
+    it 'should accept :task option' do
+      task = 'environment foo'
+
+      obj = Guard::Resque.new [], :task => task
+      obj.send(:cmd).should include task
+      obj.send(:cmd).should_not include Guard::Resque::DEFAULT_TASK_SINGLE
     end
 
-    it "should accept task option" do
-      obj = Guard::Resque.new [], :task => 'environment foo'
-      obj.send(:cmd).should match /environment foo/
-      obj.send(:cmd).should_not match /resque:work/
+    it 'should provide default options' do
+      obj = Guard::Resque.new []
+      obj.send(:env).should include 'QUEUE' => Guard::Resque::DEFAULT_QUEUE.to_s
+      obj.send(:env).should include 'COUNT' => Guard::Resque::DEFAULT_COUNT.to_s
+      obj.send(:cmd).should include Guard::Resque::DEFAULT_TASK_SINGLE
     end
+
+    it 'should provide different default options when :count is multiple' do
+      count = 2
+
+      obj = Guard::Resque.new [], :count => count
+      obj.send(:env).should include 'QUEUE' => Guard::Resque::DEFAULT_QUEUE.to_s
+      obj.send(:env).should include 'COUNT' => count.to_s
+      obj.send(:cmd).should include Guard::Resque::DEFAULT_TASK_MULTIPLE
+    end
+
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rspec'
 require 'guard/resque'
 
-ENV["GUARD_ENV"] = 'test'
+ENV['GUARD_ENV'] = 'test'
 
 RSpec.configure do |config|
   config.color_enabled = true

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: guard-resque
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
 - Jacques Crocker
+- Ryan Long
 - David Parry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153606040 !ruby/object:Gem::Requirement
+  requirement: &9480740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +23,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2153606040
+  version_requirements: *9480740
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2153605480 !ruby/object:Gem::Requirement
+  requirement: &9480060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +34,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153605480
+  version_requirements: *9480060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153604860 !ruby/object:Gem::Requirement
+  requirement: &9478340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153604860
+  version_requirements: *9478340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &9477480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *9477480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153604360 !ruby/object:Gem::Requirement
+  requirement: &9493020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +67,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153604360
+  version_requirements: *9493020
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153603900 !ruby/object:Gem::Requirement
+  requirement: &9492080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +78,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *2153603900
+  version_requirements: *9492080
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153603440 !ruby/object:Gem::Requirement
+  requirement: &9491100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +89,11 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2153603440
+  version_requirements: *9491100
 description: Guard::Resque automatically starts/stops/restarts resque worker
 email:
 - railsjedi@gmail.com
+- ryan@rtlong.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -118,10 +131,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-resque
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: guard gem for resque
-test_files:
-- spec/guard/resque_spec.rb
-- spec/spec_helper.rb
+test_files: []
+has_rdoc: