bundler 1.10.6 → 1.11.0.pre.1

data/exe/bundler

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+# Exit cleanly from an early interrupt
+Signal.trap("INT") { exit 1 }
+
+require "bundler"
+# Check if an older version of bundler is installed
+$LOAD_PATH.each do |path|
+  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
+  err = "Looks like you have a version of bundler that's older than 0.9.\n"
+  err << "Please remove your old versions.\n"
+  err << "An easy way to do this is by running `gem cleanup bundler`."
+  abort(err)
+end
+
+require "bundler/friendly_errors"
+Bundler.with_friendly_errors do
+  require "bundler/cli"
+  Bundler::CLI.start(ARGV, :debug => true)
+end

data/lib/bundler.rb

@@ -1,89 +1,54 @@
-require 'fileutils'
-require 'pathname'
-require 'rbconfig'
-require 'bundler/gem_path_manipulation'
-require 'bundler/rubygems_ext'
-require 'bundler/rubygems_integration'
-require 'bundler/version'
-require 'bundler/constants'
-require 'bundler/current_ruby'
+require "fileutils"
+require "pathname"
+require "rbconfig"
+require "thread"
+require "bundler/gem_path_manipulation"
+require "bundler/gem_remote_fetcher"
+require "bundler/rubygems_ext"
+require "bundler/rubygems_integration"
+require "bundler/version"
+require "bundler/constants"
+require "bundler/current_ruby"
+require "bundler/errors"
 
 module Bundler
   preserve_gem_path
   ORIGINAL_ENV = ENV.to_hash
-
-  autoload :Definition,            'bundler/definition'
-  autoload :Dependency,            'bundler/dependency'
-  autoload :DepProxy,              'bundler/dep_proxy'
-  autoload :Deprecate,             'bundler/deprecate'
-  autoload :Dsl,                   'bundler/dsl'
-  autoload :EndpointSpecification, 'bundler/endpoint_specification'
-  autoload :Environment,           'bundler/environment'
-  autoload :Env,                   'bundler/env'
-  autoload :Fetcher,               'bundler/fetcher'
-  autoload :GemHelper,             'bundler/gem_helper'
-  autoload :GemHelpers,            'bundler/gem_helpers'
-  autoload :GemInstaller,          'bundler/gem_installer'
-  autoload :Graph,                 'bundler/graph'
-  autoload :Index,                 'bundler/index'
-  autoload :Installer,             'bundler/installer'
-  autoload :Injector,              'bundler/injector'
-  autoload :LazySpecification,     'bundler/lazy_specification'
-  autoload :LockfileParser,        'bundler/lockfile_parser'
-  autoload :MatchPlatform,         'bundler/match_platform'
-  autoload :RemoteSpecification,   'bundler/remote_specification'
-  autoload :Resolver,              'bundler/resolver'
-  autoload :Retry,                 'bundler/retry'
-  autoload :RubyVersion,           'bundler/ruby_version'
-  autoload :RubyDsl,               'bundler/ruby_dsl'
-  autoload :Runtime,               'bundler/runtime'
-  autoload :Settings,              'bundler/settings'
-  autoload :SharedHelpers,         'bundler/shared_helpers'
-  autoload :SpecSet,               'bundler/spec_set'
-  autoload :StubSpecification,     'bundler/stub_specification'
-  autoload :Source,                'bundler/source'
-  autoload :SourceList,            'bundler/source_list'
-  autoload :Specification,         'bundler/shared_helpers'
-  autoload :SystemRubyVersion,     'bundler/ruby_version'
-  autoload :UI,                    'bundler/ui'
-
-  class BundlerError < StandardError
-    def self.status_code(code)
-      define_method(:status_code) { code }
-    end
-  end
-
-  class GemfileNotFound       < BundlerError; status_code(10) ; end
-  class GemNotFound           < BundlerError; status_code(7)  ; end
-  class GemfileError          < BundlerError; status_code(4)  ; end
-  class InstallError          < BundlerError; status_code(5)  ; end
-  class InstallHookError      < BundlerError; status_code(8)  ; end
-  class PathError             < BundlerError; status_code(13) ; end
-  class GitError              < BundlerError; status_code(11) ; end
-  class DeprecatedError       < BundlerError; status_code(12) ; end
-  class GemspecError          < BundlerError; status_code(14) ; end
-  class InvalidOption         < BundlerError; status_code(15) ; end
-  class ProductionError       < BundlerError; status_code(16) ; end
-  class HTTPError             < BundlerError; status_code(17) ; end
-  class RubyVersionMismatch   < BundlerError; status_code(18) ; end
-  class SecurityError         < BundlerError; status_code(19) ; end
-  class LockfileError         < BundlerError; status_code(20) ; end
-  class CyclicDependencyError < BundlerError; status_code(21) ; end
-  class GemfileLockNotFound   < BundlerError; status_code(22) ; end
-
-  # Internal errors, should be rescued
-  class VersionConflict  < BundlerError
-    attr_reader :conflicts
-
-    def initialize(conflicts, msg = nil)
-      super(msg)
-      @conflicts = conflicts
-    end
-
-    status_code(6)
-  end
-
-  class MarshalError < StandardError; end
+  SUDO_MUTEX = Mutex.new
+
+  autoload :Definition,            "bundler/definition"
+  autoload :Dependency,            "bundler/dependency"
+  autoload :DepProxy,              "bundler/dep_proxy"
+  autoload :Deprecate,             "bundler/deprecate"
+  autoload :Dsl,                   "bundler/dsl"
+  autoload :EndpointSpecification, "bundler/endpoint_specification"
+  autoload :Environment,           "bundler/environment"
+  autoload :Env,                   "bundler/env"
+  autoload :Fetcher,               "bundler/fetcher"
+  autoload :GemHelper,             "bundler/gem_helper"
+  autoload :GemHelpers,            "bundler/gem_helpers"
+  autoload :RubyGemsGemInstaller,  "bundler/rubygems_gem_installer"
+  autoload :Graph,                 "bundler/graph"
+  autoload :Index,                 "bundler/index"
+  autoload :Installer,             "bundler/installer"
+  autoload :Injector,              "bundler/injector"
+  autoload :LazySpecification,     "bundler/lazy_specification"
+  autoload :LockfileParser,        "bundler/lockfile_parser"
+  autoload :MatchPlatform,         "bundler/match_platform"
+  autoload :RemoteSpecification,   "bundler/remote_specification"
+  autoload :Resolver,              "bundler/resolver"
+  autoload :Retry,                 "bundler/retry"
+  autoload :RubyVersion,           "bundler/ruby_version"
+  autoload :RubyDsl,               "bundler/ruby_dsl"
+  autoload :Runtime,               "bundler/runtime"
+  autoload :Settings,              "bundler/settings"
+  autoload :SharedHelpers,         "bundler/shared_helpers"
+  autoload :SpecSet,               "bundler/spec_set"
+  autoload :StubSpecification,     "bundler/stub_specification"
+  autoload :Source,                "bundler/source"
+  autoload :SourceList,            "bundler/source_list"
+  autoload :SystemRubyVersion,     "bundler/ruby_version"
+  autoload :UI,                    "bundler/ui"
 
   class << self
     attr_writer :bundle_path
@@ -111,7 +76,7 @@ module Bundler
       @bin_path ||= begin
         path = settings[:bin] || "bin"
         path = Pathname.new(path).expand_path(root).expand_path
-        FileUtils.mkdir_p(path)
+        SharedHelpers.filesystem_access(path) {|p| FileUtils.mkdir_p(p) }
         path
       end
     end
@@ -201,14 +166,16 @@ module Bundler
     end
 
     def app_config_path
-      ENV['BUNDLE_APP_CONFIG'] ?
-        Pathname.new(ENV['BUNDLE_APP_CONFIG']).expand_path(root) :
-        root.join('.bundle')
+      if ENV["BUNDLE_APP_CONFIG"]
+        Pathname.new(ENV["BUNDLE_APP_CONFIG"]).expand_path(root)
+      else
+        root.join(".bundle")
+      end
     end
 
     def app_cache(custom_path = nil)
       path = custom_path || root
-      path.join(self.settings.app_cache_path)
+      path.join(settings.app_cache_path)
     end
 
     def tmp(name = Process.pid.to_s)
@@ -236,12 +203,19 @@ module Bundler
 
     def with_clean_env
       with_original_env do
-        ENV['MANPATH'] = ENV['BUNDLE_ORIG_MANPATH']
-        ENV.delete_if { |k,_| k[0,7] == 'BUNDLE_' }
-        if ENV.has_key? 'RUBYOPT'
-          ENV['RUBYOPT'] = ENV['RUBYOPT'].sub '-rbundler/setup', ''
-          ENV['RUBYOPT'] = ENV['RUBYOPT'].sub "-I#{File.expand_path('..', __FILE__)}", ''
+        ENV["MANPATH"] = ENV["BUNDLE_ORIG_MANPATH"]
+        ENV.delete_if {|k, _| k[0, 7] == "BUNDLE_" }
+
+        if ENV.key?("RUBYOPT")
+          ENV["RUBYOPT"] = ENV["RUBYOPT"].sub "-rbundler/setup", ""
         end
+
+        if ENV.key?("RUBYLIB")
+          rubylib = ENV["RUBYLIB"].split(File::PATH_SEPARATOR)
+          rubylib.delete(File.expand_path("..", __FILE__))
+          ENV["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
+        end
+
         yield
       end
     end
@@ -278,9 +252,7 @@ module Bundler
     def requires_sudo?
       return @requires_sudo if defined?(@requires_sudo_ran)
 
-      if settings.allow_sudo?
-        sudo_present = which "sudo"
-      end
+      sudo_present = which "sudo" if settings.allow_sudo?
 
       if sudo_present
         # the bundle path and subdirectories need to be writable for Rubygems
@@ -293,8 +265,8 @@ module Bundler
         bin_dir = bin_dir.parent until bin_dir.exist?
 
         # if any directory is not writable, we need sudo
-        files = [path, bin_dir] | Dir[path.join('build_info/*').to_s] | Dir[path.join('*').to_s]
-        sudo_needed = files.any?{|f| !File.writable?(f) }
+        files = [path, bin_dir] | Dir[path.join("build_info/*").to_s] | Dir[path.join("*").to_s]
+        sudo_needed = files.any? {|f| !File.writable?(f) }
       end
 
       @requires_sudo_ran = true
@@ -305,15 +277,17 @@ module Bundler
       if requires_sudo?
         sudo "mkdir -p '#{path}'" unless File.exist?(path)
       else
-        FileUtils.mkdir_p(path)
+        SharedHelpers.filesystem_access(path, :write) do |p|
+          FileUtils.mkdir_p(p)
+        end
       end
     end
 
     def which(executable)
       if File.file?(executable) && File.executable?(executable)
         executable
-      elsif ENV['PATH']
-        path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p|
+      elsif ENV["PATH"]
+        path = ENV["PATH"].split(File::PATH_SEPARATOR).find do |p|
           abs_path = File.join(p, executable)
           File.file?(abs_path) && File.executable?(abs_path)
         end
@@ -322,23 +296,25 @@ module Bundler
     end
 
     def sudo(str)
-      prompt = "\n\n" + <<-PROMPT.gsub(/^ {6}/, '').strip + " "
-      Your user account isn't allowed to install to the system Rubygems.
-      You can cancel this installation and run:
+      SUDO_MUTEX.synchronize do
+        prompt = "\n\n" + <<-PROMPT.gsub(/^ {6}/, "").strip + " "
+        Your user account isn't allowed to install to the system Rubygems.
+        You can cancel this installation and run:
 
-          bundle install --path vendor/bundle
+            bundle install --path vendor/bundle
 
-      to install the gems into ./vendor/bundle/, or you can enter your password
-      and install the bundled gems to Rubygems using sudo.
+        to install the gems into ./vendor/bundle/, or you can enter your password
+        and install the bundled gems to Rubygems using sudo.
 
-      Password:
-      PROMPT
+        Password:
+        PROMPT
 
-      `sudo -p "#{prompt}" #{str}`
+        `sudo -p "#{prompt}" #{str}`
+      end
     end
 
     def read_file(file)
-      File.open(file, "rb") { |f| f.read }
+      File.open(file, "rb", &:read)
     end
 
     def load_marshal(data)
@@ -371,7 +347,7 @@ module Bundler
         spec
       end
     rescue Gem::InvalidSpecificationException => e
-      Bundler.ui.warn "The gemspec at #{file} is not valid. " \
+      UI::Shell.new.warn "The gemspec at #{file} is not valid. " \
         "The validation error was '#{e.message}'"
       nil
     end
@@ -406,8 +382,8 @@ module Bundler
     def eval_gemspec(path, contents)
       eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
     rescue ScriptError, StandardError => e
-      original_line = e.backtrace.find { |line| line.include?(path.to_s) }
-      msg  = "There was a #{e.class} while loading #{path.basename}: \n#{e.message}"
+      original_line = e.backtrace.find {|line| line.include?(path.to_s) }
+      msg = "There was a #{e.class} while loading #{path.basename}: \n#{e.message}"
       msg << " from\n  #{original_line}" if original_line
       msg << "\n"
 
@@ -419,12 +395,12 @@ module Bundler
     end
 
     def configure_gem_home_and_path
-      blank_home = ENV['GEM_HOME'].nil? || ENV['GEM_HOME'].empty?
+      blank_home = ENV["GEM_HOME"].nil? || ENV["GEM_HOME"].empty?
       if settings[:disable_shared_gems]
-        ENV['GEM_PATH'] = ''
+        ENV["GEM_PATH"] = ""
       elsif blank_home || Bundler.rubygems.gem_dir != bundle_path.to_s
         possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
-        paths = possibles.flatten.compact.uniq.reject { |p| p.empty? }
+        paths = possibles.flatten.compact.uniq.reject(&:empty?)
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
       end
 
@@ -434,9 +410,13 @@ module Bundler
 
     def configure_gem_home
       # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
-      FileUtils.mkdir_p bundle_path.to_s rescue nil
+      begin
+        FileUtils.mkdir_p bundle_path.to_s
+      rescue
+        nil
+      end
 
-      ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
+      ENV["GEM_HOME"] = File.expand_path(bundle_path, root)
       Bundler.rubygems.clear_paths
     end
 
@@ -447,6 +427,5 @@ module Bundler
         lockfile.rmtree
       end
     end
-
   end
 end

data/lib/bundler/capistrano.rb

@@ -2,8 +2,8 @@
 #
 # Just add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and
 # Bundler will be activated after each new deployment.
-require 'bundler/deployment'
-require 'capistrano/version'
+require "bundler/deployment"
+require "capistrano/version"
 
 if defined?(Capistrano::Version) && Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
   raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler"

data/lib/bundler/cli.rb

@@ -1,10 +1,10 @@
-require 'bundler'
-require 'bundler/vendored_thor'
+require "bundler"
+require "bundler/vendored_thor"
 
 module Bundler
   class CLI < Thor
     include Thor::Actions
-    AUTO_INSTALL_CMDS = %w[show binstubs outdated exec open console licenses clean]
+    AUTO_INSTALL_CMDS = %w(show binstubs outdated exec open console licenses clean)
 
     def self.start(*)
       super
@@ -17,7 +17,7 @@ module Bundler
       super
 
       custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
-      ENV['BUNDLE_GEMFILE']   = File.expand_path(custom_gemfile) if custom_gemfile
+      ENV["BUNDLE_GEMFILE"] = File.expand_path(custom_gemfile) if custom_gemfile && !custom_gemfile.empty?
 
       Bundler.settings[:retry] = options[:retry] if options[:retry]
 
@@ -29,6 +29,13 @@ module Bundler
       self.options ||= {}
       Bundler.ui = UI::Shell.new(options)
       Bundler.ui.level = "debug" if options["verbose"]
+
+      if ENV["RUBYGEMS_GEMDEPS"] && !ENV["RUBYGEMS_GEMDEPS"].empty?
+        Bundler.ui.warn(
+          "The RUBYGEMS_GEMDEPS environment variable is set. This enables RubyGems' " \
+          "experimental Gemfile mode, which may conflict with Bundler and cause unexpected errors. " \
+          "To remove this warning, unset RUBYGEMS_GEMDEPS.", :wrap => true)
+      end
     end
 
     check_unknown_options!(:except => [:config, :exec])
@@ -37,8 +44,8 @@ module Bundler
     default_task :install
     class_option "no-color", :type => :boolean, :desc => "Disable colorization in output"
     class_option "retry",    :type => :numeric, :aliases => "-r", :banner => "NUM",
-      :desc => "Specify the number of times you wish to attempt network commands"
-    class_option "verbose",  :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V"
+                             :desc => "Specify the number of times you wish to attempt network commands"
+    class_option "verbose", :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V"
 
     def help(cli = nil)
       case cli
@@ -48,14 +55,15 @@ module Bundler
       end
 
       manpages = %w(
-          bundle
-          bundle-config
-          bundle-exec
-          bundle-install
-          bundle-package
-          bundle-update
-          bundle-platform
-          gemfile.5)
+        bundle
+        bundle-config
+        bundle-exec
+        bundle-gem
+        bundle-install
+        bundle-package
+        bundle-update
+        bundle-platform
+        gemfile.5)
 
       if manpages.include?(command)
         root = File.expand_path("../man", __FILE__)
@@ -65,6 +73,8 @@ module Bundler
         else
           puts File.read("#{root}/#{command}.txt")
         end
+      elsif command_path = Bundler.which("bundler-#{cli}")
+        Kernel.exec(command_path, "--help")
       else
         super
       end
@@ -84,7 +94,7 @@ module Bundler
     D
     method_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
     def init
-      require 'bundler/cli/init'
+      require "bundler/cli/init"
       Init.new(options.dup).run
     end
 
@@ -102,7 +112,7 @@ module Bundler
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     map "c" => "check"
     def check
-      require 'bundler/cli/check'
+      require "bundler/cli/check"
       Check.new(options).run
     end
 
@@ -151,14 +161,14 @@ module Bundler
       "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
     method_option "trust-policy", :alias => "P", :type => :string, :banner =>
       "Gem trust policy (like gem install -P). Must be one of " +
-        Bundler.rubygems.security_policy_keys.join('|')
+        Bundler.rubygems.security_policy_keys.join("|")
     method_option "without", :type => :array, :banner =>
       "Exclude gems that are part of the specified named group."
     method_option "with", :type => :array, :banner =>
       "Include gems that are part of the specified named group."
     map "i" => "install"
     def install
-      require 'bundler/cli/install'
+      require "bundler/cli/install"
       Install.new(options.dup).run
     end
 
@@ -183,7 +193,7 @@ module Bundler
     method_option "force", :type => :boolean, :banner =>
       "Force downloading every gem."
     def update(*gems)
-      require 'bundler/cli/update'
+      require "bundler/cli/update"
       Update.new(options, gems).run
     end
 
@@ -193,11 +203,11 @@ module Bundler
       Calling show with [GEM] will list the exact location of that gem on your machine.
     D
     method_option "paths", :type => :boolean,
-      :banner => "List the paths of all gems that are required by your Gemfile."
+                           :banner => "List the paths of all gems that are required by your Gemfile."
     method_option "outdated", :type => :boolean,
-      :banner => "Show verbose output including whether gems are outdated."
+                              :banner => "Show verbose output including whether gems are outdated."
     def show(gem_name = nil)
-      require 'bundler/cli/show'
+      require "bundler/cli/show"
       Show.new(options, gem_name).run
     end
     map %w(list) => "show"
@@ -205,14 +215,15 @@ module Bundler
     desc "binstubs GEM [OPTIONS]", "Install the binstubs of the listed gem"
     long_desc <<-D
       Generate binstubs for executables in [GEM]. Binstubs are put into bin,
-      or the --binstubs directory if one has been set.
+      or the --binstubs directory if one has been set. Calling binstubs with [GEM [GEM]]
+      will create binstubs for all given gems.
     D
     method_option "force", :type => :boolean, :default => false, :banner =>
       "Overwrite existing binstubs if they exist"
     method_option "path", :type => :string, :lazy_default => "bin", :banner =>
       "Binstub destination directory (default bin)"
     def binstubs(*gems)
-      require 'bundler/cli/binstubs'
+      require "bundler/cli/binstubs"
       Binstubs.new(options, gems).run
     end
 
@@ -230,16 +241,16 @@ module Bundler
     method_option "strict", :type => :boolean, :banner =>
       "Only list newer versions allowed by your Gemfile requirements"
     def outdated(*gems)
-      require 'bundler/cli/outdated'
+      require "bundler/cli/outdated"
       Outdated.new(options, gems).run
     end
 
     desc "cache [OPTIONS]", "Cache all the gems to vendor/cache", :hide => true
     method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
     method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms, not just the current one"
-    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
+    method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
     def cache
-      require 'bundler/cli/cache'
+      require "bundler/cli/cache"
       Cache.new(options).run
     end
 
@@ -249,8 +260,8 @@ module Bundler
     method_option "cache-path", :type => :string, :banner =>
       "Specify a different cache path than the default (vendor/cache)."
     method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
-    method_option "no-install",  :type => :boolean, :banner => "Don't actually install the gems, just package."
-    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
+    method_option "no-install", :type => :boolean, :banner => "Don't actually install the gems, just package."
+    method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
     method_option "path", :type => :string, :banner =>
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
@@ -261,7 +272,7 @@ module Bundler
       bundle without having to download any additional gems.
     D
     def package
-      require 'bundler/cli/package'
+      require "bundler/cli/package"
       Package.new(options).run
     end
     map %w(pack) => :package
@@ -275,7 +286,7 @@ module Bundler
     D
     map "e" => "exec"
     def exec(*args)
-      require 'bundler/cli/exec'
+      require "bundler/cli/exec"
       Exec.new(options, args).run
     end
 
@@ -292,19 +303,19 @@ module Bundler
       where they were specified.
     D
     def config(*args)
-      require 'bundler/cli/config'
+      require "bundler/cli/config"
       Config.new(options, args, self).run
     end
 
     desc "open GEM", "Opens the source directory of the given bundled gem"
     def open(name)
-      require 'bundler/cli/open'
+      require "bundler/cli/open"
       Open.new(options, name).run
     end
 
     desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
     def console(group = nil)
-      require 'bundler/cli/console'
+      require "bundler/cli/console"
       Console.new(options, group).run
     end
 
@@ -316,7 +327,7 @@ module Bundler
 
     desc "licenses", "Prints the license of all gems in the bundle"
     def licenses
-      Bundler.load.specs.sort_by { |s| s.license.to_s }.reverse.each do |s|
+      Bundler.load.specs.sort_by {|s| s.license.to_s }.reverse_each do |s|
         gem_name = s.name
         license  = s.license || s.licenses
 
@@ -328,39 +339,39 @@ module Bundler
       end
     end
 
-    desc 'viz [OPTIONS]', "Generates a visual dependency graph"
+    desc "viz [OPTIONS]", "Generates a visual dependency graph"
     long_desc <<-D
       Viz generates a PNG file of the current Gemfile as a dependency graph.
       Viz requires the ruby-graphviz gem (and its dependencies).
       The associated gems must also be installed via 'bundle install'.
     D
-    method_option :file, :type => :string, :default => 'gem_graph', :aliases => '-f', :banner => "The name to use for the generated file. see format option"
-    method_option :format, :type => :string, :default => "png", :aliases => '-F', :banner => "This is output format option. Supported format is png, jpg, svg, dot ..."
-    method_option :requirements, :type => :boolean, :default => false, :aliases => '-r', :banner => "Set to show the version of each required dependency."
-    method_option :version, :type => :boolean, :default => false, :aliases => '-v', :banner => "Set to show each gem version."
+    method_option :file, :type => :string, :default => "gem_graph", :aliases => "-f", :banner => "The name to use for the generated file. see format option"
+    method_option :format, :type => :string, :default => "png", :aliases => "-F", :banner => "This is output format option. Supported format is png, jpg, svg, dot ..."
+    method_option :requirements, :type => :boolean, :default => false, :aliases => "-r", :banner => "Set to show the version of each required dependency."
+    method_option :version, :type => :boolean, :default => false, :aliases => "-v", :banner => "Set to show each gem version."
     method_option :without, :type => :array, :default => [], :banner => "Exclude gems that are part of the specified named group."
     def viz
-      require 'bundler/cli/viz'
+      require "bundler/cli/viz"
       Viz.new(options).run
     end
 
     desc "gem GEM [OPTIONS]", "Creates a skeleton for creating a rubygem"
-    method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :desc => "Generate a binary for your library."
+    method_option :bin, :type => :boolean, :default => false, :aliases => "-b", :desc => "Generate a binary for your library."
     method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`."
     method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
-      :lazy_default => [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? },
-      :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
+                         :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
+                         :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
     method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
     method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`."
-    method_option :test, :type => :string, :lazy_default => 'rspec', :aliases => '-t', :banner => "rspec",
-      :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
+    method_option :test, :type => :string, :lazy_default => "rspec", :aliases => "-t", :banner => "rspec",
+                         :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
     def gem(name)
-      require 'bundler/cli/gem'
+      require "bundler/cli/gem"
       Gem.new(options, name, self).run
     end
 
     def self.source_root
-      File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      File.expand_path(File.join(File.dirname(__FILE__), "templates"))
     end
 
     desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory"
@@ -369,7 +380,7 @@ module Bundler
     method_option "force", :type => :boolean, :default => false, :banner =>
       "Forces clean even if --path is not set"
     def clean
-      require 'bundler/cli/clean'
+      require "bundler/cli/clean"
       Clean.new(options.dup).run
     end
 
@@ -377,19 +388,19 @@ module Bundler
     method_option "ruby", :type => :boolean, :default => false, :banner =>
       "only display ruby related platform information"
     def platform
-      require 'bundler/cli/platform'
+      require "bundler/cli/platform"
       Platform.new(options).run
     end
 
     desc "inject GEM VERSION ...", "Add the named gem(s), with version requirements, to the resolved Gemfile"
     def inject(name, version, *gems)
-      require 'bundler/cli/inject'
+      require "bundler/cli/inject"
       Inject.new(options, name, version, gems).run
     end
 
     desc "lock", "Creates a lockfile without installing"
-    method_option "update", :type => :boolean, :default => false, :banner =>
-      "ignore the existing lockfile"
+    method_option "update", :type => :array, :lazy_default => [], :banner =>
+      "ignore the existing lockfile, update all gems by default, or update list of given gems"
     method_option "local", :type => :boolean, :default => false, :banner =>
       "do not attempt to fetch remote gemspecs and use the local gem cache only"
     method_option "print", :type => :boolean, :default => false, :banner =>
@@ -397,7 +408,7 @@ module Bundler
     method_option "lockfile", :type => :string, :default => nil, :banner =>
       "the path the lockfile should be written to"
     def lock
-      require 'bundler/cli/lock'
+      require "bundler/cli/lock"
       Lock.new(options).run
     end
 
@@ -406,26 +417,26 @@ module Bundler
       Env.new.write($stdout)
     end
 
-    private
-
-      # Automatically invoke `bundle install` and resume if
-      # Bundler.settings[:auto_install] exists. This is set through config cmd
-      # `bundle config auto_install 1`.
-      #
-      # Note that this method `nil`s out the global Definition object, so it
-      # should be called first, before you instantiate anything like an
-      # `Installer` that'll keep a reference to the old one instead.
-      def auto_install
-        return unless Bundler.settings[:auto_install]
-
-        begin
-          Bundler.definition.specs
-        rescue GemNotFound
-          Bundler.ui.info "Automatically installing missing gems."
-          Bundler.reset!
-          invoke :install, []
-          Bundler.reset!
-        end
+  private
+
+    # Automatically invoke `bundle install` and resume if
+    # Bundler.settings[:auto_install] exists. This is set through config cmd
+    # `bundle config auto_install 1`.
+    #
+    # Note that this method `nil`s out the global Definition object, so it
+    # should be called first, before you instantiate anything like an
+    # `Installer` that'll keep a reference to the old one instead.
+    def auto_install
+      return unless Bundler.settings[:auto_install]
+
+      begin
+        Bundler.definition.specs
+      rescue GemNotFound
+        Bundler.ui.info "Automatically installing missing gems."
+        Bundler.reset!
+        invoke :install, []
+        Bundler.reset!
       end
+    end
   end
 end