mattock 0.3.3 → 0.3.4

data/lib/mattock/bundle-command-task.rb

@@ -2,15 +2,10 @@ require 'mattock/command-task'
 
 module Mattock
   class BundleCommandTask < CommandTask
-    class BundleEnvCleaner < CommandLine
-      def initialize(original)
-        @original = original
-      end
-
-      def run
-        original_env = ENV.to_hash
-        if defined? Bundler
-          %w{
+    def cleaned_env
+      env = {}
+      if defined? Bundler
+        %w{
             BUNDLER_EDITOR
             BUNDLE_APP_CONFIG
             BUNDLE_BIN_PATH
@@ -28,26 +23,17 @@ module Mattock
             RB_USER_INSTALL
             RUBYOPT
             VISUAL
-          }.each do |bundler_varname|
-            begin
-              ENV[bundler_varname] = Bundler::ORIGINAL_ENV.fetch(bundler_varname)
-            rescue KeyError
-              ENV.delete(bundler_varname)
-            end
-          end
+        }.each do |bundler_varname|
+          env[bundler_varname] = Bundler::ORIGINAL_ENV[bundler_varname]
         end
-        %w{
-          BUNDLE_GEMFILE
-        }
-
-        @original.run
-      ensure
-        ENV.replace(original_env)
       end
+      env["BUNDLE_GEMFILE"] = nil
+      env
     end
 
     def decorated(command)
-      BundleEnvCleaner.new(command)
+      command.command_environment.merge!(cleaned_env)
+      command
     end
   end
 end

data/lib/mattock/command-line.rb

@@ -224,6 +224,7 @@ module Mattock
   class CommandChain < CommandLine
     def initialize
       @commands = []
+      @command_environment = {}
       super(nil)
     end
 
@@ -238,7 +239,7 @@ module Mattock
     #Honestly this is sub-optimal - biggest driver for considering the
     #mini-shell approach here.
     def command_environment
-      @commands.reverse.inject({}) do |env, command|
+      @command_environment = @commands.reverse.inject(@command_environment) do |env, command|
         env.merge(command.command_environment)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mattock
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &81969870 !ruby/object:Gem::Requirement
+  requirement: &84793580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *81969870
+  version_requirements: *84793580
 - !ruby/object:Gem::Dependency
   name: valise
-  requirement: &81968880 !ruby/object:Gem::Requirement
+  requirement: &84792520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         - 6
   type: :runtime
   prerelease: false
-  version_requirements: *81968880
+  version_requirements: *84792520
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &81968150 !ruby/object:Gem::Requirement
+  requirement: &84791720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -48,7 +48,7 @@ dependencies:
         - 0
   type: :runtime
   prerelease: false
-  version_requirements: *81968150
+  version_requirements: *84791720
 description: ! "  If Rake won't do it by itself, you oughtta Mattock.\n\n  If you
   survived the pun, you might enjoy this gem.\n\n  Features:\n\n  * Extensions to
   Tasklibs to support powerful deerpaths.\n  * A commandline library that supports
@@ -102,7 +102,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- mattock-0.3.3 RDoc
+- mattock-0.3.4 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1048665203
+      hash: -1040167503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: