guard-sidekiq 0.0.9 → 0.0.11

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.0.11
+
+* Can now specify a `:logfile` option.
+
+## 0.0.10
+
+* Added ability to specify an array of `:queue`
+
 ## 0.0.9
 
  * Add `require` option.

data/README.markdown

@@ -40,7 +40,8 @@ being active.
 You can customize the sidekiq task via the following options:
 
 * `environment`: the rails environment to run the workers in (defaults to `nil`)
-* `queue`: the sidekiq queue to run (defaults to `default`)
+* `queue`: the sidekiq queue to run (defaults to `default`). Can supply a list of queues here.
+* `logfile`: sidekiq defaults to logging to STDOUT. Can specify a file to log to instead.
 * `timeout`: shutdown timeout
 * `concurrency`: the number of threads to include (defaults to `1`)
 * `verbose`: whether to use verbose logging (defaults to `nil`)
@@ -89,5 +90,6 @@ I hacked this together from the `guard-delayed` gem for use with Resque. All cre
 ## Guard::Sidekiq Authors
 Mark Bolusmjak
 Pitr Vernigorov
+[David Parry](https://github.com/suranyami)
 
 Replaces "rescue" with "sidekiq"

data/guard-sidekiq.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sidekiq'
 
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rb-fsevent'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec',         '~> 2.5.0'
   s.add_development_dependency 'guard-rspec',   '>= 0.2.0'

data/lib/guard/sidekiq.rb

@@ -16,6 +16,7 @@ module Guard
     #  - :concurrency, e.g. 20
     #  - :verbose e.g. true
     #  - :stop_signal e.g. :TERM, :QUIT or :SIGQUIT
+    #  - :logfile e.g. log/sidekiq.log (defaults to STDOUT)
     #  - :require e.g. ./sidekiq_helper.rb
     def initialize(watchers = [], options = {})
       @options = options
@@ -79,11 +80,17 @@ module Guard
 
     private
 
+    def queue_params
+      params = @options[:queue]
+      params = [params] unless params.is_a? Array
+      params.collect {|param| "--queue #{param}"}.join(" ")
+    end
+
     def cmd
       command = ['bundle exec sidekiq']
 
-      # trace setting
-      command << "--queue #{@options[:queue]}"              if @options[:queue]
+      command << "--logfile #{@options[:logfile]}"          if @options[:logfile]
+      command << queue_params                               if @options[:queue]
       command << "-C #{@options[:config]}"                  if @options[:config]
       command << "--verbose"                                if @options[:verbose]
       command << "--environment #{@options[:environment]}"  if @options[:environment]

data/lib/guard/sidekiq/templates/Guardfile

@@ -1,7 +1,7 @@
 ### Guard::Sidekiq
 #  available options:
 #  - :verbose
-#  - :queue (defaults to "default")
+#  - :queue (defaults to "default") can be an array
 #  - :concurrency (defaults to 1)
 #  - :timeout
 #  - :environment (corresponds to RAILS_ENV for the Sidekiq worker)

data/lib/guard/sidekiq/version.rb

@@ -2,7 +2,7 @@ module Guard
   module SidekiqVersion
     MAJOR = 0     # api
     MINOR = 0     # features
-    PATCH = 9     # bug fixes
+    PATCH = 11    # bug fixes
     BUILD = nil   # beta, rc1, etc
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/guard/sidekiq_spec.rb

@@ -3,18 +3,33 @@ require 'spec_helper'
 describe Guard::Sidekiq do
   describe 'start' do
 
-    it 'should accept :environment option' do
+    it 'accepts :environment option' do
       environment = :foo
 
       obj = Guard::Sidekiq.new [], :environment => environment
       obj.send(:cmd).should include "--environment #{environment}"
     end
 
-    it 'should accept :queue option' do
-      queue = :foo
+    it 'accepts :logfile option' do
+      logfile = 'log/sidekiq.log'
+      obj = Guard::Sidekiq.new [], :logfile => logfile
+      obj.send(:cmd).should include "--logfile #{logfile}"
+    end
+
+    describe 'with :queue option' do
+      it 'accepts one queue' do
+        queue = :foo
+
+        obj = Guard::Sidekiq.new [], :queue => queue
+        obj.send(:cmd).should include "--queue #{queue}"
+      end
+
+      it 'accepts array of :queue options' do
+        queue = ['foo,4', 'default']
 
-      obj = Guard::Sidekiq.new [], :queue => queue
-      obj.send(:cmd).should include "--queue #{queue}"
+        obj = Guard::Sidekiq.new [], :queue => queue
+        obj.send(:cmd).should include "--queue #{queue.first} --queue #{queue.last}"
+      end
     end
 
     it 'should accept :timeout option' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -60,6 +60,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,12 +173,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3362156540621315414
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3362156540621315414
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23