guard-spork 0.1.8 → 0.1.9

data/README.rdoc

@@ -2,8 +2,8 @@
 
 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.
-- Tested on Ruby 1.8.6, 1.8.7 & 1.9.2.
+- Compatible with Spork 0.8.4 & 0.9.0.rcXX.
+- Tested on Ruby 1.8.6, 1.8.7, REE, 1.9.2, JRuby & Rubinius.
 
 == Install
 
@@ -61,30 +61,28 @@ Guard::Spork automatically detect RSpec/Cucumber/Bundler presence but you can di
       ...
     end
 
-To append additional environment variables for rspec and cucumber you can provided a hash to rspec_env/cucumber_env:
+You can provide additional environment variables for RSpec and Cucumber with the <tt>:rspec_env</tt> and <tt>:cucumber_env</tt> options:
 
-  guard 'spork', :cucumber_env => {'RAILS_ENV' => 'cucumber'}, :rspec_env => {'RAILS_ENV' => 'test'} do
+  guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'cucumber' }, :rspec_env => { 'RAILS_ENV' => 'test' } do
     ...
   end
-  
-<b>IMPORTANT: when using ruby 1.8.x please set the env for both rspec and cucumber as they will overwrite each other and the system env's</b>  
-  
+
 Available options:
 
-    :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 => 1234    # Default: 8989
-    :cucumber_port => 4321 # Default: 8990
-    :rspec_env
-    :cucumber_env
+  :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 => 1234                       # Default: 8989
+  :cucumber_port => 4321                    # Default: 8990
+  :rspec_env => { 'RAILS_ENV' => 'foo' }    # Default: nil
+  :cucumber_env => { 'RAILS_ENV' => 'bar' } # Default: nil
 
 == Common troubleshooting
 
 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/Cucumber. 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 <tt>:wait</tt> option before any further investigation.
 

data/lib/guard/spork/runner.rb

@@ -37,15 +37,10 @@ module Guard
 
         unless pid
           ignore_control_signals
-          if env
-            if RUBY_VERSION > "1.9"
-              exec(env, cmd)
-            else
-              env.each { |key, value| ENV[key] = value }
-              exec(cmd)
-            end
+          if RUBY_VERSION > "1.9"
+            exec(env, cmd)
           else
-            exec(cmd)
+            swap_env(env || []) { exec(cmd) }
           end
         end
 
@@ -60,6 +55,20 @@ module Guard
         Signal.trap('TSTP', 'IGNORE')
       end
 
+      def swap_env(env)
+        old_env = {}
+        env.each do |key, value|
+          old_env[key] = ENV[key]
+          ENV[key]     = value
+        end
+
+        yield
+
+        env.each do |key, value|
+          ENV[key] = old_env[key]
+        end
+      end
+
       def reap_children(sig)
         terminated_children.each do |stat|
           pid = stat.pid

data/lib/guard/spork/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module SporkVersion
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: guard-spork
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
+  prerelease: 
+  version: 0.1.9
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
         version: 0.2.2
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
         version: 0.8.4
   type: :runtime
   version_requirements: *id002
@@ -58,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :development
   version_requirements: *id003
@@ -73,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
   type: :development
   version_requirements: *id004
@@ -88,10 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
         version: "0.2"
   type: :development
   version_requirements: *id005
@@ -125,27 +98,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: guard-spork
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Guard gem for Spork