guard-spork 1.2.3 → 1.3.0

data/lib/guard/spork.rb

@@ -1,15 +1,13 @@
 require 'guard'
 require 'guard/guard'
-require 'sys/proctable'
 require 'childprocess'
-require 'rinda/ring'
-require 'guard/spork/rinda_ring_finger_patch'
 
 module Guard
   class Spork < Guard
 
     autoload :Runner, 'guard/spork/runner'
     autoload :SporkInstance, 'guard/spork/spork_instance'
+    autoload :SporkWindowsInstance, 'guard/spork/spork_windows_instance'
     attr_accessor :runner
 
     def initialize(watchers=[], options={})

data/lib/guard/spork/runner.rb

@@ -42,37 +42,31 @@ module Guard
 
       def kill_global_sporks
         if options[:aggressive_kill]
-          kill_pids ps_spork_pids
+          kill_pids self.class.spork_instance_class.spork_pids
         end
       end
 
+      def self.windows?
+        ENV['OS'] == 'Windows_NT'
+      end
+
     private
 
       def initialize_spork_instances
         @spork_instances = []
         [:rspec, :cucumber, :test_unit, :minitest].each do |type|
           port, env = options[:"#{type}_port"], options[:"#{type}_env"]
-          spork_instances << SporkInstance.new(type, port, env, :bundler => should_use?(:bundler), :foreman => should_use?(:foreman), :quiet => should_use?(:quiet)) if should_use?(type)
+          spork_instances << self.class.spork_instance_class.new(type, port, env, :bundler => should_use?(:bundler), :foreman => should_use?(:foreman), :quiet => should_use?(:quiet)) if should_use?(type)
         end
       end
 
-      def kill_pids(pids)
-        UI.debug "Killing Spork servers with PID: #{pids.join(', ')}"
-        pids.each { |pid| ::Process.kill("KILL", pid) }
+      def self.spork_instance_class
+        windows? ? SporkWindowsInstance : SporkInstance
       end
 
-      def ps_spork_pids
-        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
+      def kill_pids(pids)
+        UI.debug "Killing Spork servers with PID: #{pids.join(', ')}"
+        pids.each { |pid| ::Process.kill("KILL", pid) rescue nil }
       end
 
       def find_instances(type = nil)
@@ -152,6 +146,7 @@ module Guard
       def detect_foreman
         File.exist?("Procfile")
       end
+
     end
   end
 end

data/lib/guard/spork/spork_instance.rb

@@ -26,11 +26,7 @@ module Guard
       end
 
       def start
-        cmd = [command]
-
-        if self.class.windows?
-          cmd = ["cmd", "/C"] + cmd
-        end
+				cmd = command
 
         ::Guard::UI.debug "guard-spork command execution: #{cmd}"
 
@@ -42,11 +38,7 @@ module Guard
       end
 
       def stop
-        unless self.class.windows?
-          process.stop
-        else
-          kill_all_child_processes
-        end
+        process.stop
       end
 
       def alive?
@@ -56,19 +48,21 @@ module Guard
       def running?
         return false unless alive?
         TCPSocket.new('localhost', port).close
-        if self.class.windows?
-          running_on_windows?
-        else
-          true
-        end
+        true
       rescue Errno::ECONNREFUSED
         false
       end
 
       def command
         parts = []
-        parts << "bundle exec" if use_bundler?
-        parts << "foreman run" if use_foreman?
+				if use_bundler? 
+					parts << "bundle"
+					parts << "exec"
+				end
+				if use_foreman?
+					parts << "foreman"
+					parts << "run"
+				end
         parts << "spork"
 
         if type == :test_unit
@@ -79,13 +73,14 @@ module Guard
           parts << "minitest"
         end
 
-        parts << "-p #{port}"
+        parts << "-p"
+			 	parts <<	port.to_s
         parts << "-q" if options[:quiet]
-        parts.join(" ")
+        parts
       end
 
-      def self.windows?
-        RUBY_PLATFORM =~ /mswin|msys|mingw/
+      def self.spork_pids
+        `ps aux | awk '/spork/&&!/awk/{print $2;}'`.split("\n").map { |pid| pid.to_i }
       end
 
     private
@@ -98,31 +93,6 @@ 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
-        false
-      end
-
     end
   end
 end

data/lib/guard/spork/spork_windows_instance.rb

@@ -0,0 +1,62 @@
+require 'rinda/ring'
+require 'guard/spork/rinda_ring_finger_patch'
+
+module Guard
+  class Spork
+    class SporkWindowsInstance < SporkInstance
+      def command
+        ["cmd", "/C"] + super
+      end
+
+      def stop
+        kill_all_spork_processes
+      end
+
+      def running?
+        super && drb_ready?
+      end
+
+      def self.spork_pids
+        spork_processes.map { |process| process[:pid] }
+      end
+
+      private 
+
+      def drb_ready?
+        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
+        false
+      end
+
+      def kill_all_spork_processes
+        all_pids_for(pid, self.class.spork_processes).each do |pid|
+          Process.kill 9, pid rescue nil
+        end
+      end
+
+      def all_pids_for(parent_pid, processes)
+        processes.inject([parent_pid]) do |memo, process|
+          memo += all_pids_for(process[:pid], processes) if process[:ppid] == parent_pid
+          memo
+        end
+      end
+
+      def self.spork_processes
+        require "win32ole"
+        WIN32OLE.connect("winmgmts://.").InstancesOf("win32_process").
+          each.
+          select do |p| 
+            p.commandline =~ /spork|ring_server|magazine_slave_provider/ && 
+              File.basename(p.executablepath, File.extname(p.executablepath)) =~ /^(cmd|ruby)$/i
+          end.
+          map { |p| {:pid => p.processid, :ppid => p.parentprocessid} }
+      end
+
+    end
+  end
+end

data/lib/guard/spork/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module SporkVersion
-    VERSION = "1.2.3"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-spork
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
-- !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
@@ -133,6 +117,7 @@ files:
 - lib/guard/spork/rinda_ring_finger_patch.rb
 - lib/guard/spork/runner.rb
 - lib/guard/spork/spork_instance.rb
+- lib/guard/spork/spork_windows_instance.rb
 - lib/guard/spork/templates/Guardfile
 - lib/guard/spork/version.rb
 - lib/guard/spork.rb