guard-spork 1.1.0 → 1.2.0

data/README.md

@@ -100,6 +100,7 @@ Available options:
 :cucumber => false
 :rspec => false
 :test_unit => false
+:minitest => false
 :bundler => false                          # Don't use "bundle exec"
 :test_unit_port => 1233                    # Default: 8988
 :rspec_port => 1234                        # Default: 8989

data/lib/guard/spork.rb

@@ -1,5 +1,8 @@
 require 'guard'
 require 'guard/guard'
+require 'sys/proctable'
+require 'childprocess'
+require 'rinda/ring'
 
 module Guard
   class Spork < Guard

data/lib/guard/spork/runner.rb

@@ -62,7 +62,17 @@ module Guard
       end
 
       def ps_spork_pids
-        `ps aux | awk '/spork/&&!/awk/{print $2;}'`.split("\n").map { |pid| pid.to_i }
+        unless SporkInstance.windows?
+          `ps aux | awk '/spork/&&!/awk/{print $2;}'`.split("\n").map { |pid| pid.to_i }
+        else
+          Sys::ProcTable.ps.reduce([]) do |spork_pids, process|
+            spork_process = process.cmdline =~ /spork/ || 
+                            process.cmdline =~ /ring_server/ || 
+                            process.cmdline =~ /magazine_slave_provider/
+            spork_pids << process.pid if spork_process
+            spork_pids
+          end
+        end
       end
 
       def find_instances(type = nil)

data/lib/guard/spork/spork_instance.rb

@@ -1,7 +1,7 @@
 module Guard
   class Spork
     class SporkInstance
-      attr_reader :type, :env, :port, :options, :pid
+      attr_reader :type, :env, :port, :options, :pid, :process
 
       def initialize(type, port, env, options)
         @type = type
@@ -26,24 +26,39 @@ module Guard
       end
 
       def start
-        @pid = fork do
-          env_exec env, command
+        cmd = [command]
+
+        if self.class.windows?
+          cmd = ["cmd", "/C"] + cmd
         end
+
+        @process = ChildProcess.build *cmd
+        @process.environment.merge!(env)
+        @process.io.inherit!
+        @process.start
+        @pid = @process.pid
       end
 
       def stop
-        ::Process.kill('TERM', pid)
+        unless self.class.windows?
+          process.stop
+        else
+          kill_all_child_processes
+        end
       end
 
       def alive?
-        return false unless pid
-        ::Process.waitpid(pid, ::Process::WNOHANG).nil?
+        pid && process.alive?
       end
 
       def running?
-        return false unless pid
+        return false unless alive?
         TCPSocket.new('localhost', port).close
-        true
+        if self.class.windows?
+          running_on_windows?
+        else
+          true
+        end
       rescue Errno::ECONNREFUSED
         false
       end
@@ -67,13 +82,8 @@ module Guard
         parts.join(" ")
       end
 
-      def env_exec(environment, command)
-        if RUBY_VERSION > "1.9"
-          exec environment, command
-        else
-          environment.each_pair { |key, value| ENV[key] = value }
-          exec command
-        end
+      def self.windows?
+        RUBY_PLATFORM =~ /mswin|msys|mingw/
       end
 
     private
@@ -86,6 +96,31 @@ module Guard
         options[:foreman]
       end
 
+      def kill_all_child_processes
+        all_pids_for(pid).each do |pid|
+          Process.kill 9, pid
+        end
+      end
+
+      def all_pids_for(parent_pid)
+        pids = [parent_pid]
+        Sys::ProcTable.ps do |process|
+          pids += all_pids_for(process.pid) if process.ppid == parent_pid
+        end
+        pids
+      end
+
+      def running_on_windows?
+        DRb.start_service
+        # make sure that ringfinger is not taken from cache, because it won't
+        # work after guard-spork has been restarted
+        Rinda::RingFinger.class_variable_set :@@finger, nil
+        ts = Rinda::RingFinger.primary
+        ts.read_all([:name, :MagazineSlave, nil, nil]).size > 0
+      rescue DRb::DRbConnError
+        false
+      end
+
     end
   end
 end

data/lib/guard/spork/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module SporkVersion
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-spork
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement