guard-rails 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247ef8037daba00fafc81c1b6de3e9b247be6c9e
-  data.tar.gz: 225ef5091fbc35e9747db31f79c8f168dc9a3d37
+  metadata.gz: 83779b3970067b635fd096eec98a5ff0c9614352
+  data.tar.gz: 39ef4bb2fbef9290ad1da8422527d88f106c9b55
 SHA512:
-  metadata.gz: 99a0d2e6660d9d7beeff5863110f99126325ef6bc9d7f8c9e78bbe84b81ed43505a357d08b12c1eb21f9eae3513d7f09983784db649fd23ea61aaf4693340d3c
-  data.tar.gz: ba7c3110203d8c87e9751c16c3e6e9cfaa9b3714ca9263598fd10264b81a4b31bb6f1fa533f3cee29cc0484b3c944c8702ef50bf7ef8700ce0b67d72b963e5f8
+  metadata.gz: 3a79fc3e85b8219dbb7d6ff8cd274dcf3cebd7da1f4cf3eaddbd2e71b8bebe5a267e32d3bd9d2c3f62b99899e0ff85fe3b20757a265f1f200b7e18515ff592aa
+  data.tar.gz: 131b2580e8a82b5a4598da3216fa7c5c6f66b360b3eb1c3f6c6e2e940b81634cc5e0d765ff928361715b220ec83c1eba3cfd294e910369be129fd38939ae9fa7

data/README.md

@@ -52,7 +52,7 @@ Now I can automatically restart your Rails development server as your files chan
 ## Philosophy
 
 * **All Platforms** MRI is the main test case. But will be tested under REE and JRuby.
-* **Live in edge** I am tested under Ruby 1.8.7, 1.9.3, 2.0.0 with newest gems. Will be rewrited to fit Ruby 2.0.0 when I am released as version 1.0.0.
+* **Live in edge** Ruby 1.8.7 has been deprecated. Guard-Rails will be tested under Ruby 1.9.3, 2.0.0 with newest gems. Will be rewrited with features of Ruby 2.0.0 as version 1.0.0.
 * [Semantic Version](http://semver.org/)
 
 ## Contribute

data/Rakefile

@@ -8,13 +8,13 @@ require 'rake/version_task'
 Rake::VersionTask.new
 
 include Rake::DSL if defined?(Rake::DSL)
-RVM_PREFIX = "rvm 1.8.7,1.9.3-p327,2.0.0 do"
+RVM_PREFIX = "rvm jruby,1.9.3,2.0.0 do"
 
 
 namespace :spec do
   desc "Run on three Rubies"
   task :platforms do
-    exit $?.exitstatus unless system "#{RVM_PREFIX} bundle install"
+    exit $?.exitstatus unless system "#{RVM_PREFIX} bundle install 2>&1 1>/dev/null "
     exit $?.exitstatus unless system "#{RVM_PREFIX} bundle exec rake spec"
   end
 end
@@ -26,10 +26,6 @@ task :publish do
   system %{git push origin}
   system %{git push guard}
   system %{git push gitcafe}
-end
-
-desc 'Push tags'
-task :publish_tags do
   system %{git push origin --tags}
   system %{git push guard --tags}
   system %{git push gitcafe --tags}

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/guard/rails/runner.rb

@@ -19,12 +19,12 @@ module Guard
 
     def stop
       if File.file?(pid_file)
-        pid = File.read(pid_file).strip
-        system "kill -SIGINT #{pid}"
-        wait_for_no_pid if $?.exitstatus == 0
+        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.
-        system "kill -KILL #{pid} >&2 2>#{::Guard::DEV_NULL}"
+        kill_process("KILL", pid)
         FileUtils.rm pid_file, :force => true
       end
     end
@@ -38,7 +38,7 @@ module Guard
       command = build_cli_command if options[:CLI]
       command ||= build_zeus_command if options[:zeus]
       command ||= build_rails_command
-      "#{environment.collect {|k,v| "#{k}=#{v} "}.join} cd \"#{@root}\" && #{command}"
+      "sh -c 'cd \"#{@root}\" && #{command} &'"
     end
 
     def environment
@@ -96,7 +96,7 @@ module Guard
     end
 
     def run_rails_command!
-      system "sh -c 'cd \"#{@root}\" && #{build_command} &'"
+      system(environment, build_command)
     end
 
     def has_pid?
@@ -109,7 +109,7 @@ module Guard
 
     def kill_unmanaged_pid!
       if pid = unmanaged_pid
-        system "kill -KILL #{pid}"
+        kill_process("KILL", pid)
         FileUtils.rm pid_file
         wait_for_no_pid
       end
@@ -143,5 +143,14 @@ module Guard
       end
       !(count == MAX_WAIT_COUNT)
     end
+
+    def kill_process(signal, pid)
+      begin
+        Process.kill(signal, pid)
+        true
+      rescue Errno::EINVAL, Errno::ESRCH, RangeError
+        false
+      end
+    end
   end
 end

metadata

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