Only require the bundler with rubygems when running a bundler command

4 files changed, 7 insertions, 4 deletions

diff --git a/lib/bundler/commands/bundle_command.rb b/lib/bundler/commands/bundle_command.rb
index cbfd9cf99e..a1f9590f75 100644
--- a/lib/bundler/commands/bundle_command.rb
+++ b/lib/bundler/commands/bundle_command.rb
@@ -4,7 +4,7 @@ class Gem::Commands::BundleCommand < Gem::Command
     super('bundle', 'Create a gem bundle based on your Gemfile', {:manifest => nil, :update => false})
 
     add_option('-m', '--manifest MANIFEST', "Specify the path to the manifest file") do |manifest, options|
-      options[:manifest] = Pathname.new(manifest)
+      options[:manifest] = manifest
     end
 
     add_option('-u', '--update', "Force a remote check for newer gems") do
@@ -23,6 +23,8 @@ Bundle stuff
   end
 
   def execute
+    # Prevent the bundler from getting required unless it is actually being used
+    require 'bundler'
     Bundler::CLI.run(:bundle, options)
   end
 
diff --git a/lib/bundler/commands/exec_command.rb b/lib/bundler/commands/exec_command.rb
index 7d4ced6e3e..228aa60619 100644
--- a/lib/bundler/commands/exec_command.rb
+++ b/lib/bundler/commands/exec_command.rb
@@ -4,7 +4,7 @@ class Gem::Commands::ExecCommand < Gem::Command
     super('exec', 'Run a command in context of a gem bundle', {:manifest => nil})
 
     add_option('-m', '--manifest MANIFEST', "Specify the path to the manifest file") do |manifest, options|
-      options[:manifest] = Pathname.new(manifest)
+      options[:manifest] = manifest
     end
   end
 
@@ -23,6 +23,8 @@ class Gem::Commands::ExecCommand < Gem::Command
   end
 
   def execute
+    # Prevent the bundler from getting required unless it is actually being used
+    require 'bundler'
     Bundler::CLI.run(:exec, options)
   end
 
diff --git a/lib/bundler/manifest_file.rb b/lib/bundler/manifest_file.rb
index 0af486ecf5..c766bca85a 100644
--- a/lib/bundler/manifest_file.rb
+++ b/lib/bundler/manifest_file.rb
@@ -57,7 +57,7 @@ module Bundler
     end
 
     def filename
-      @filename ||= find_manifest_file
+      Pathname.new(@filename ||= find_manifest_file)
     end
 
     def find_manifest_file
diff --git a/lib/rubygems_plugin.rb b/lib/rubygems_plugin.rb
index 09aa2b8512..f493bcb691 100644
--- a/lib/rubygems_plugin.rb
+++ b/lib/rubygems_plugin.rb
@@ -1,5 +1,4 @@
 require 'rubygems/command_manager'
-require 'bundler'
 require 'bundler/commands/bundle_command'
 require 'bundler/commands/exec_command'