guard-delayed 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2 (2012-01-25)
+
+ * Now passing the environment in using 'export RAILS_ENV=test;' before calling script/delayed_job
+   Thanks to @rwz for this patch
+ * Added a meaningful spec that checks the system call using a mock. Much nicer!
+
 ## 0.1.0 (2011-07-28)
 
  * Fixed options for current delayed_job version (from dbloete)

data/README.markdown

@@ -39,10 +39,6 @@ being active.
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
 you make.
 
-## Testing the gem locally
-
-
-
 ## Building and deploying gem
 
  * Update the version number in `lib/guard/delayed/version.rb`
@@ -53,8 +49,12 @@ you make.
     
  * Push to rubygems.org:
  
-    gem push guard-delayed-0.1.1.gem
+    gem push guard-delayed-0.1.2.gem
     
+## Testing the gem locally
+
+    gem install guard-delayed-0.1.2.gem
+
 
 ## Authors
 

data/guard-delayed.gemspec

@@ -15,13 +15,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project = "guard-delayed"
   
-  s.add_dependency 'guard', '~> 0.3'
+  s.add_dependency 'guard', '> 0.3'
   s.add_dependency 'delayed_job'
+  s.add_dependency 'daemons'
   
-  s.add_development_dependency 'bundler',       '~> 1.0.10'
-  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'
+  s.add_development_dependency 'bundler',       '> 1.0.10'
+  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'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/guard/delayed/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module DelayedVersion
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/guard/delayed.rb

@@ -3,36 +3,37 @@ require 'guard/guard'
 
 module Guard
   class Delayed < Guard
-    
+
     # Allowable options are:
-    # :environment  e.g. 'test'
-    # :min_priority e.g. 2
-    # :max_priority e.g. 10
-    # :number_of_workers e.g. 2
-    # :pid_dir  e.g. tmp/pids Specifies an alternate directory in which to store the process ids.
-    # :identifier     A numeric identifier for the worker.
-    # :monitor                    Start monitor process.
-    # :sleep-delay N              Amount of time to sleep in seconds when no jobs are found
-    # :prefix NAME                String to be prefixed to worker process names
-    
+    # :environment        defaults to 'test'
+    # :min_priority       e.g. 2
+    # :max_priority       e.g. 10
+    # :number_of_workers  e.g. 2
+    # :pid_dir            e.g. tmp/pids Specifies an alternate directory in which to store the process ids.
+    # :identifier         A numeric identifier for the worker.
+    # :monitor            Start monitor process.
+    # :sleep-delay N      Amount of time to sleep in seconds when no jobs are found
+    # :prefix NAME        String to be prefixed to worker process names
+
     def initialize(watchers = [], options = {})
       @options = options
-      super
+      super(watchers, options)
     end
 
     def start
-      system(cmd, 'stop')
+      system("#{cmd} stop")
       UI.info "Starting up delayed_job..."
-      args = "start"
-      args << " --min-priority #{@options[:min_priority]}" if @options[:min_priority]
-      args << " --max-priority #{@options[:max_priority]}" if @options[:max_priority]
-      args << " --number_of_workers=#{@options[:number_of_workers]}" if @options[:number_of_workers]
-      args << " --pid-dir=#{@options[:pid_dir]}" if @options[:pid_dir]
-      args << " --identifier=#{@options[:identifier]}" if @options[:identifier]
-      args << " --monitor" if @options[:monitor]
-      args << " --sleep-delay #{@options[:sleep_delay]}" if @options[:sleep_delay]
-      args << " --prefix #{@options[:prefix]} " if @options[:prefix]
-      system(cmd, args)
+      command = cmd
+      command << " start"
+      command << " --min-priority #{@options[:min_priority]}" if @options[:min_priority]
+      command << " --max-priority #{@options[:max_priority]}" if @options[:max_priority]
+      command << " --number_of_workers=#{@options[:number_of_workers]}" if @options[:number_of_workers]
+      command << " --pid-dir=#{@options[:pid_dir]}" if @options[:pid_dir]
+      command << " --identifier=#{@options[:identifier]}" if @options[:identifier]
+      command << " --monitor" if @options[:monitor]
+      command << " --sleep-delay #{@options[:sleep_delay]}" if @options[:sleep_delay]
+      command << " --prefix #{@options[:prefix]} " if @options[:prefix]
+      system(command)
     end
 
     # Called on Ctrl-C signal (when Guard quits)
@@ -58,16 +59,16 @@ module Guard
     def run_on_change(paths)
       restart
     end
-    
+
     private
-    
+
     def restart
       system(cmd, 'restart')
     end
-    
+
     def cmd
       command = "script/delayed_job"
-      command = "RAILS_ENV=#{@options[:environment]} #{command}" if @options[:environment]
+      command = "export RAILS_ENV=#{@options[:environment]}; #{command}" if @options[:environment]
       command
     end
   end

data/spec/guard/delayed_spec.rb

@@ -1,20 +1,12 @@
 require 'spec_helper'
 
 describe Guard::Delayed do
-  subject { Guard::Delayed.new }
-
-  describe "start" do
-    before do
-      subject = Guard::Delayed.new
-    end
-
-    after do
-      subject.stop
-    end
-
-    it "should create a pid in /tmp/pids" do
-      subject.start
-      Dir.glob("tmp/pids/delayed_job*.pid").should_not be_empty
+  describe "when passing an environment option" do
+    it "calls system with 'export RAILS_ENV=test;' call first" do
+      @delayed = Guard::Delayed.new([], {:environment => 'test'})
+      @delayed.should_receive(:system).with("export RAILS_ENV=test; script/delayed_job stop").and_return(true)
+      @delayed.should_receive(:system).with("export RAILS_ENV=test; script/delayed_job start").and_return(true)
+      @delayed.start
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,4 @@ ENV["GUARD_ENV"] = 'test'
 
 RSpec.configure do |config|
   config.color_enabled = true
-  config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,125 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-delayed
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - David Parry
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: guard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70255822101020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70255822101020
+- !ruby/object:Gem::Dependency
   name: delayed_job
+  requirement: &70255822100640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70255822100640
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &70255822100160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70255822100160
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70255822099640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70255822099640
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70255822099140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70255822099140
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70255822098620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: guard-bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70255822098620
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: &70255822098140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70255822098140
 description: Guard::Delayedjob automatically starts/stops/restarts delayed_job
-email: 
+email:
 - david.parry@suranyami.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -135,39 +110,28 @@ files:
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/guard-delayed
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: guard-delayed
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: guard gem for delayed_job
-test_files: 
+test_files:
 - spec/guard/delayed_spec.rb
 - spec/spec_helper.rb