Output the current environment in debug output when shelling out

CHANGELOG.md

@@ -9,7 +9,8 @@ Unreleased
 - Fix a bug in `windows_safe_path` to always return a string
 - Add a `Config.base_dir` configuration value for easy tuning
 - Remove the use of `Omnibus.root` in `BuildVersion#initializer`. This removes the many deprecation warnings that print on each software load.
-- Output the current command in debug output
+- Output the current command in debug output when shelling out
+- Output the current environment in debug output when shelling out
 
 
 v3.1.0 (May 14, 2014)

lib/omnibus/util.rb

@@ -46,10 +46,20 @@ module Util
     #
     def shellout(*args)
       options = args.last.kind_of?(Hash) ? args.pop : {}
+      options = SHELLOUT_OPTIONS.merge(options)
 
+      # Log any environment options given
+      unless options[:environment].empty?
+        Omnibus.logger.debug { 'Environment:' }
+        options[:environment].each do |key, value|
+          Omnibus.logger.debug { "  #{key.to_s.upcase}=#{value.inspect}" }
+        end
+      end
+
+      # Log the actual command
       Omnibus.logger.debug { "$ #{args.join(' ')}" }
 
-      cmd = Mixlib::ShellOut.new(*args, SHELLOUT_OPTIONS.merge(options))
+      cmd = Mixlib::ShellOut.new(*args, options)
       cmd.run_command
       cmd
     end