capistrano-strategy-copy-bundled 0.3.0 → 0.4.0

data/capistrano-strategy-copy-bundled.gemspec

@@ -4,7 +4,7 @@ require 'capistrano-strategy-copy-bundled'
 
 Gem::Specification.new do |s|
   s.name        = "capistrano-strategy-copy-bundled"
-  s.version     =CapistranoStrategyCopyBundled::VERSION
+  s.version     = CapistranoStrategyCopyBundled::VERSION
   s.authors     = ["Rudolf Schmidt"]
   
   s.homepage    = "http://github.com/rudionrails/capistrano-strategy-copy-bundled"

data/lib/capistrano-strategy-copy-bundled.rb

@@ -1,5 +1,4 @@
 module CapistranoStrategyCopyBundled
-
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
   
 end

data/lib/capistrano/recipes/deploy/strategy/copy_bundled.rb

@@ -17,7 +17,7 @@ module Capistrano
               system(source.checkout(revision, copy_cache))
             end
 
-              # Check the return code of last system command and rollback if not 0
+            # Check the return code of last system command and rollback if not 0
             unless $? == 0
               raise Capistrano::Error, "shell command failed with return code #{$?}"
             end
@@ -53,7 +53,7 @@ module Capistrano
 
               copy_exclude.each do |pattern|
                 delete_list = Dir.glob(File.join(destination, pattern), File::FNM_DOTMATCH)
-                  # avoid the /.. trap that deletes the parent directories
+                # avoid the /.. trap that deletes the parent directories
                 delete_list.delete_if { |dir| dir =~ /\/\.\.$/ }
                 FileUtils.rm_rf(delete_list.compact)
               end
@@ -62,7 +62,7 @@ module Capistrano
 
           File.open(File.join(destination, "REVISION"), "w") { |f| f.puts(revision) }
 
-            # execute bundler
+          # execute bundler
           bundle!
 
           logger.trace "compressing #{destination} to #{filename}"
@@ -92,12 +92,23 @@ module Capistrano
           args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
 
           cmd = "#{bundle_cmd} install #{args.join(' ')}"
-          Dir.chdir( destination ) do
-            if defined?( Bundler )
-              Bundler.with_clean_env { system(cmd) }
-            else
-              system(cmd)
-            end
+          Dir.chdir(destination) do
+            defined?( Bundler ) ? with_original_env { system(cmd) } : system(cmd)
+          end
+        end
+
+        # This method should be built-in to Bundler 1.1+
+        def with_original_env
+          original_env = ENV.to_hash
+
+          begin
+            # clean the ENV from Bundler settings
+            ENV.delete( 'RUBYOPT' )
+            ENV.keys.each { |k| ENV.delete(k) if k =~ /^bundle_/i }  #remove any BUNDLE_* keys
+
+            yield
+          ensure
+            ENV.replace( original_env )
           end
         end
 

metadata

@@ -2,7 +2,7 @@
 name: capistrano-strategy-copy-bundled
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
   - Rudolf Schmidt
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 +02:00
+date: 2011-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency