metabuild 0.3.1 → 0.3.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('metabuild', '0.3.1') do |s|
+Echoe.new('metabuild', '0.3.2') do |s|
   s.author = "F. Brault"
   s.email = "castorpilot@yahoo.com"
   s.description = "MetaBuild is a ruby make-like tool that builds components. It supports tracking of dependencies among components, and a hierarchical reporting facility."

data/lib/metabuild.rb

@@ -567,34 +567,34 @@ module Metabuild
 
     def setup_script(cmd, env)
       file = Tempfile.new("output")
-      file.close
       script = Tempfile.new("script")
       if @has_bash
         script.puts "exec > >(tee #{file.path}) 2>&1" # Redirect output to tmpfile + tee
+        shell = "bash "
       else
         script.puts "exec > #{file.path} 2>&1" # Redirect output to tmpfile
+        shell = "sh "
       end
       env.each { |k, v| script.puts "export #{k}=#{v}"}
       script.puts cmd
-      script.close
-      return script.path, file.path
+      script.flush
+      return script, file, shell
     end
 
     def env_system(cmd, env)
-      script, file = setup_script(cmd, env)
+      script, file, shell = setup_script(cmd, env)
       puts "@@@@@@@@@@@ Running #{cmd} @@@@@@@@@@@@@"
-      shell = @has_bash ? "bash " : "sh " 
-      success = system(shell + script)
-      output = File.new(file).read.strip
-      File.delete script
-      File.delete file
+      success = system(shell + script.path)
+      output = file.read.strip
+      script.close
+      file.close
       return success, output
     end
 
     def env_spawn(cmd, env, fail_msg = "", success_msg = "")
       script, file, shell = setup_script(cmd, env)
       puts "@@@@@@@@@@@ Running #{cmd} in background @@@@@@@@@@@@@"
-      pid = spawn(shell + script)
+      pid = spawn(shell + script.path)
       return [pid, file, script, cmd, fail_msg, success_msg]
     end
 

data/metabuild.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{metabuild}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["F. Brault"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-28}
   s.description = %q{MetaBuild is a ruby make-like tool that builds components. It supports tracking of dependencies among components, and a hierarchical reporting facility.}
   s.email = %q{castorpilot@yahoo.com}
   s.extra_rdoc_files = ["README", "lib/metabuild.rb"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - F. Brault
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +02:00
+date: 2010-05-28 00:00:00 +02:00
 default_executable: 
 dependencies: []