bundler 1.2.5 → 1.3.0.pre

data/.gitignore

@@ -1,22 +1,25 @@
+# Please do not submit patches for including directives to ignore IDE/editor
+# generated files. Use a global gitignore as described in
+# https://help.github.com/articles/ignoring-files and find useful gitignore
+# samples at https://github.com/github/gitignore
+
 # system crap
 .DS_Store
 .*.swp
 
 # files created by running the specs
-tmp
+tmp/
 
 # built gems
-pkg
+pkg/
 *.gem
 
 # rubinius bytecode
 *.rbc
+.rbx/
 
 # output from ronn
-lib/bundler/man
+lib/bundler/man/
 
 # output from ci_reporter
-spec/reports
-
-# Netbeans
-nbproject
+spec/reports/

data/.travis.yml

@@ -1,6 +1,12 @@
 language: ruby
 script: rake spec:travis
-before_script: rake spec:travis:deps
+before_script:
+  - rake --version
+  - gem install rake -v '10.0.2'
+  - gem list rake
+  - rake --version
+  - sudo apt-get install groff -y
+  - rake spec:deps
 notifications:
   email:
     - mail@arko.net
@@ -11,17 +17,20 @@ notifications:
     channels:
       - "irc.freenode.org#bundler"
 rvm:
+  - ruby-head
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7
+
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values
 env:
-  # test the supported rubygems release with all of our supported rubies
+  - RGV=master
   - RGV=v1.8.24
 matrix:
   allow_failures:
-    # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
+    - rvm: ruby-head
     - rvm: 1.9.2
   include:
     # Bundler 1.x supports Rubygems down to 1.5.3 on Ruby 1.9.3

data/CHANGELOG.md

@@ -1,25 +1,32 @@
-## 1.2.5 (Feb 24, 2013)
-
-Bugfixes:
-
-  - install Gemfiles with HTTP sources even without OpenSSL present
-  - display CerficateFailureError message in full
-
-## 1.2.4 (Feb 12, 2013)
+## 1.3.0.pre (Nov 29, 2012)
 
 Features:
 
-  - warn about Ruby 2.0 and Rubygems 2.0
-  - inform users when the resolver starts
-  - disable reverse DNS to speed up API requests (@raggi)
-
-Bugfixes:
-
-  - don't send user/pass when redirected to another host (@perplexes)
-  - load gemspecs containing unicode (@gaffneyc, #2301)
-  - support any ruby version in --standalone
-  - resolve some ruby -w warnings (@chastell, #2193)
-  - don't scare users with an error message during API fallback
+  - compatibile with Ruby 2.0.0-preview2
+  - compatibile with Rubygems 2.0.0.preview2 (@drbrain, @evanphx)
+  - ruby 2.0 added to the `:ruby19` ABI-compatible platform
+  - lazy load YAML, allowing Psych to be specified in the Gemfile
+  - significant performance improvements (@cheald, #2181)
+  - `inject` command for scripted Gemfile additions (Engine Yard)
+  - :github option uses slashless arguements as repo owner (@rking)
+  - `open` suggests gem names for typos (@jdelStrother)
+  - `update` reports non-existent gems (@jdelStrother)
+  - `gem` option --test can generate rspec stubs (@MafcoCinco)
+  - `gem` option --test can generate minitest stubs (@kcurtin)
+  - `gem` command generates MIT license (@BrentWheeldon)
+  - gem rake task 'release' resuses existing tags (@shtirlic)
+
+Bugfixes:
+
+  - JRuby new works with HTTPS gem sources (@davidcelis)
+  - `install` installs both rake rake-built gems at once (@crowbot, #2107)
+  - handle Errno::ETIMEDOUT errors (@jmoses)
+  - handle Errno::EAGAIN errors on JRuby
+  - disable ANSI coloring when output is redirected (@tomykaira)
+  - raise LoadErrors correctly during Bundler.require (@Empact)
+  - do not swallow --verbose on `bundle exec` (@sol, #2102)
+  - `gem` generates gemspecs that block double-requires
+  - `gem` generates gemspecs that admit they depend on rake
 
 ## 1.2.3 (Nov 29, 2012)
 

data/CONTRIBUTE.md

@@ -0,0 +1,97 @@
+
+Great to have you here! Here are a few ways you can help out with [Bundler](http://github.com/carlhuda/bundler)!
+
+# Learn & listen
+
+You can start learning about Bundler by reading [the documentation](http://gembundler.com). The best place to start learning about why Bundler exists and what it does is the [Understanding Bundler](http://gembundler.com/v1.2/rationale.html) page. Once you've read that, you can check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/forum/ruby-bundler) and in the [Bundler IRC channel](irc://irc.freenode.net/#bundler), which is #bundler on Freenode.
+
+## Core Team
+
+The Bundler core team consists of André Arko ([@indirect](http://github.com/indirect)) and Terence Lee ([@hone](http://github.com/hone)), with support and advice from original Bundler author Yehuda Katz ([@wycats](http://github.com/wycats)).
+
+# Adding new features
+
+When adding a new feature to Bundler, please follow these steps:
+
+  1. [Create an issue](https://github.com/carlhuda/bundler/issues/new) to discuss your feature.
+  2. Base your commits on the master branch, since we follow [SemVer](http://semver.com) and don't add new features to old releases.
+  3. Commit the code and at least one test covering your changes to a feature branch in your fork.
+  4. Put a line in the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the "Features" heading.
+  5. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your feature branch.
+
+If you don't hear back immediately, don’t get discouraged! We all have day jobs, but we respond to most tickets within a day or two.
+
+# Bug triage
+
+Triage is the work of processing tickets that have been opened into actionable issues, feature requests, or bug reports. That includes verifying bugs, categorizing the ticket, and ensuring there's enough information to reproduce the bug for anyone who wants to try to fix it.
+
+We've created an [issues guide](https://github.com/carlhuda/bundler/blob/master/ISSUES.md) to walk Bundler users through the process of troubleshooting issues and reporting bugs.
+
+If you'd like to help, awesome! You can [report a new bug](https://github.com/carlhuda/bundler/issues/new) or browse our [existing open tickets](https://github.com/carlhuda/bundler/issues).
+
+Not every ticket will point to a bug in Bundler's code, but open tickets usually mean that there is something we could improve to help that user. Sometimes that means writing additional documentation, sometimes that means making error messages clearer, and sometimes that means explaining to a user that they need to install git to use git gems.
+
+When you're looking at a ticket, here are the main questions to ask:
+
+  * Can I reproduce this bug myself?
+  * Are the steps to reproduce clearly stated in the ticket?
+  * Which versions of Bundler (1.1.x, 1.2.x, git, etc.) manifest this bug?
+  * Which operating systems (OS X, Windows, Ubuntu, CentOS, etc.) manifest this bug?
+  * Which rubies (MRI, JRuby, Rubinius, etc.) and which versions (1.8.7, 1.9.3, etc.) have this bug?
+
+If you can't reproduce an issue, chances are good that the bug has been fixed (hurrah!). That's a good time to post to the ticket explaining what you did and how it worked.
+
+If you can reproduce an issue, you're well on your way to fixing it. :) Fixing issues is similar to adding new features:
+
+  1. Discuss the fix on the existing issue. Coordinating with everyone else saves duplicate work and serves as a great way to get suggestions and ideas if you need any.
+  2. Base your commits on the correct branch. Bugfixes for 1.x versions of Bundler should be based on the matching 1-x-stable branch.
+  3. Commit the code and at least one test covering your changes to a named branch in your fork.
+  4. Put a line in the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the “Bugfixes” heading.
+  5. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your bugfix branch.
+
+Finally, the ticket may be a duplicate of another older ticket. If you notice a ticket is a duplicate, simply comment on the ticket noting the original ticket’s number. For example, you could say “This is a duplicate of issue #42, and can be closed”.
+
+
+# Beta testing
+
+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.
+
+
+# Translations
+
+We don't currently have any translations, but please reach out to us if you would like to help get this going.
+
+
+# Documentation
+
+Code needs explanation, and sometimes those who know the code well have trouble explaining it to someone just getting into it. Because of that, we welcome documentation suggestions and patches from everyone, especially if they are brand new to using Bundler.
+
+Bundler has two main sources of documentation: the built-in help (including usage information and man pages) and the [Bundler documentation site](http://gembundler.com).
+
+If you’d like to submit a patch to the man pages, follow the steps for adding a feature above. All of the man pages are located in the `man` directory. Just use the “Documentation” heading when you describe what you did in the changelog.
+
+If you have a suggestion or proposed change for [gembundler.com](http://gembundler.com), please open an issue or send a pull request to the [bundler-site](http://github.com/carlhuda/bundler-site) repository.
+
+
+# Community
+
+Community is an important part of all we do. If you’d like to be part of the Bundler community, you can jump right in and start helping make Bundler better for everyone who uses it.
+
+It would be tremendously helpful to have more people answering questions about Bundler (and often simply about Rubygems or Ruby itself) in our [issue tracker](https://github.com/carlhuda/bundler/issues) or on [Stack Overflow](http://stackoverflow.com/questions/tagged/bundler).
+
+Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [gembundler.com](http://www.gembundler.com), we would absolutely love it if you opened an issue or pull request on the [bundler-site repository](http://github.com/carlhuda/bundler-site).
+
+Finally, sharing your experiences and discoveries by writing them up is a valuable way to help others who have similar problems or experiences in the future. You can write a blog post, create an example and commit it to Github, take screenshots, or make videos.
+
+Examples of how Bundler is used help everyone, and we’ve discovered that people already use it in ways that we never imagined when we were writing it. If you’re still not sure what to write about, there are also several projects doing interesting things based on Bundler. They could probably use publicity too.
+
+If you let someone on the core team know you wrote about Bundler, we will add your post to the list of Bundler resources on the Github project wiki.
+
+
+# Your first bugfix
+
+If you’re interested in contributing to Bundler, that’s awesome! We’d love your help.
+
+If you have any questions after reading this page, please feel free to contact either [@indirect](http://github.com/indirect) or [@hone](http://github.com/hone). They are both happy to provide help working through your first bugfix or thinking through the problem you’re trying to resolve.

data/README.md

@@ -18,9 +18,11 @@ For help with common problems, see [ISSUES](https://github.com/carlhuda/bundler/
 
 ### Development
 
-To see what has changed in recent versions of bundler, see the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
+To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
 
-The `master` branch contains our current progress towards version 1.1. Because of that, please submit bugfix pull requests against the `1-0-stable` branch.
+The `master` branch contains our current progress towards version 1.3.
+Please submit pull requests with bugfixes to the stable branch for
+version you would like to fix.
 
 ### Upgrading from Bundler 0.8 to 0.9 and above
 

data/Rakefile

@@ -1,23 +1,8 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-require 'bundler/gem_tasks'
 require 'rubygems'
+require 'bundler/gem_tasks'
 require 'shellwords'
-require 'benchmark'
-
-# Benchmark task execution
-module Rake
-  class Task
-    alias_method :real_invoke, :invoke
-
-    def invoke(*args)
-      time = Benchmark.measure(@name) do
-        real_invoke(*args)
-      end
-      puts "#{@name} ran for #{time}"
-    end
-  end
-end
 
 task :release => ["man:clean", "man:build"]
 
@@ -28,31 +13,15 @@ rescue
   false
 end
 
+def sudo_task(task)
+  system("sudo -E rake #{task}")
+end
+
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
-    gem_cmd = "#{Gem.ruby} -S gem"
-    {"rspec" => "~> 2.11", "ronn" => "~> 0.7.3"}.each do |name, version|
-      sh "#{gem_cmd} list #{name} -i -v '#{version}' || #{gem_cmd} install #{name} -v '#{version}' --no-ri --no-rdoc"
-    end
-  end
-
-  namespace :travis do
-    task :deps do
-      # Give the travis user a name so that git won't fatally error
-      system("sudo sed -i 's/1000::/1000:Travis:/g' /etc/passwd")
-      # Strip secure_path so that RVM paths transmit through sudo -E
-      system("sudo sed -i '/secure_path/d' /etc/sudoers")
-      # Install groff for the ronn gem
-      system("sudo apt-get install groff -y")
-      # Recompile ruby-head, because the VM version is quite old
-      if ENV['RUBY_VERSION'] == 'ruby-head'
-        system("rvm reinstall ruby-head")
-        system("ruby --version")
-      end
-      # Install the other gem deps, etc.
-      Rake::Task["spec:deps"].invoke
-    end
+    sh "#{Gem.ruby} -S gem list ronn | (grep 'ronn' 1> /dev/null) || #{Gem.ruby} -S gem install ronn --no-ri --no-rdoc"
+    sh "#{Gem.ruby} -S gem list rspec | (grep 'rspec (2.' 1> /dev/null) || #{Gem.ruby} -S gem install rspec --no-ri --no-rdoc"
   end
 end
 
@@ -95,7 +64,7 @@ begin
     namespace :rubygems do
       # Rubygems specs by version
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.24).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.24 master).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -116,15 +85,12 @@ begin
 
           Dir.chdir("tmp/rubygems") do
             system("git remote update")
-            if rg == "master"
-              system("git checkout origin/master")
-            else
-              system("git checkout #{rg}")
-            end
-            hash = `git rev-parse HEAD`.chomp
+            system("git checkout #{rg}")
+            system("git pull origin master") if rg == "master"
+            hash = `git rev-parse HEAD`.strip
           end
 
-          puts "Checked out rubygems '#{rg}' at #{hash}"
+          puts "Running bundler specs against rubygems '#{rg}' at #{hash}"
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
           puts "RUBYOPT=#{ENV['RUBYOPT']}"
         end
@@ -149,7 +115,8 @@ begin
 
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
     task :travis do
-      rg = ENV['RGV'] || 'v1.8.24'
+      ENV['TRACE'] = 'true' # print debug info when an exception comes up
+      rg = ENV['RGV'] || 'master'
 
       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 }
@@ -157,25 +124,16 @@ begin
       Rake::Task["spec:rubygems:#{rg}"].reenable
 
       puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
-      sudos = system("sudo -E rake spec:rubygems:#{rg}:sudo")
-      # clean up by chowning the newly root-owned tmp directory back to the travis user
-      system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
+      sudos = sudo_task "spec:rubygems:#{rg}:sudo"
+      chown = system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
 
       Rake::Task["spec:rubygems:#{rg}"].reenable
 
       puts "\n\e[1;33m[Travis CI] Running bundler real world specs against rubygems #{rg}\e[m\n\n"
       realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
 
-      {"specs" => specs, "sudo" => sudos, "realworld" => realworld}.each do |name, passed|
-        if passed
-          puts "\e[0;32m[Travis CI] #{name} passed\e[m"
-        else
-          puts "\e[0;31m[Travis CI] #{name} failed\e[m"
-        end
-      end
-
       unless specs && sudos && realworld
-        fail "Spec run failed, please review the log for more information"
+        fail "Bundler tests failed, please review the log for more information"
       end
     end
   end

data/bundler.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.name        = "bundler"
   s.version     = Bundler::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.license     = "MIT"
   s.authors     = ["André Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"]
   s.email       = ["andre@arko.net"]
   s.homepage    = "http://gembundler.com"
@@ -19,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "bundler"
 
   s.add_development_dependency "ronn"
-  s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "rspec", "~> 2.11"
 
   # Man files are required because they are ignored by git
   man_files            = Dir.glob("lib/bundler/man/**/*")

data/lib/bundler.rb

@@ -2,7 +2,6 @@ require 'rbconfig'
 require 'fileutils'
 require 'pathname'
 require 'bundler/gem_path_manipulation'
-require 'bundler/psyched_yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
@@ -14,6 +13,7 @@ module Bundler
   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'
@@ -24,6 +24,7 @@ module Bundler
   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'
@@ -45,20 +46,20 @@ module Bundler
     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(6)  ; 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 DslError            < BundlerError; status_code(15) ; end
-  class ProductionError     < BundlerError; status_code(16) ; end
-  class InvalidOption       < DslError                      ; end
-  class HTTPError           < BundlerError; status_code(17) ; end
-  class RubyVersionMismatch < BundlerError; status_code(18) ; 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(6)  ; 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 DslError             < BundlerError; status_code(15) ; end
+  class ProductionError      < BundlerError; status_code(16) ; end
+  class InvalidOption        < DslError                      ; end
+  class HTTPError            < BundlerError; status_code(17) ; end
+  class RubyVersionMismatch  < BundlerError; status_code(18) ; end
 
 
   WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
@@ -99,9 +100,9 @@ module Bundler
     def bin_path
       @bin_path ||= begin
         path = settings[:bin] || "bin"
-        path = Pathname.new(path).expand_path(root).expand_path
+        path = Pathname.new(path).expand_path(root)
         FileUtils.mkdir_p(path)
-        path
+        Pathname.new(path).expand_path
       end
     end
 
@@ -290,11 +291,12 @@ module Bundler
       # Eval the gemspec from its parent directory
       Dir.chdir(path.dirname.to_s) do
         contents = File.read(path.basename.to_s)
-
-        if contents[0..2] == "---" # YAML header
+        if contents =~ /\A---/ # try YAML
           begin
             Gem::Specification.from_yaml(contents)
-          rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception
+            # Raises ArgumentError if the file is not valid YAML (on syck)
+            # Psych raises a Psych::SyntaxError
+          rescue YamlSyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
             eval_gemspec(path, contents)
           end
         else
@@ -326,6 +328,7 @@ module Bundler
 
     def configure_gem_home_and_path
       blank_home = ENV['GEM_HOME'].nil? || ENV['GEM_HOME'].empty?
+
       if settings[:disable_shared_gems]
         ENV['GEM_PATH'] = ''
         configure_gem_home