guard-spork 0.1.7 → 0.1.8

data/README.rdoc

@@ -61,6 +61,14 @@ 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:
+
+  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
@@ -69,6 +77,8 @@ Available options:
     :bundler => false      # Don't use "bundle exec"
     :rspec_port => 1234    # Default: 8989
     :cucumber_port => 4321 # Default: 8990
+    :rspec_env
+    :cucumber_env
 
 == Common troubleshooting
 

data/lib/guard/spork.rb

@@ -7,10 +7,9 @@ module Guard
     autoload :Runner, 'guard/spork/runner'
     attr_accessor :runner
 
-    def initialize(watchers = [], options = {})
+    def initialize(watchers=[], options={})
       super
       @runner = Runner.new(options)
-
     end
 
     def start
@@ -33,4 +32,4 @@ module Guard
     end
 
   end
-end
+end

data/lib/guard/spork/runner.rb

@@ -5,11 +5,13 @@ module Guard
     class Runner
       attr_accessor :options
 
-      def initialize(options = {})
+      def initialize(options={})
         options[:wait]          ||= 20 # seconds
         options[:rspec_port]    ||= 8989
         options[:cucumber_port] ||= 8990
-        @options = options
+        options[:rspec_env]     ||= nil
+        options[:cucumber_env]  ||= nil
+        @options  = options
         @children = {}
 
         Signal.trap('CHLD', self.method(:reap_children))
@@ -17,27 +19,37 @@ module Guard
 
       def launch_sporks(action)
         UI.info "#{action.capitalize}ing Spork for #{sporked_gems} ", :reset => true
-        spawn_child(spork_command("rspec")) if rspec?
-        spawn_child(spork_command("cucumber")) if cucumber?
+        spawn_child(options[:rspec_env], spork_command("rspec")) if rspec?
+        spawn_child(options[:cucumber_env], spork_command("cucumber")) if cucumber?
         verify_launches(action)
       end
 
       def kill_sporks
-        UI.debug "Killing sporks #{spork_pids.join(', ')}"
+        UI.debug "Killing Spork servers with PID: #{spork_pids.join(', ')}"
         spork_pids.each { |pid| Process.kill("KILL", pid) }
       end
 
     private
-      def spawn_child(cmd)
+
+      def spawn_child(env, cmd)
         pid = fork
         raise "Fork failed." if pid == -1
 
         unless pid
           ignore_control_signals
-          exec(cmd)
+          if env
+            if RUBY_VERSION > "1.9"
+              exec(env, cmd)
+            else
+              env.each { |key, value| ENV[key] = value }
+              exec(cmd)
+            end
+          else
+            exec(cmd)
+          end
         end
 
-        UI.debug "Spawned spork #{pid} ('#{cmd}')"
+        UI.debug "Spawned Spork server #{pid} ('#{cmd}')"
         @children[pid] = cmd
         pid
       end
@@ -80,8 +92,7 @@ module Guard
         when "rspec"
           cmd_parts << "-p #{options[:rspec_port]}"
         when "cucumber"
-          cmd_parts << "cu"
-          cmd_parts << "-p #{options[:cucumber_port]}"
+          cmd_parts << "cu -p #{options[:cucumber_port]}"
         end
 
         cmd_parts.join(" ")
@@ -96,12 +107,12 @@ module Guard
           rescue Errno::ECONNREFUSED
             next
           end
-          UI.info "Spork for #{sporked_gems} successfully #{action}ed", :reset => true
+          UI.info "Spork server for #{sporked_gems} successfully #{action}ed", :reset => true
           Notifier.notify "#{sporked_gems} successfully #{action}ed", :title => "Spork", :image => :success
           return true
         end
         UI.reset_line # workaround before Guard::UI update
-        UI.error "Could not #{action} Spork for #{sporked_gems}. Make sure you can use it manually first."
+        UI.error "Could not #{action} Spork server for #{sporked_gems}. Make sure you can use it manually first."
         Notifier.notify "#{sporked_gems} NOT #{action}ed", :title => "Spork", :image => :failed
       end
 

data/lib/guard/spork/templates/Guardfile

@@ -1,7 +1,7 @@
-guard 'spork' do
+guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'cucumber' }, :rspec_env => { 'RAILS_ENV' => 'test' } do
   watch('config/application.rb')
   watch('config/environment.rb')
-  watch(%r{^config/environments/.*\.rb$})
-  watch(%r{^config/initializers/.*\.rb$})
+  watch(%r{^config/environments/.+\.rb$})
+  watch(%r{^config/initializers/.+\.rb$})
   watch('spec/spec_helper.rb')
 end

data/lib/guard/spork/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-spork
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +02:00
+date: 2011-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,8 +62,7 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 12
-        version: 1.0.12
+        version: "1.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,12 +73,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 9
         segments: 
         - 2
         - 5
-        - 0
-        version: 2.5.0
+        version: "2.5"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,15 +88,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        version: "0.2"
   type: :development
   version_requirements: *id005
-description: Guard::Spork automatically manage Spork DRb servers
+description: Guard::Spork automatically manage Spork DRb servers.
 email: 
 - thibaud@thibaud.me
 executables: []
@@ -128,10 +125,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: