guard-spork 0.4.1 → 0.5.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Thibaud Guillaume-Gentil
+Copyright (c) 2010-12 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,7 +3,7 @@
 Guard::Spork allows to automatically & intelligently start/reload your RSpec/Cucumber/Test::Unit [Spork](https://github.com/timcharper/spork) server(s).
 
 * Compatible with Spork 0.8.4 & 0.9.0.rcX.
-* Tested against Ruby 1.8.7, 1.9.2, REE and the latest versions of JRuby & Rubinius.
+* Tested against Ruby 1.8.7, 1.9.2, REE and the latest versions Rubinius.
 
 ## Install
 
@@ -13,9 +13,13 @@ Install the gem:
 
     $ gem install guard-spork
 
-Add it to your Gemfile (inside test group):
+Add it to your Gemfile (inside development group):
 
-    gem 'guard-spork'
+```ruby
+group :development do
+  gem 'guard-spork'
+end
+```
 
 Add guard definition to your Guardfile with:
 
@@ -79,7 +83,6 @@ guard 'spork', :cucumber => false, :bundler => false do
 end
 ```
 
-
 You can provide additional environment variables for RSpec, Cucumber, and Test::Unit with the <tt>:rspec_env</tt>, <tt>:cucumber_env</tt>, and <tt>:test_unit_env</tt> options:
 
 ``` ruby

data/lib/guard/spork.rb

@@ -11,11 +11,6 @@ module Guard
     def initialize(watchers=[], options={})
       super
       @runner = Runner.new(options)
-
-      # This class will be reinitialized by Guard when the Guardfile
-      # is reevaluated, so we must always begin by trying to clean
-      # up after any hypothetical predecessor
-      runner.reevaluate
     end
 
     def start

data/lib/guard/spork/runner.rb

@@ -34,23 +34,12 @@ module Guard
 
       def kill_global_sporks
         if options[:aggressive_kill]
-          kill_global_sporks!
-        end
-      end
-
-      def kill_global_sporks!
-        kill_pids ps_spork_pids
-      end
-
-      def reevaluate
-        if ENV['SPORK_PIDS']
-          kill_pids(ENV['SPORK_PIDS'].split(',').map(&:to_i))
-          ENV.delete('SPORK_PIDS')
-          launch_sporks("reload")
+          kill_pids ps_spork_pids
         end
       end
 
     private
+
       def initialize_spork_instances
         @spork_instances = []
         [:rspec, :cucumber, :test_unit].each do |type|
@@ -61,7 +50,11 @@ module Guard
 
       def kill_pids(pids)
         UI.debug "Killing Spork servers with PID: #{pids.join(', ')}"
-        pids.each { |pid| Process.kill("KILL", pid) }
+        pids.each { |pid| ::Process.kill("KILL", pid) }
+      end
+
+      def ps_spork_pids
+        `ps aux | awk '/spork/&&!/awk/{print $2;}'`.split("\n").map { |pid| pid.to_i }
       end
 
       def find_instances(type = nil)
@@ -106,10 +99,6 @@ module Guard
         false
       end
 
-      def ps_spork_pids
-        `ps aux | awk '/spork/&&!/awk/{print $2;}'`.split("\n").map { |pid| pid.to_i }
-      end
-
       def should_use?(what)
         if options[what].nil?
           send("detect_#{what}")

data/lib/guard/spork/spork_instance.rb

@@ -27,11 +27,10 @@ module Guard
         @pid = fork do
           env_exec env, command
         end
-        store_pid
       end
 
       def stop
-        Process.kill('KILL', pid)
+        ::Process.kill('KILL', pid)
       end
 
       def alive?
@@ -71,17 +70,12 @@ module Guard
         end
       end
 
-      private
-        def use_bundler?
-          options[:bundler]
-        end
+    private
+
+      def use_bundler?
+        options[:bundler]
+      end
 
-        def store_pid
-          # We need to store away the PIDs somewhere safe since
-          # Guard will destroy our class instances when Guardfile is
-          # reevaluated without telling us beforehand
-          ENV['SPORK_PIDS'] = [ENV['SPORK_PIDS'], pid.to_s].compact.join(",")
-        end
     end
   end
 end

data/lib/guard/spork/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module SporkVersion
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-spork
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
+date: 2012-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70353733404680 !ruby/object:Gem::Requirement
+  requirement: &70289442836600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70353733404680
+  version_requirements: *70289442836600
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70353733404200 !ruby/object:Gem::Requirement
+  requirement: &70289442835940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70353733404200
+  version_requirements: *70289442835940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70353733403720 !ruby/object:Gem::Requirement
+  requirement: &70289442835200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70353733403720
+  version_requirements: *70289442835200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353733403260 !ruby/object:Gem::Requirement
+  requirement: &70289442834340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70353733403260
+  version_requirements: *70289442834340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70353733402800 !ruby/object:Gem::Requirement
+  requirement: &70289442833400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70353733402800
+  version_requirements: *70289442833400
 description: Guard::Spork automatically manage Spork DRb servers.
 email:
 - thibaud@thibaud.me
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-spork
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Guard gem for Spork