Permalink
Browse files

Merge branch 'master' into wmic

Conflicts:
	guard-spork.gemspec
  • Loading branch information...
2 parents 38aa6da + 7816a15 commit 3905cc15f39c7964de6d1c41657cb98a52bbc7c7 @jarmo jarmo committed Nov 18, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 guard-spork.gemspec
  2. +3 −1 lib/guard/spork/spork_instance.rb
  3. +1 −1 lib/guard/spork/version.rb
View
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency 'guard', '>= 1.1'
s.add_dependency 'spork', '>= 0.8.4'
- s.add_dependency 'childprocess'
+ s.add_dependency 'childprocess', '>= 0.2.3'
s.add_development_dependency 'bundler', '~> 1.0'
s.add_development_dependency 'rspec', '~> 2.10'
@@ -32,8 +32,10 @@ def start
cmd = ["cmd", "/C"] + cmd
end
+ ::Guard::UI.debug "guard-spork command execution: #{cmd}"
+
@process = ChildProcess.build *cmd
- @process.environment.merge!(env)
+ @process.environment.merge!(env) unless env.empty?
@process.io.inherit!
@process.start
@pid = @process.pid
@@ -1,5 +1,5 @@
module Guard
module SporkVersion
- VERSION = "1.1.0"
+ VERSION = "1.2.3"
end
end

0 comments on commit 3905cc1

Please sign in to comment.