guard-delayed 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1 (2012-12-10)
+
+ * Fixed script/delayed\_job call when passing RAILS_ENV in dash shell (not sure if it happens with other ones)
+
 ## 0.2.0 (2012-07-04)
 
  * Merged pull request from @drewda to support guard 1.1

data/README.markdown

@@ -36,8 +36,8 @@ being active.
  * Source hosted at [GitHub](http://github.com/suranyami/guard-delayed)
  * Report issues/Questions/Feature requests on [GitHub Issues](http://github.com/suranyami/guard-delayed/issues)
 
-Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
-you make.
+Pull requests are very welcome! Make sure your patches are well tested.
+Please create a topic branch for every separate change you make.
 
 ## Building and deploying gem
 
@@ -49,11 +49,11 @@ you make.
 
  * Push to rubygems.org:
  
-    gem push guard-delayed-0.2.0.gem
-    
+    gem push guard-delayed-0.2.1.gem
+
 ## Testing the gem locally
 
-    gem install guard-delayed-0.2.0.gem
+    gem install guard-delayed-0.2.1.gem
 
 
 ## Authors

data/lib/guard/delayed/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module DelayedVersion
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/guard/delayed.rb

@@ -21,25 +21,24 @@ module Guard
     end
 
     def start
-      system("#{cmd} stop")
+      run_cmd("stop")
       UI.info "Starting up delayed_job..."
-      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)
+      parameters  = "start"
+      parameters << " --min-priority #{@options[:min_priority]}" if @options[:min_priority]
+      parameters << " --max-priority #{@options[:max_priority]}" if @options[:max_priority]
+      parameters << " --number_of_workers=#{@options[:number_of_workers]}" if @options[:number_of_workers]
+      parameters << " --pid-dir=#{@options[:pid_dir]}" if @options[:pid_dir]
+      parameters << " --identifier=#{@options[:identifier]}" if @options[:identifier]
+      parameters << " --monitor" if @options[:monitor]
+      parameters << " --sleep-delay #{@options[:sleep_delay]}" if @options[:sleep_delay]
+      parameters << " --prefix #{@options[:prefix]} " if @options[:prefix]
+      run_cmd(parameters)
     end
 
     # Called on Ctrl-C signal (when Guard quits)
     def stop
       UI.info "Stopping delayed_job..."
-      system(cmd, 'stop')
+      run_cmd("stop")
     end
 
     # Called on Ctrl-Z signal
@@ -63,7 +62,7 @@ module Guard
     private
 
     def restart
-      system(cmd, 'restart')
+      run_cmd('restart')
     end
 
     def cmd
@@ -71,5 +70,11 @@ module Guard
       command = "export RAILS_ENV=#{@options[:environment]}; #{command}" if @options[:environment]
       command
     end
+
+    def run_cmd(parameters)
+      sys_response = system("#{cmd} #{parameters}")
+      raise StandardError, "Bad command: #{cmd} #{parameters}" if sys_response.nil? || !sys_response
+      sys_response
+    end
   end
 end

data/spec/guard/delayed_spec.rb

@@ -2,11 +2,27 @@ require 'spec_helper'
 
 describe Guard::Delayed do
   describe "when passing an environment option" do
+    subject { Guard::Delayed.new([], {:environment => 'test'}) }
+
     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
+      subject.should_receive(:system).with("export RAILS_ENV=test; script/delayed_job stop").and_return(true)
+      subject.should_receive(:system).with("export RAILS_ENV=test; script/delayed_job start").and_return(true)
+      subject.start
+    end
+
+    it "calls system with 'export RAILS_ENV=test;' after changes" do
+      subject.should_receive(:system).with("export RAILS_ENV=test; script/delayed_job restart").and_return(true)
+      subject.run_on_changes([])
+    end
+
+    it "should raise an exception when system call fails" do
+      subject.should_receive(:system).and_return(nil)
+      lambda { subject.run_on_changes([]) }.should raise_error 
+    end
+
+    it "should raise an exception when system command fails " do
+      subject.should_receive(:system).and_return(false)
+      lambda { subject.run_on_changes([]) }.should raise_error 
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-delayed
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -163,11 +163,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-delayed
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: guard gem for delayed_job
 test_files:
 - spec/guard/delayed_spec.rb
 - spec/spec_helper.rb
-has_rdoc: