guns 0.1.3 → 0.1.4

data/guns.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'guns'
-  s.version = '0.1.3'
+  s.version = '0.1.4'
   s.date = '2009-10-30'
 
   s.description = "Guns - It's got two pipes; got tickets to the show?"

data/lib/guns.rb

@@ -50,9 +50,21 @@ module Guns
   module_function :sh
 
   def sh!(cmd, *args)
-    out, err, code = sh(cmd, *args)
-    cmd << " " << args.join(" ") if !args.empty?
-    raise Failure, "(#{cmd})\n#{err}" if code != 0
+    env = args.pop if args.last.kind_of?(Hash)
+    env ||= {}
+    out, err, code = sh(cmd, *(args + [env]))
+    if code != 0
+      cmd << " " << args.join(" ") if !args.empty?
+      said = []
+      said << out if !out.empty?
+      said << err if !err.empty?
+      said = said.join "\n"
+      if !env.empty?
+        envs = env.map {|a| a * "=" }.join(" ")
+        cmd = envs << " " << cmd
+      end
+      raise Failure, "(#{cmd})\n#{said}}"
+    end
     [out, err, code]
   end
   module_function :sh!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: guns
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Blake Mizerany