guard-process 1.0.4 → 1.0.5

data/README.md

@@ -34,14 +34,24 @@ The following options are available:
   The directory in which you want to run the command, if none is given then Ruby's current working directory is used
 - stop_signal
   The signal that Guard::Process sends to terminate the process when it needs to stop/restart it. This defaults to 'TERM' (in some cases you may need KILL).
+- dont_stop
+  When a reload is triggered this will not stop the process, instead it will wait for the current process run to finish before starting a new one. This is useful for having guard-process execute commands that don't run constantly that you don't want to interrupt as they run.
 - env
   A Hash with environmental variables to set for the context where your command runs, like so:
 ``` ruby
   {"SSL_CERTS_DIR" => "/etc/ssl/certs", "JAVA_HOME" => "/usr/local/java"}
 ```
 
+# TODO
+
+Clean up the test cases
+
 # Changes
 
+## 1.0.5
+
+- Adds the dont_stop option
+
 ## 1.0.4
 
 - Adds the dir option

data/guard-process.gemspec

@@ -4,7 +4,7 @@ require 'rbconfig' unless defined?(RbConfig)
 
 Gem::Specification.new do |s|
   s.name        = "guard-process"
-  s.version     = "1.0.4"
+  s.version     = "1.0.5"
   s.authors     = ["Mark Kremer"]
   s.email       = ["mark@socialreferral.com"]
   s.homepage    = ""

data/lib/guard/process.rb

@@ -11,9 +11,14 @@ module Guard
       @name = options[:name]
       @dir = options[:dir] || Dir.getwd
       @stop_signal = options[:stop_signal] || "TERM"
+      @dont_stop = options[:dont_stop]
       super
     end
 
+    def wait_for_stop?
+      @dont_stop
+    end
+
     def process_running?
       begin
         @pid ? ::Process.kill(0, @pid) : false
@@ -48,8 +53,20 @@ module Guard
       end
     end
 
+    def wait_for_stop
+      if @pid
+        UI.info("Process #{@name} is still running...")
+        ::Process.waitpid(@pid) rescue Errno::ESRCH
+        UI.info("Process #{@name} has stopped!")
+      end
+    end
+
     def reload
-      stop
+      if wait_for_stop?
+        wait_for_stop
+      else
+        stop
+      end
       start
     end
 

data/test/guard/process_test.rb

@@ -11,7 +11,13 @@ class GuardProcessTest < MiniTest::Unit::TestCase
   end
 
   def teardown
-    @guard.stop if @guard.process_running?
+    if @guard.process_running?
+      if @guard.wait_for_stop?
+        @guard.wait_for_stop
+      else
+        @guard.stop
+      end
+    end
     ENV['GUARD_ENV'] = nil
   end
 
@@ -36,10 +42,21 @@ class GuardProcessTest < MiniTest::Unit::TestCase
   end
 
   def test_reload_stops_and_starts_command
+    @guard.expects(:wait_for_stop).never
+    @guard.expects(:stop)
+    @guard.expects(:start).twice
+    @guard.start
+    @guard.reload
+  end
+
+  def test_reload_waits_for_command_to_finish_before_starting_again_if_dont_stop_option_set
+    @options = {:command => "ruby #{TEST_ROOT}/run_2_seconds.rb", :name => '2Seconds', :dont_stop => true}
+    @guard = Guard::Process.new([], @options)
+    @guard.expects(:wait_for_stop).at_least_once
+    @guard.expects(:stop).never
+    @guard.expects(:start).twice
     @guard.start
-    assert @guard.process_running?
     @guard.reload
-    assert @guard.process_running?
   end
 
   def test_start_sets_env_properly

data/test/run_2_seconds.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+puts "Running this program for 2 seconds"
+sleep 1
+puts "One more second to go!"
+sleep 1
+puts "Done!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-process
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &84583090 !ruby/object:Gem::Requirement
+  requirement: &70332760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *84583090
+  version_requirements: *70332760
 - !ruby/object:Gem::Dependency
   name: spoon
-  requirement: &84582790 !ruby/object:Gem::Requirement
+  requirement: &70332000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *84582790
+  version_requirements: *70332000
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &84582530 !ruby/object:Gem::Requirement
+  requirement: &70331270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *84582530
+  version_requirements: *70331270
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &84582280 !ruby/object:Gem::Requirement
+  requirement: &70330970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84582280
+  version_requirements: *70330970
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &84581940 !ruby/object:Gem::Requirement
+  requirement: &70330670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84581940
+  version_requirements: *70330670
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &84581720 !ruby/object:Gem::Requirement
+  requirement: &70330400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84581720
+  version_requirements: *70330400
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &84581500 !ruby/object:Gem::Requirement
+  requirement: &70330070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84581500
+  version_requirements: *70330070
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84581230 !ruby/object:Gem::Requirement
+  requirement: &70329710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84581230
+  version_requirements: *70329710
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &84580980 !ruby/object:Gem::Requirement
+  requirement: &70329420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84580980
+  version_requirements: *70329420
 description: Guard extension to run cli processes
 email:
 - mark@socialreferral.com
@@ -129,6 +129,7 @@ files:
 - lib/guard/process.rb
 - lib/guard/process/templates/Guardfile
 - test/guard/process_test.rb
+- test/run_2_seconds.rb
 - test/run_me.rb
 - test/test_helper.rb
 - vagrant-provision
@@ -150,9 +151,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1062270739
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11