guard-rails 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4993998568fc28ef3fb95b21ca6218ee8e3c75a
-  data.tar.gz: f6ec00aeadf3e7856e7fed9c1f2c31ce7f5ffa32
+  metadata.gz: 9b55d8368b1a3d146c369b5f90d86c29aed33b8d
+  data.tar.gz: 7237ddaa55dd8240ff9806723678679671373f64
 SHA512:
-  metadata.gz: a60ae39c59768bc8c49737257845abe3d0da933a779a831debb193acb11102ee191c33aacc5130baa018ea9395d104bb15facf1e19bda36f56b24c0484f5f6b1
-  data.tar.gz: cb728ed6d519d0f9bf9cc6cd2135bf62f49c046d1670322428ebd386cfdb83a1b4f0351bec17f386062cd7e70db3fe532b755b11bf24c33a0714681e6e4ce813
+  metadata.gz: da6962b23d74fee50629fb72a65e3e0d2108084d55dc00a51a61eb3a81cc666474c2078ea476fdba16c8083a0bacf79b1d4f274ec5c1ab362d9e553b3ad98e10
+  data.tar.gz: 51d15fc8c4060bb00addc22d54959002d70707afbe2f871d74d42b8c1b3d209399a4e39ed2704eb91b9e10c64c03e295b0249edd4ec8002124aaa95d2c71d640

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/guard/rails.rb

@@ -33,7 +33,7 @@ module Guard
     end
 
     def start
-      UI.info "[Guard::Rails] will restart #{options[:server]} on port #{options[:port]} in #{options[:environment]}."
+      UI.info "[Guard::Rails] will start #{options[:server] || "the default web server"} on port #{options[:port]} in #{options[:environment]}."
       reload("start") if options[:start_on_start]
     end
 

data/lib/guard/rails/runner.rb

@@ -18,14 +18,14 @@ module Guard
     end
 
     def stop
-      if File.file?(pid_file)
+      if has_pid?
         pid = File.read(pid_file).strip.to_i
         sig_sent = kill_process("INT", pid)
         wait_for_no_pid if sig_sent
 
         # If you lost your pid_file, you are already died.
         kill_process("KILL", pid)
-        FileUtils.rm pid_file, :force => true
+        remove_pid_file_and_wait_for_no_pid
       end
     end
 
@@ -56,7 +56,7 @@ module Guard
     end
 
     def pid
-      File.file?(pid_file) ? File.read(pid_file).to_i : nil
+      has_pid? ? File.read(pid_file).to_i : nil
     end
 
     def sleep_time
@@ -110,8 +110,7 @@ module Guard
     def kill_unmanaged_pid!
       if pid = unmanaged_pid
         kill_process("KILL", pid)
-        FileUtils.rm pid_file
-        wait_for_no_pid
+        remove_pid_file_and_wait_for_no_pid
       end
     end
 
@@ -128,16 +127,23 @@ module Guard
     private
 
     def wait_for_pid
-      wait_for_pid_loop
+      wait_for_pid_loop { has_pid? }
     end
 
     def wait_for_no_pid
-      wait_for_pid_loop(false)
+      wait_for_pid_loop { !has_pid? }
+    end
+
+    def remove_pid_file_and_wait_for_no_pid
+      wait_for_pid_loop do
+        FileUtils.rm pid_file, :force => true
+        !has_pid?
+      end
     end
 
-    def wait_for_pid_loop(check_for_existince = true)
+    def wait_for_pid_loop
       count = 0
-      while !(check_for_existince ? has_pid? : !has_pid?) && count < MAX_WAIT_COUNT
+      while !yield && count < MAX_WAIT_COUNT
         wait_for_pid_action
         count += 1
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - John Bintz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard