bundler 1.5.3 → 1.6.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6caecfa1400ecabac4e4166056f9ca616d09f3
-  data.tar.gz: 6bfb9eb62ab62260215ec47765005e9650689dbd
+  metadata.gz: ba02e8bf782c12afb3abc0227c0589c4008d7a50
+  data.tar.gz: d24a21a4d7ee5c5b8a170e7268cfd87927a8a2c1
 SHA512:
-  metadata.gz: a6ecdc3b43845393951056fd8d93d942e4903f371defee233b410d26620b1ba79532eb51d6e08bef565dddf4f23a26f8efeef8a610ccc80acc76be489f4f6e0a
-  data.tar.gz: b17a2361fcabdb360f6ec68c9750430c9dcefcbc8ec2757dc9e54a32fa35315b4203523ff3588cb8e3e3fa9aa164910c21d9d98e8426f6fa43384122db7f3b62
+  metadata.gz: d4edc092f83b06ea5d803ff0c7f732339e01f37f34fb8675a263f228e2f1ffffc8c032af1f628aa8939db4acf0715baf41bf3d232375b2126646c0c0ef46d657
+  data.tar.gz: 8b5bd0fa37c93c3aef9bb1fb5b7d43e28f3e550e21917eadd498f5d766a582d69f11e68f3007a21425863e30c6d58179cab716df25b488a6d265ed434b10d833

data/.travis.yml

@@ -19,19 +19,22 @@ notifications:
     on_success: change
     on_failure: always
     rooms:
+      # Bundler Ops
       secure: MNTSGIySYwHia5gIgRiZxXtPMPDIP9KmzQk7Kq2ZoVvP3mIk8W1TMkvcyFkEf6uCasyVZZixzUBfY+E0BlHAz1ycQpTh1jvSpuIpEVYW48ShJldJ+8W8xfzafyOHii3z7VrDaomEffmMDdmHRsbQAfekMjdR4bTpXtT9V+wOXlg=
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
+  - 1.8.7
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values
 env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
-  - RGV=v2.1.9
+  - RGV=v2.2.1
   # Test the latest stable branch so we know the next minor will work
-  - RGV=2.1
+  - RGV=2.2
 matrix:
   allow_failures:
     # We want to know how we're doing with head, but not fail the build
@@ -48,21 +51,21 @@ matrix:
       env: RGV=master
     # Alternate implementations
     - rvm: jruby
-      env: RGV=v2.1.9
+      env: RGV=v2.2.1
     - rvm: rbx
-      env: RGV=v2.1.9
+      env: RGV=v2.2.1
     # Rubygems goes down to 2.0 on Ruby 2.0.0
     - rvm: 2.0.0
-      env: RGV=v2.1.9
+      env: RGV=v2.1.11
     - rvm: 2.0.0
-      env: RGV=v2.0.12
+      env: RGV=v2.0.14
     # Rubygems goes down to 1.5.3 on Ruby 1.9.3
     - rvm: 1.9.3
-      env: RGV=v2.1.9
+      env: RGV=v2.1.11
     - rvm: 1.9.3
-      env: RGV=v2.0.12
+      env: RGV=v2.0.14
     - rvm: 1.9.3
-      env: RGV=v1.8.28
+      env: RGV=v1.8.29
     - rvm: 1.9.3
       env: RGV=v1.7.2
     - rvm: 1.9.3
@@ -71,10 +74,10 @@ matrix:
       env: RGV=v1.5.3
     # We only want an overview of how 1.9.2 is doing
     - rvm: 1.9.2
-      env: RGV=v2.1.9
+      env: RGV=v2.1.11
     # Rubygems goes down to 1.3.6 on Ruby 1.8.7
     - rvm: 1.8.7
-      env: RGV=v1.8.28
+      env: RGV=v1.8.29
     - rvm: 1.8.7
       env: RGV=v1.7.2
     - rvm: 1.8.7

data/CHANGELOG.md

@@ -1,9 +1,16 @@
-## 1.5.3 (2014-02-06)
+## 1.6.0
 
 Bugfixes:
 
-  - find "missing" gems that are actually present (#2780, #2818, #2854)
-  - pse n-1 cores when given n jobs for parallel install (@jdickey)
+  - many Gemfiles that had incorrect errors now resolve correctly (@Who828)
+
+Features:
+
+  - resolver rewritten to avoid recursion (@Who828)
+  - some complex Gemfiles are resolved up to 10x faster (@Who828)
+  - add support for IRB alternatives such as Pry and Ripl (@joallard, @postmodern)
+  - highlight installed or updated gems (#2722, #2741, @yaotti, @simi)
+  - display post_install_message's for gems installed via :git (@phallstrom)
 
 ## 1.5.2 (2014-01-10)
 

data/CONTRIBUTING.md

@@ -1,21 +1,30 @@
-# Creating Issues
+# Contributing
+
+Bundler welcomes contributions from *everyone*. While contributing, please follow the project [code of conduct](http://bundler.io/conduct.html), so that everyone can be included.
+
+Here are some ways you can contribute:
+
+  - by using prerelease versions
+  - by reporting bugs
+  - by suggesting new features
+  - by writing or editing documentation
+  - by closing issues
+  - by reviewing patches
+  - by refactoring code
+  - by writing code (no patch is too small! fix typos or bad whitespace)
+
+If you'd like to help make Bundler better, you totally rock! Please check out the [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md) file for an introduction to the project, guidelines for contributing, and details about what would be helpful.
+
+Thanks for helping us make Bundler better.
+
+# Troubleshooting
 
 If you're having a problem, please see [ISSUES](https://github.com/bundler/bundler/blob/master/ISSUES.md) for troubleshooting steps and a guide for how to submit a ticket that will help us solve the problem you are having as quickly as possible.
 
 # Requesting Features
 
-Head on over to the [Bundler
-features](https://github.com/bundler/bundler-features) project, or any of the
-lists or channels listed below. Feature-wise we consider Bundler stable, so the
-core team does not tend to work on feature suggestions. Pull requests welcome
-though!
+Head on over to the [Bundler features](https://github.com/bundler/bundler-features) project, or any of the lists or channels listed below. Feature-wise we consider Bundler stable, so the core team does not tend to work on feature suggestions. Pull requests welcome though!
 
 # Discussing Bundler
 
 If you'd like to discuss features, ask questions, or just engage in general Bundler-focused discussion, please see the [#bundler](irc://irc.freenode.net/#bundler) IRC channel on Freenode, and the [Bundler mailing list](http://groups.google.com/group/ruby-bundler) on Google Groups.
-
-# Helping Out
-
-If you'd like to help make Bundler better, you totally rock! Please check out the [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md) file for an introduction to the project, guidelines for contributing, and suggestions for things anyone can do that would be helpful.
-
-Thanks for helping us make Bundler better.

data/DEVELOPMENT.md

@@ -2,7 +2,7 @@ Great to have you here! Here are a few ways you can help out with [Bundler](http
 
 # Where should I start?
 
-You can start learning about Bundler by reading [the documentation](http://bundler.io). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://bundler.io/v1.2/rationale.html). You can also check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/group/ruby-bundler) and in the [Bundler IRC channel](irc://irc.freenode.net/#bundler), which is #bundler on Freenode.
+You can start learning about Bundler by reading [the documentation](http://bundler.io). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://bundler.io/v1.5/rationale.html). You can also check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/group/ruby-bundler) and in the [Bundler IRC channel](irc://irc.freenode.net/#bundler), which is #bundler on Freenode.
 
 ## Your first commits
 
@@ -83,7 +83,7 @@ If you don't hear back immediately, don’t get discouraged! We all have day job
 
 Early releases require heavy testing, especially across various system setups. We :heart: testers, and are big fans of anyone who can run `gem install bundler --pre` and try out upcoming releases in their development and staging environments.
 
-As of September 3 2012, there is no current prerelease or beta version of Bundler. That said, you are always welcome to try checking out master and building a gem yourself if you want to try out the latest changes.
+There may not always be prereleases or beta versions of Bundler. That said, you are always welcome to try checking out master and building a gem yourself if you want to try out the latest changes.
 
 
 # Translations

data/README.md

@@ -1,5 +1,6 @@
 [![Code Climate](https://codeclimate.com/github/bundler/bundler.png)](https://codeclimate.com/github/bundler/bundler)
-[![Build Status](https://secure.travis-ci.org/bundler/bundler.png?branch=1-3-stable)](http://travis-ci.org/bundler/bundler)
+[![Build Status](https://travis-ci.org/bundler/bundler.png?branch=master)](http://travis-ci.org/bundler/bundler)
+<a href="http://badge.fury.io/rb/bundler"><img src="https://badge.fury.io/rb/bundler@2x.png" alt="Gem Version" height="18"></a>
 
 # Bundler: a gem to bundle gems
 Bundler keeps ruby applications running the same code on every machine.
@@ -26,7 +27,7 @@ For help with common problems, see [ISSUES](https://github.com/bundler/bundler/b
 
 If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md)
 
-The `master` branch contains our current progress towards version 1.4. Versions 1.0-1.3 each have their own stable branches. Please submit bugfixes as pull requests to the stable branch for the version you would like to fix.
+The `master` branch contains our current progress towards version 1.5. Versions 1.0-1.3 each have their own stable branches. Please submit bugfixes as pull requests to the stable branch for the version you would like to fix.
 
 ### Core Team
 

data/Rakefile

@@ -4,6 +4,8 @@ require 'rubygems'
 require 'shellwords'
 require 'benchmark'
 
+RUBYGEMS_REPO = File.expand_path("tmp/rubygems")
+
 def safe_task(&block)
   yield
   true
@@ -28,8 +30,8 @@ end
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
-    {"rdiscount" => "~> 1.6", "ronn" => "~> 0.7.3", "rspec" => "~> 3.0.beta"}.each do |name, version|
-      sh "#{Gem.ruby} -S gem list -i '^#{name}$' -v '#{version}' || " \
+    {"rdiscount" => "~> 1.6", "ronn" => "~> 0.7.3", "rspec" => "~> 2.99.0.beta1"}.each do |name, version|
+      sh "#{Gem.ruby} -S gem list -i #{name} -v '#{version}' || " \
          "#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
     end
   end
@@ -42,8 +44,10 @@ namespace :spec do
       system("sudo sed -i '/secure_path/d' /etc/sudoers")
       # Install groff for the ronn gem
       system("sudo apt-get install groff -y")
-      # Switch to the Bluebox DNS servers in the Travis data center
-      system("printf 'nameserver 199.91.168.70\nnameserver 199.91.168.71\n' | sudo tee /etc/resolv.conf")
+      # Downgrade Rubygems on 1.8 to avoid https://github.com/rubygems/rubygems/issues/784
+      if RUBY_VERSION < '1.9'
+        system("gem update --system 2.1.11")
+      end
       # Install the other gem deps, etc.
       Rake::Task["spec:deps"].invoke
     end
@@ -90,8 +94,8 @@ begin
     namespace :rubygems do
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
-      branches = %w(master 2.1)
-      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.28 v2.0.12 v2.1.9)
+      branches = %w(master 2.2)
+      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.1)
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
@@ -111,7 +115,7 @@ begin
           end
           hash = nil
 
-          Dir.chdir("tmp/rubygems") do
+          Dir.chdir(RUBYGEMS_REPO) do
             system("git remote update")
             if rg == "master"
               system("git checkout origin/master")
@@ -126,7 +130,7 @@ begin
           puts "RUBYOPT=#{ENV['RUBYOPT']}"
         end
 
-        task rg => ["clone_rubygems_#{rg}", "man:build"]
+        task rg => ["man:build", "clone_rubygems_#{rg}"]
         task "rubygems:all" => rg
       end
 
@@ -146,7 +150,7 @@ begin
 
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
     task :travis do
-      rg = ENV['RGV'] || 'v1.8.24'
+      rg = ENV['RGV'] || raise("Rubygems version is required on Travis!")
 
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
       specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
@@ -220,6 +224,12 @@ rescue LoadError
   end
 end
 
+desc "Update vendored SSL certs to match the certs vendored by Rubygems"
+task :update_certs => "spec:rubygems:clone_rubygems_master" do
+  require 'bundler/ssl_certs/certificate_manager'
+  Bundler::SSLCerts::CertificateManager.update_from!(RUBYGEMS_REPO)
+end
+
 require 'bundler/gem_tasks'
 task :build => ["man:clean", "man:build"]
 task :release => ["man:clean", "man:build"]

data/bundler.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = '>= 1.3.6'
 
   spec.add_development_dependency 'ronn', '~> 0.7.3'
-  spec.add_development_dependency 'rspec', '~> 2.11'
+  spec.add_development_dependency 'rspec', '~> 2.99.0.beta1'
 
   spec.files       = `git ls-files -z`.split("\x0")
   spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git

data/lib/bundler.rb

@@ -90,7 +90,7 @@ module Bundler
     end
 
     def ui
-      @ui ||= UI.new
+      @ui ||= UI::Silent.new
     end
 
     # Returns absolute path of where gems are installed on the filesystem.
@@ -154,9 +154,12 @@ module Bundler
     end
 
     def locked_gems
-      @locked_gems ||= begin
+      return @locked_gems if defined?(@locked_gems)
+      if Bundler.default_lockfile.exist?
         lock = Bundler.read_file(Bundler.default_lockfile)
-        LockfileParser.new(lock)
+        @lock_gems = LockfileParser.new(lock)
+      else
+        @locked_gems = nil
       end
     end
 
@@ -194,8 +197,9 @@ module Bundler
         root.join('.bundle')
     end
 
-    def app_cache
-      root.join("vendor/cache")
+    def app_cache(custom_path = nil)
+      path = custom_path || root
+      path.join("vendor/cache")
     end
 
     def tmp

data/lib/bundler/cli.rb

@@ -1,5 +1,4 @@
 require 'bundler'
-require 'bundler/similarity_detector'
 require 'bundler/vendored_thor'
 
 module Bundler
@@ -302,11 +301,14 @@ module Bundler
         "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"
     def update(*gems)
       sources = Array(options[:source])
+      groups  = Array(options[:group]).map(&:to_sym)
       Bundler.ui.level = "warn" if options[:quiet]
 
-      if gems.empty? && sources.empty?
+      if gems.empty? && sources.empty? && groups.empty?
         # We're doing a full update
         Bundler.definition(true)
       else
@@ -316,6 +318,12 @@ module Bundler
           next if names.include?(g)
           raise GemNotFound, not_found_message(g, names)
         end
+
+        if groups.any?
+          specs = Bundler.definition.specs_for groups
+          sources.concat(specs.map(&:name))
+        end
+
         Bundler.definition(:gems => gems, :sources => sources)
       end
 
@@ -513,6 +521,9 @@ module Bundler
     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 "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"
     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
@@ -521,10 +532,12 @@ module Bundler
     D
     def package
       Bundler.ui.level = "warn" if options[:quiet]
+      Bundler.settings[:path] = File.expand_path(options[:path]) if options[:path]
       setup_cache_all
       install
       # TODO: move cache contents here now that all bundles are locked
-      Bundler.load.cache
+      custom_path = Pathname.new(options[:path]) if options[:path]
+      Bundler.load.cache(custom_path)
     end
     map %w(pack) => :package
 
@@ -650,20 +663,50 @@ module Bundler
       return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
       spec = select_spec(name, :regex_match)
       return unless spec
-      Dir.chdir(spec.full_gem_path) do
-        command = "#{editor} #{spec.full_gem_path}"
+      full_gem_path = spec.full_gem_path
+      Dir.chdir(full_gem_path) do
+        command = "#{editor} #{full_gem_path}"
         success = system(command)
         Bundler.ui.info "Could not run '#{command}'" unless success
       end
     end
 
+    CONSOLES = {
+      'pry'  => :Pry,
+      'ripl' => :Ripl,
+      'irb'  => :IRB,
+    }
+
     desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
     def console(group = nil)
       group ? Bundler.require(:default, *(group.split.map! {|g| g.to_sym })) : Bundler.require
       ARGV.clear
 
-      require 'irb'
-      IRB.start
+      preferred = Bundler.settings[:console] || 'irb'
+
+      # See if console is available
+      begin
+        require preferred || true
+      rescue LoadError
+        # Is it in Gemfile?
+        Bundler.ui.error "Could not load the #{preferred} console"
+        Bundler.ui.info "Falling back on IRB..."
+
+        require 'irb'
+        preferred = 'irb'
+      end
+
+      constant = CONSOLES[preferred]
+
+      console = begin
+                  Object.const_get(constant)
+                rescue NameError => e
+                  Bundler.ui.error e.inspect
+                  Bundler.ui.error "Could not load the #{constant} console"
+                  return
+                end
+
+      console.start
     end
 
     desc "version", "Prints the bundler's version information"
@@ -892,10 +935,8 @@ module Bundler
     end
 
     def not_found_message(missing_gem_name, alternatives)
+      require 'bundler/similarity_detector'
       message = "Could not find gem '#{missing_gem_name}'."
-
-      # This is called as the result of a GemNotFound, let's see if
-      # there's any similarly named ones we can propose instead
       alternate_names = alternatives.map { |a| a.respond_to?(:name) ? a.name : a }
       suggestions = SimilarityDetector.new(alternate_names).similar_word_list(missing_gem_name)
       message += "\nDid you mean #{suggestions}?" if suggestions

data/lib/bundler/dsl.rb

@@ -1,4 +1,5 @@
 require 'bundler/dependency'
+require 'bundler/ruby_dsl'
 
 module Bundler
   class Dsl
@@ -15,7 +16,6 @@ module Bundler
     attr_accessor :dependencies
 
     def initialize
-      @rubygems_source = Source::Rubygems.new
       @source          = nil
       @sources         = []
       @dependencies    = []
@@ -25,12 +25,16 @@ module Bundler
       @ruby_version    = nil
     end
 
+    def rubygems_source
+      @rubygems_source ||= Source::Rubygems.new
+    end
+
     def eval_gemfile(gemfile, contents = nil)
       contents ||= Bundler.read_file(gemfile.to_s)
       instance_eval(contents, gemfile.to_s, 1)
     rescue SyntaxError => e
-      bt = e.message.split("\n")[1..-1]
-      raise GemfileError, ["Gemfile syntax error:", *bt].join("\n")
+      syntax_msg = e.message.gsub("#{gemfile.to_s}:", 'on line ')
+      raise GemfileError, "Gemfile syntax error #{syntax_msg}"
     rescue ScriptError, RegexpError, NameError, ArgumentError => e
       e.backtrace[0] = "#{e.backtrace[0]}: #{e.message} (#{e.class})"
       Bundler.ui.warn e.backtrace.join("\n       ")
@@ -115,10 +119,10 @@ module Bundler
         Bundler.ui.warn "The source :#{source} is deprecated because HTTP " \
           "requests are insecure.\nPlease change your source to 'https://" \
           "rubygems.org' if possible, or 'http://rubygems.org' if not."
-        @rubygems_source.add_remote "http://rubygems.org"
+        rubygems_source.add_remote "http://rubygems.org"
         return
       when String
-        @rubygems_source.add_remote source
+        rubygems_source.add_remote source
         return
       else
         @source = source
@@ -155,7 +159,7 @@ module Bundler
     end
 
     def to_definition(lockfile, unlock)
-      @sources << @rubygems_source unless @sources.include?(@rubygems_source)
+      @sources << rubygems_source unless @sources.include?(rubygems_source)
       Definition.new(lockfile, @dependencies, @sources, unlock, @ruby_version)
     end