bundler 1.7.15 → 1.8.0.pre

data/bundler.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version     = Bundler::VERSION
   s.licenses    = ['MIT']
   s.authors     = ["André Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"]
-  s.email       = ["andre@arko.net"]
+  s.email       = ["andre.arko+terence.lee@gmail.com"]
   s.homepage    = "http://bundler.io"
   s.summary     = %q{The best way to manage your application's dependencies}
   s.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably}
@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ronn', '~> 0.7.3'
   s.add_development_dependency 'rspec', '~> 3.0'
 
-  s.files       = `git ls-files -z`.split("\x0")
-  s.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git
-  s.test_files  = s.files.grep(%r{^spec/})
+  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # we don't check in man pages, but we need to ship them because
+  # we use them to generate the long-form help for each command.
+  s.files      += Dir.glob('lib/bundler/man/**/*')
 
   s.executables   = %w(bundle bundler)
   s.require_paths = ["lib"]

data/lib/bundler.rb

@@ -191,7 +191,13 @@ module Bundler
     end
 
     def root
-      @root ||= default_gemfile.dirname.expand_path
+      @root ||= begin
+                  default_gemfile.dirname.expand_path
+                rescue GemfileNotFound
+                  bundle_dir = default_bundle_dir
+                  raise GemfileNotFound, "Could not locate Gemfile or .bundle/ directory" unless bundle_dir
+                  Pathname.new(File.expand_path("..", bundle_dir))
+                end
     end
 
     def app_config_path
@@ -202,7 +208,7 @@ module Bundler
 
     def app_cache(custom_path = nil)
       path = custom_path || root
-      path.join("vendor/cache")
+      path.join(self.settings.app_cache_path)
     end
 
     def tmp(name = Process.pid.to_s)
@@ -210,11 +216,16 @@ module Bundler
       @tmp.join(name)
     end
 
+    def cleanup
+      FileUtils.remove_entry_secure(@tmp) if @tmp
+    rescue
+    end
+
     def settings
       return @settings if defined?(@settings)
       @settings = Settings.new(app_config_path)
     rescue GemfileNotFound
-      @settings = Settings.new
+      @settings = Settings.new(Pathname.new(".bundle").expand_path)
     end
 
     def with_original_env
@@ -253,6 +264,10 @@ module Bundler
       SharedHelpers.default_lockfile
     end
 
+    def default_bundle_dir
+      SharedHelpers.default_bundle_dir
+    end
+
     def system_bindir
       # Gem.bindir doesn't always return the location that Rubygems will install
       # system binaries. If you put '-n foo' in your .gemrc, Rubygems will
@@ -369,6 +384,10 @@ module Bundler
       @ruby_version ||= SystemRubyVersion.new
     end
 
+    def reset!
+      @definition = nil
+    end
+
   private
 
     def eval_yaml_gemspec(path, contents)

data/lib/bundler/anonymizable_uri.rb

@@ -3,14 +3,30 @@ module Bundler
     attr_reader :original_uri,
                 :without_credentials
 
-    def initialize(original_uri)
-      @original_uri = original_uri.freeze
-      @without_credentials ||=
-        if original_uri.userinfo
-          original_uri.dup.tap { |uri| uri.user = uri.password = nil }.freeze
-        else
-          original_uri
-        end
+    def initialize(original_uri, fallback_auth = nil)
+      @original_uri = apply_auth(original_uri, fallback_auth).freeze
+      @without_credentials = remove_auth(@original_uri).freeze
     end
+
+  private
+
+    def apply_auth(uri, auth = nil)
+      if auth && uri.userinfo.nil?
+        uri = uri.dup
+        uri.userinfo = auth
+      end
+
+      uri
+    end
+
+    def remove_auth(uri)
+      if uri.userinfo
+        uri = uri.dup
+        uri.user = uri.password = nil
+      end
+
+      uri
+    end
+
   end
 end

data/lib/bundler/cli.rb

@@ -4,19 +4,25 @@ require 'bundler/vendored_thor'
 module Bundler
   class CLI < Thor
     include Thor::Actions
+    AUTO_INSTALL_CMDS = %w[show binstubs outdated exec open console licenses clean]
 
     def self.start(*)
       super
     rescue Exception => e
       Bundler.ui = UI::Shell.new
       raise e
+    ensure
+      Bundler.cleanup
     end
 
-    def initialize(*)
+    def initialize(*args)
       super
-      ENV['BUNDLE_GEMFILE']   = File.expand_path(options[:gemfile]) if options[:gemfile]
+      current_cmd = args.last[:current_command].name
+      custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
+      ENV['BUNDLE_GEMFILE']   = File.expand_path(custom_gemfile) if custom_gemfile
       Bundler::Retry.attempts = options[:retry] || Bundler.settings[:retry] || Bundler::Retry::DEFAULT_ATTEMPTS
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
+      auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message
     ensure
@@ -29,10 +35,10 @@ module Bundler
     stop_on_unknown_option! :exec
 
     default_task :install
-    class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
-    class_option "verbose",  :type => :boolean, :banner => "Enable verbose output mode", :aliases => "-V"
-    class_option "retry",    :type => :numeric, :aliases => "-r", :banner =>
-      "Specify the number of times you wish to attempt network commands"
+    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"
 
     def help(cli = nil)
       case cli
@@ -64,6 +70,12 @@ module Bundler
       end
     end
 
+    def self.handle_no_command_error(command, has_namespace = $thor_runner)
+      return super unless command_path = Bundler.which("bundler-#{command}")
+
+      Kernel.exec(command_path, *ARGV[1..-1])
+    end
+
     desc "init [OPTIONS]", "Generates a Gemfile into the current working directory"
     long_desc <<-D
       Init generates a default Gemfile in the current working directory. When adding a
@@ -82,12 +94,12 @@ module Bundler
       all gems are found, Bundler prints a success message and exits with a status of 0.
       If not, the first missing gem is listed and Bundler exits status 1.
     D
+    method_option "dry-run", :type => :boolean, :default => false, :banner =>
+      "Lock the Gemfile"
     method_option "gemfile", :type => :string, :banner =>
       "Use the specified gemfile instead of Gemfile"
     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 "dry-run", :type => :boolean, :default => false, :banner =>
-      "Lock the Gemfile"
     def check
       require 'bundler/cli/check'
       Check.new(options).run
@@ -104,41 +116,41 @@ module Bundler
 
       If the bundle has already been installed, bundler will tell you so and then exit.
     D
-    method_option "without", :type => :array, :banner =>
-      "Exclude gems that are part of the specified named group."
+    method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
+      "Generate bin stubs for bundled gems to ./bin"
+    method_option "clean", :type => :boolean, :banner =>
+      "Run bundle clean automatically after install"
+    method_option "deployment", :type => :boolean, :banner =>
+      "Install using defaults tuned for deployment environments"
+    method_option "frozen", :type => :boolean, :banner =>
+      "Do not allow the Gemfile.lock to be updated after this install"
+    method_option "full-index", :type => :boolean, :banner =>
+      "Use the rubygems modern index instead of the API endpoint"
     method_option "gemfile", :type => :string, :banner =>
       "Use the specified gemfile instead of Gemfile"
-    method_option "no-prune", :type => :boolean, :banner =>
-      "Don't remove stale gems from the cache."
+    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
+      "Specify the number of jobs to run in parallel"
+    method_option "local", :type => :boolean, :banner =>
+      "Do not attempt to fetch gems remotely and use the gem cache instead"
     method_option "no-cache", :type => :boolean, :banner =>
       "Don't update the existing gem cache."
+    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."
-    method_option "local", :type => :boolean, :banner =>
-      "Do not attempt to fetch gems remotely and use the gem cache instead"
-    method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
-      "Generate bin stubs for bundled gems to ./bin"
     method_option "shebang", :type => :string, :banner =>
       "Specify a different shebang executable name than the default (usually 'ruby')"
-    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 "system", :type => :boolean, :banner =>
-      "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
-    method_option "frozen", :type => :boolean, :banner =>
-      "Do not allow the Gemfile.lock to be updated after this install"
-    method_option "deployment", :type => :boolean, :banner =>
-      "Install using defaults tuned for deployment environments"
     method_option "standalone", :type => :array, :lazy_default => [], :banner =>
       "Make a bundle that can work without the Bundler runtime"
-    method_option "full-index", :type => :boolean, :banner =>
-      "Use the rubygems modern index instead of the API endpoint"
-    method_option "clean", :type => :boolean, :banner =>
-      "Run bundle clean automatically after install"
+    method_option "system", :type => :boolean, :banner =>
+      "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('|')
-    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
-      "Specify the number of jobs to run in parallel"
+    method_option "without", :type => :array, :banner =>
+      "Exclude gems that are part of the specified named group."
 
     def install
       require 'bundler/cli/install'
@@ -151,17 +163,18 @@ module Bundler
       update when you have changed the Gemfile, or if you want to get the newest
       possible versions of the gems in the bundle.
     D
-    method_option "source", :type => :array, :banner => "Update a specific source (and all gems associated with it)"
+    method_option "full-index", :type => :boolean, :banner =>
+      "Use the rubygems modern index instead of the API endpoint"
+    method_option "group", :aliases => "-g", :type => :array, :banner =>
+      "Update a specific group"
+    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
+      "Specify the number of jobs to run in parallel"
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     method_option "quiet", :type => :boolean, :banner =>
       "Only output warnings and errors."
-    method_option "full-index", :type => :boolean, :banner =>
-        "Use the rubygems modern index instead of the API endpoint"
-    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
-      "Specify the number of jobs to run in parallel"
-    method_option "group", :aliases => "-g", :type => :array, :banner =>
-      "Update a specific group"
+    method_option "source", :type => :array, :banner =>
+      "Update a specific source (and all gems associated with it)"
     def update(*gems)
       require 'bundler/cli/update'
       Update.new(options, gems).run
@@ -174,21 +187,23 @@ module Bundler
     D
     method_option "paths", :type => :boolean,
       :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."
     def show(gem_name = nil)
       require 'bundler/cli/show'
       Show.new(options, gem_name).run
     end
     map %w(list) => "show"
 
-    desc "binstubs GEM [OPTIONS]", "install the binstubs of the listed gem"
+    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.
     D
-    method_option "path", :type => :string, :lazy_default => "bin", :banner =>
-      "binstub destination directory (default bin)"
     method_option "force", :type => :boolean, :default => false, :banner =>
-      "overwrite existing binstubs if they exist"
+      "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'
       Binstubs.new(options, gems).run
@@ -201,10 +216,10 @@ module Bundler
       versions of the given gems. Prerelease gems are ignored by default. If your gems
       are up to date, Bundler will exit with a status of 0. Otherwise, it will exit 1.
     D
-    method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
-    method_option "source", :type => :array, :banner => "Check against a specific source"
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
+    method_option "source", :type => :array, :banner => "Check against a specific source"
     method_option "strict", :type => :boolean, :banner =>
       "Only list newer versions allowed by your Gemfile requirements"
     def outdated(*gems)
@@ -213,20 +228,25 @@ module Bundler
     end
 
     desc "cache [OPTIONS]", "Cache all the gems to vendor/cache", :hide => true
-    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     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."
     def cache
       require 'bundler/cli/cache'
       Cache.new(options).run
     end
 
     desc "package [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
-    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
-    method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
+    method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms, not just the current one"
+    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 "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 "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
+    method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
     long_desc <<-D
       The package command will copy the .gem files for every gem in the bundle into the
       directory ./vendor/cache. If you then check that directory into your source
@@ -274,16 +294,10 @@ module Bundler
       Open.new(options, name).run
     end
 
-    CONSOLES = {
-      'pry'  => :Pry,
-      'ripl' => :Ripl,
-      'irb'  => :IRB,
-    }
-
     desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
     def console(group = nil)
       require 'bundler/cli/console'
-      Console.new(options, group, CONSOLES).run
+      Console.new(options, group).run
     end
 
     desc "version", "Prints the bundler's version information"
@@ -313,23 +327,25 @@ module Bundler
       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 :version, :type => :boolean, :default => false, :aliases => '-v', :banner => "Set to show each gem version."
-    method_option :requirements, :type => :boolean, :default => false, :aliases => '-r', :banner => "Set to show the version of each required dependency."
     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'
       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', :banner => "Generate a binary for your library."
-    method_option :test, :type => :string, :lazy_default => 'rspec', :aliases => '-t', :banner => "Generate a test directory for your library: 'rspec' is the default, but 'minitest' is also supported."
-    method_option :edit, :type => :string, :aliases => "-e",
-                  :lazy_default => [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? },
-                  :required => false, :banner => "/path/to/your/editor",
-                  :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
-    method_option :ext, :type => :boolean, :detailt => false, :banner => "Generate the boilerplate for C extension code"
-
+    method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :desc => "Generate a binary for your library. Set a default with `bundle config gem.mit true`."
+    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)"
+    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"
+    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'
       Gem.new(options, name, self).run
@@ -341,9 +357,9 @@ module Bundler
 
     desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory"
     method_option "dry-run", :type => :boolean, :default => false, :banner =>
-      "only print out changes, do not actually clean gems"
+      "Only print out changes, do not actually clean gems"
     method_option "force", :type => :boolean, :default => false, :banner =>
-      "forces clean even if --path is not set"
+      "Forces clean even if --path is not set"
     def clean
       require 'bundler/cli/clean'
       Clean.new(options.dup).run
@@ -368,5 +384,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
+      end
   end
 end

data/lib/bundler/cli/cache.rb

@@ -9,6 +9,7 @@ module Bundler
       Bundler.definition.validate_ruby!
       Bundler.definition.resolve_with_cache!
       setup_cache_all
+      Bundler.settings[:cache_all_platforms] = options["all-platforms"] if options.key?("all-platforms")
       Bundler.load.cache
       Bundler.settings[:no_prune] = true if options["no-prune"]
       Bundler.load.lock