guard-spork 0.1.6 → 0.1.7

data/README.rdoc

@@ -1,13 +1,13 @@
 = Guard::Spork
 
-Spork guard allows to automatically & intelligently start/reload your RSpec/Cucumber Spork server(s).
+Guard::Spork allows to automatically & intelligently start/reload your RSpec/Cucumber {Spork}[https://github.com/timcharper/spork] server(s).
 
-- Compatible with Spork 0.8.4 & 0.9.0.rc3
+- Compatible with Spork 0.8.4 & 0.9.0.rc3.
 - Tested on Ruby 1.8.6, 1.8.7 & 1.9.2.
 
 == Install
 
-Please be sure to have {Guard}[http://github.com/guard/guard] installed before continue.
+Please be sure to have {Guard}[https://github.com/guard/guard] installed before continue.
 
 Install the gem:
 
@@ -23,14 +23,13 @@ Add guard definition to your Guardfile with:
 
 == Usage
 
-Please read {Guard usage doc}[http://github.com/guard/guard#readme]
+Please read {Guard usage doc}[https://github.com/guard/guard#readme].
 
 == Guardfile
 
-Spork guard can be really be adapated to all kind of projects.
-Please read {Guard doc}[http://github.com/guard/guard#readme] for more info about Guardfile DSL.
+Please read {Guard doc}[https://github.com/guard/guard#readme] for more info about the Guardfile DSL.
 
-!!! IMPORTANT: place Spork guard before rspec/cucumber guards !!!
+<b>IMPORTANT: place Spork guard before RSpec/Cucumber guards!</b>
 
 === Rails app
 
@@ -44,19 +43,19 @@ Please read {Guard doc}[http://github.com/guard/guard#readme] for more info abou
 
 === Running specs over Spork
 
-Pass the :drb => true option to {guard-rspec}[http://github.com/guard/guard-rspec] and/or {guard-cucumber}[http://github.com/guard/guard-cucumber] to run them over the Spork DRb server:
+Pass the <tt>:cli => "--drb"</tt> option to {Guard::RSpec}[https://github.com/guard/guard-rspec] and/or {Guard::Cucumber}[https://github.com/guard/guard-cucumber] to run them over the Spork DRb server:
 
-    guard 'rspec', :drb => true do
+    guard 'rspec', :cli => "--drb" do
       ...
     end
 
-    guard 'cucumber', :drb => true do
+    guard 'cucumber', :cli => "--drb" do
       ...
     end
 
 == Options
 
-Spork guard automatically detect RSpec/Cucumber/Bundler presence but you can disable any of them with the corresponding options:
+Guard::Spork automatically detect RSpec/Cucumber/Bundler presence but you can disable any of them with the corresponding options:
 
     guard 'spork', :cucumber => false, :bundler => false do
       ...
@@ -64,29 +63,29 @@ Spork guard automatically detect RSpec/Cucumber/Bundler presence but you can dis
 
 Available options:
 
-    :wait => 30            # Seconds to wait server launch, default 20
+    :wait => 30            # Seconds to wait for the server to starts, default: 20
     :cucumber => false
     :rspec => false
-    :bundler => false      # don't use "bundle exec"
-    :rspec_port => xxxx    # default 8989
-    :cucumber_port => xxxx # default 8990
+    :bundler => false      # Don't use "bundle exec"
+    :rspec_port => 1234    # Default: 8989
+    :cucumber_port => 4321 # Default: 8990
 
 == Common troubleshooting
 
-If you can start Spork manually but get the following error message when using Spork guard:
+If you can start Spork manually but get the following error message when using Guard::Spork:
 
-    Starting Spork for RSpec ERROR: Could not start Spork for RSpec. Make sure you can use it manually first.
+    Starting Spork for RSpec ERROR: Could not start Spork for RSpec/Cucumber. Make sure you can use it manually first.
 
-Try to increase the value of the :wait option before any further investigation.
+Try to increase the value of the <tt>:wait</tt> option before any further investigation.
 
 == Development
 
-- Source hosted at {GitHub}[http://github.com/guard/guard-spork]
-- Report issues/Questions/Feature requests on {GitHub Issues}[http://github.com/guard/guard-spork/issues]
+- Source hosted at {GitHub}[https://github.com/guard/guard-spork]
+- Report issues/Questions/Feature requests on {GitHub Issues}[https://github.com/guard/guard-spork/issues]
 
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
 you make.
 
 == Authors
 
-{Thibaud Guillaume-Gentil}[http://github.com/thibaudgg]
+{Thibaud Guillaume-Gentil}[https://github.com/thibaudgg]

data/lib/guard/spork/runner.rb

@@ -1,5 +1,4 @@
 require 'socket'
-require 'sfl'
 
 module Guard
   class Spork
@@ -11,20 +10,66 @@ module Guard
         options[:rspec_port]    ||= 8989
         options[:cucumber_port] ||= 8990
         @options = options
+        @children = {}
+
+        Signal.trap('CHLD', self.method(:reap_children))
       end
 
       def launch_sporks(action)
         UI.info "#{action.capitalize}ing Spork for #{sporked_gems} ", :reset => true
-        spawn(spork_command("rspec")) if rspec?
-        spawn(spork_command("cucumber")) if cucumber?
+        spawn_child(spork_command("rspec")) if rspec?
+        spawn_child(spork_command("cucumber")) if cucumber?
         verify_launches(action)
       end
 
       def kill_sporks
+        UI.debug "Killing sporks #{spork_pids.join(', ')}"
         spork_pids.each { |pid| Process.kill("KILL", pid) }
       end
 
     private
+      def spawn_child(cmd)
+        pid = fork
+        raise "Fork failed." if pid == -1
+
+        unless pid
+          ignore_control_signals
+          exec(cmd)
+        end
+
+        UI.debug "Spawned spork #{pid} ('#{cmd}')"
+        @children[pid] = cmd
+        pid
+      end
+
+      def ignore_control_signals
+        Signal.trap('QUIT', 'IGNORE')
+        Signal.trap('INT', 'IGNORE')
+        Signal.trap('TSTP', 'IGNORE')
+      end
+
+      def reap_children(sig)
+        terminated_children.each do |stat|
+          pid = stat.pid
+          if cmd = @children.delete(pid)
+            UI.debug "Reaping spork #{pid}"
+          end
+        end
+      end
+
+      def terminated_children
+        stats = []
+        loop do
+          begin
+            pid, stat = Process.wait2(-1, Process::WNOHANG)
+            break if pid.nil?
+            stats << stat
+          rescue Errno::ECHILD
+            break
+          end
+        end
+        stats
+      end
 
       def spork_command(type)
         cmd_parts = []
@@ -61,7 +106,7 @@ module Guard
       end
 
       def spork_pids
-        `ps aux | awk '/spork/&&!/awk/{print $2;}'`.split("\n").map { |pid| pid.to_i }
+        @children.keys
       end
 
       def sporked_gems

data/lib/guard/spork/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module SporkVersion
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-spork
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 21
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,69 +50,54 @@ dependencies:
         version: 0.8.4
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sfl
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 15
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 12
+        version: 1.0.12
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 27
         segments: 
         - 2
-        - 2
+        - 5
         - 0
-        version: 2.2.0
+        version: 2.5.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 9
-        version: 0.1.9
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: Guard::Spork automatically manage Spork DRb servers
 email: 
 - thibaud@thibaud.me
@@ -161,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard-spork
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Guard gem for Spork