lib/bundler/cli.rb in bundler-1.1.rc.5 vs lib/bundler/cli.rb in bundler-1.1.rc.6

@@ -393,11 +393,11 @@
       into the systemwide Rubygems repository.
     D
     def exec(*)
       ARGV.shift # remove "exec"
 
-      Bundler.setup
+      Bundler.load.setup_environment
 
       begin
         # Run
         Kernel.exec(*ARGV)
       rescue Errno::EACCES
@@ -406,10 +406,10 @@
       rescue Errno::ENOENT
         Bundler.ui.error "bundler: command not found: #{ARGV.first}"
         Bundler.ui.warn  "Install missing gem executables with `bundle install`"
         exit 127
       rescue ArgumentError
-        Bundler.ui.error "bundle exec needs a command to run"
+        Bundler.ui.error "bundler: exec needs a command to run"
         exit 128
       end
     end
 
     desc "config NAME [VALUE]", "retrieve or set a configuration value"