bundler 1.4.0.pre.1 → 1.4.0.pre.2

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 script: rake spec:travis
-before_script: rake spec:travis:deps
+before_script: travis_retry rake spec:travis:deps
 branches:
   only:
     - master
@@ -30,21 +30,32 @@ rvm:
 # 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
+  # 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.0.3
+  # Test the latest rubygems release with all of our supported rubies
+  - RGV=v2.0.6
+  # Test the latest stable branch so we know the next minor will work
+  - RGV=2.0
 matrix:
   allow_failures:
-    # we want to know how we're doing with head, but not fail the build
+    # We want to know how we're doing with head, but not fail the build
     - rvm: ruby-head
     - env: RGV=master
+    - env: RGV=2.0
     # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
     - rvm: 1.9.2
+    # Alternate implementations are good data points but not maintained
+    - rvm: jruby
+    - rvm: rbx
   include:
-    # riding the edge
+    # Riding the edge
     - rvm: ruby-head
       env: RGV=master
+    # Alternate implementations
+    - rvm: jruby
+      env: RGV=v2.0.6
+    - rvm: rbx
+      env: RGV=v2.0.6
     # Rubygems goes down to 1.5.3 on Ruby 1.9.3
     - rvm: 1.9.3
       env: RGV=v1.8.25
@@ -56,7 +67,7 @@ matrix:
       env: RGV=v1.5.3
     # We only want an overview of how 1.9.2 is doing
     - rvm: 1.9.2
-      env: RGV=v1.8.25
+      env: RGV=v2.0.6
     # Rubygems goes down to 1.3.6 on Ruby 1.8.7
     - rvm: 1.8.7
       env: RGV=v1.8.25

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.4.0.pre.2
+
+Features:
+
+  - add support for the x64-mingw32 platform (#2356, #2590, @larskanis)
+  - add :patchlevel option to ruby DSL
+  - add `bundler` bin (#2598, @kirs)
+  - friendly ambiguous error messages (#2581, #2550, @jlsuttles, @jendiamond, @joyicecloud)
+
+Bugfixes:
+
+  - allow passwordless Basic Auth (#2606, @rykov)
+  - don't suggest `gem install foo` when `foo` is a git gem that fails (@kirs)
+  - revert #2569, going back to git instead of https for :github gems
+
 ## 1.4.0.pre.1 (2013-08-04)
 
 Features:

data/CONTRIBUTING.md

@@ -2,6 +2,14 @@
 
 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!
+
 # 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.

data/DEVELOPMENT.md

@@ -2,11 +2,19 @@ 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://gembundler.com). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://gembundler.com/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.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.
 
-## Core Team
+## Your first commits
+
+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.
+
+## Tackle some small problems
+
+We track [small
+bugs](https://github.com/bundler/bundler/issues?labels=small&state=open) and [small features](https://github.com/bundler/bundler-features/issues?labels=small&state=open) so that anyone who wants to help can start with something that's not too overwhelming. If nothing on those lists looks good, though, just talk to us.
 
-The Bundler core team consists of André Arko ([@indirect](http://github.com/indirect)), Terence Lee ([@hone](http://github.com/hone)), and Jessica Lynn Suttles ([@jlsuttles](http://github.com/jlsuttles)), with support and advice from original Bundler author Yehuda Katz ([@wycats](http://github.com/wycats)).
 
 # Development setup
 
@@ -27,18 +35,6 @@ Bundler doesn't use a Gemfile to list development dependencies, because when we
      With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
 
 
-# Adding new features
-
-If you would like to add a new feature to Bundler, please follow these steps:
-
-  1. [Create an issue](https://github.com/bundler/bundler/issues/new) to discuss your feature.
-  2. Base your commits on the master branch, since we follow [SemVer](http://semver.org) 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/bundler/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.
@@ -70,6 +66,19 @@ If you can reproduce an issue, you're well on your way to fixing it. :) Fixing i
 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”.
 
 
+# Adding new features
+
+If you would like to add a new feature to Bundler, please follow these steps:
+
+  1. [Create an issue](https://github.com/bundler/bundler-features/issues/new) to discuss your feature.
+  2. Base your commits on the master branch, since we follow [SemVer](http://semver.org) 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/bundler/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.
+
+
 # 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.
@@ -86,11 +95,11 @@ We don't currently have any translations, but please reach out to us if you woul
 
 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).
+Bundler has two main sources of documentation: the built-in help (including usage information and man pages) and the [Bundler documentation site](http://bundler.io).
 
 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](https://github.com/bundler/bundler-site) repository.
+If you have a suggestion or proposed change for [bundler.io](http://bundler.io), please open an issue or send a pull request to the [bundler-site](https://github.com/bundler/bundler-site) repository.
 
 
 # Community
@@ -99,17 +108,10 @@ Community is an important part of all we do. If you’d like to be part of the B
 
 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/bundler/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](https://github.com/bundler/bundler-site) repository.
+Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [bundler.io](http://bundler.io), we would absolutely love it if you opened an issue or pull request on the [bundler-site](https://github.com/bundler/bundler-site) repository.
 
 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 commits
-
-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/ISSUES.md

@@ -2,11 +2,15 @@
 
 So! You're having problems with Bundler. This file is here to help. If you're running into an error, try reading the rest of this file for help. If you can't figure out how to solve your problem, there are also instructions on how to report a bug.
 
+**Please use the [Bundler
+Features](https://github.com/bundler/bundler-features) repo to suggest and
+discuss features. The bundler issue tracker is only for bugs.**
+
 ## Documentation
 
-Instructions for common Bundler uses can be found on the [Bundler documentation site](http://gembundler.com/).
+Instructions for common Bundler uses can be found on the [Bundler documentation site](http://bundler.io/).
 
-Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/v1.3/man/bundle.1.html).
+Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://bundler.io/v1.3/man/bundle.1.html).
 
 ## Troubleshooting
 
@@ -16,10 +20,10 @@ Please open a ticket with Heroku if you're having trouble deploying. They have a
 
 ### Other problems
 
-First, figure out exactly what it is that you're trying to do. Then, go to the [Bundler documentation website](http://gembundler.com) and see if we have instructions on how to do that.
+First, figure out exactly what it is that you're trying to do. Then, go to the [Bundler documentation website](http://bundler.io) and see if we have instructions on how to do that.
 
 Second, check [the compatibility
-list](http://gembundler.com/compatibility.html), and make sure that the version of Bundler that you are
+list](http://bundler.io/compatibility.html), and make sure that the version of Bundler that you are
 using works with the versions of Ruby and Rubygems that you are using.
 
 If the instructions don't work, or you can't find any instructions, you can try these troubleshooting steps:
@@ -48,26 +52,35 @@ If the instructions don't work, or you can't find any instructions, you can try
 
 ## Reporting unresolved problems
 
-Hopefully the troubleshooting steps above resolved your problem. If things still aren't working the way you expect them to, please let us know so that we can diagnose and hopefully fix the problem you're having. When you report a problem, please include the following information:
+Hopefully the troubleshooting steps above resolved your problem. If things still aren't working the way you expect them to, please let us know so that we can diagnose and hopefully fix the problem you're having.
+
+**The best way to report a bug is by providing a reproduction script.** See these examples:
+
+* [Git environment variables causing install to fail.](https://gist.github.com/xaviershay/6207550)
+* [Multiple gems in a repository cannot be updated independently.](https://gist.github.com/xaviershay/6295889)
+
+A half working script with comments for the parts you were unable to automate is still appreciated.
+
+If you are unable to do that, please include the following information in your report:
 
-  - What you're trying to accomplish
-  - The command you ran
-  - What you expected to happen
-  - What actually happened
-  - The exception backtrace(s), if any
-  - Everything output by running `bundle env`
+ - What you're trying to accomplish
+ - The command you ran
+ - What you expected to happen
+ - What actually happened
+ - The exception backtrace(s), if any
+ - Everything output by running `bundle env`
 
 If your version of Bundler does not have the `bundle env` command, then please include:
 
-  - Your Gemfile
-  - Your Gemfile.lock
-  - Your Bundler configuration settings (run `bundle config`)
-  - What version of bundler you are using (run `bundle -v`)
-  - What version of Ruby you are using (run `ruby -v`)
-  - What version of Rubygems you are using (run `gem -v`)
-  - Whether you are using RVM, and if so what version (run `rvm -v`)
-  - Whether you have the `rubygems-bundler` gem, which can break gem executables (run `gem list rubygems-bundler`)
-  - Whether you have the `open_gem` gem, which can cause rake activation conflicts (run `gem list open_gem`)
+ - Your Gemfile
+ - Your Gemfile.lock
+ - Your Bundler configuration settings (run `bundle config`)
+ - What version of bundler you are using (run `bundle -v`)
+ - What version of Ruby you are using (run `ruby -v`)
+ - What version of Rubygems you are using (run `gem -v`)
+ - Whether you are using RVM, and if so what version (run `rvm -v`)
+ - Whether you have the `rubygems-bundler` gem, which can break gem executables (run `gem list rubygems-bundler`)
+ - Whether you have the `open_gem` gem, which can cause rake activation conflicts (run `gem list open_gem`)
 
 If you are using Rails 2.3, please also include:
 

data/README.md

@@ -16,7 +16,7 @@ bundle install
 bundle exec rails new myapp
 ```
 
-See [gembundler.com](http://gembundler.com) for the full documentation.
+See [bundler.io](http://bundler.io) for the full documentation.
 
 ### Troubleshooting
 
@@ -26,12 +26,14 @@ 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)
 
-### Development
+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.
 
-To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md).
+### Core Team
 
-The `master` branch contains our current progress towards version 1.3. Versions 1.0 to 1.2 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 Bundler core team consists of André Arko ([@indirect](http://github.com/indirect)), Terence Lee ([@hone](http://github.com/hone)), and Jessica Lynn Suttles ([@jlsuttles](http://github.com/jlsuttles)), with support and advice from original Bundler author Yehuda Katz ([@wycats](http://github.com/wycats)).
 
 ### Other questions
 
+To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md).
+
 Feel free to chat with the Bundler core team (and many other users) on IRC in the  [#bundler](irc://irc.freenode.net/bundler) channel on Freenode, or via email on the [Bundler mailing list](http://groups.google.com/group/ruby-bundler).

data/Rakefile

@@ -89,7 +89,7 @@ begin
     namespace :rubygems do
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.3).each do |rg|
+      %w(master 2.0 v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.6).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)

data/UPGRADING.md

@@ -33,7 +33,7 @@ your deploy.rb file to run Bundler automatically as part of deploying:
     require 'bundler/capistrano'
 
 For more details on deploying using bundler, see the documentation
-for the bundler cap task, and the [documentation on deploying](http://gembundler.com/deploying.html).
+for the bundler cap task, and the [documentation on deploying](http://bundler.io/deploying.html).
 
 
 ## Bundler 0.8 to 0.9 and above

data/bin/bundle

@@ -5,7 +5,7 @@ Signal.trap("INT") { exit 1 }
 
 require 'bundler'
 # Check if an older version of bundler is installed
-$:.each do |path|
+$LOAD_PATH.each do |path|
   if 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"

data/bin/bundler

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'bundler'
+require 'bundler/cli'
+
+ui = Bundler::UI::Shell.new
+ui.error "It's recommended to use Bundler through 'bundle' binary instead of 'bundler'"
+
+bin = "#{File.dirname(__FILE__)}/bundle #{ARGV.join(" ")}"
+exec bin

data/bundler.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.licenses    = ['MIT']
   spec.authors     = ["André Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"]
   spec.email       = ["andre@arko.net"]
-  spec.homepage    = "http://gembundler.com"
+  spec.homepage    = "http://bundler.io"
   spec.summary     = %q{The best way to manage your application's dependencies}
   spec.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably}
 
@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git
   spec.test_files  = spec.files.grep(%r{^spec/})
 
-  spec.executables   = %w(bundle)
+  spec.executables   = %w(bundle bundler)
   spec.require_paths = ["lib"]
 end

data/lib/bundler/capistrano.rb

@@ -4,6 +4,10 @@
 # Bundler will be activated after each new deployment.
 require 'bundler/deployment'
 
+if Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
+  raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler"
+end
+
 Capistrano::Configuration.instance(:must_exist).load do
   before "deploy:finalize_update", "bundle:install"
   Bundler::Deployment.define_task(self, :task, :except => { :no_release => true })

data/lib/bundler/cli.rb

@@ -6,6 +6,13 @@ module Bundler
   class CLI < Thor
     include Thor::Actions
 
+    def self.start(*)
+      super
+    rescue Exception => e
+      Bundler.ui = UI::Shell.new
+      raise e
+    end
+
     def initialize(*)
       super
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)

data/lib/bundler/current_ruby.rb

@@ -69,7 +69,7 @@ module Bundler
     end
 
     def mingw?
-      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32"
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != 'x64'
     end
 
     def mingw_18?
@@ -84,5 +84,13 @@ module Bundler
       mingw? && on_20?
     end
 
+    def x64_mingw?
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == 'x64'
+    end
+
+    def x64_mingw_20?
+      x64_mingw? && on_20?
+    end
+
   end
 end

data/lib/bundler/definition.rb

@@ -380,6 +380,8 @@ module Bundler
           "Your Ruby version is #{actual}, but your Gemfile specified #{expected}"
         when :engine_version
           "Your #{system_ruby_version.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
+        when :patchlevel
+          "Your Ruby patchlevel is #{actual}, but your Gemfile specified #{expected}"
         end
 
         raise RubyVersionMismatch, msg

data/lib/bundler/dependency.rb

@@ -23,7 +23,9 @@ module Bundler
       :mingw    => Gem::Platform::MINGW,
       :mingw_18 => Gem::Platform::MINGW,
       :mingw_19 => Gem::Platform::MINGW,
-      :mingw_20 => Gem::Platform::MINGW
+      :mingw_20 => Gem::Platform::MINGW,
+      :x64_mingw    => Gem::Platform::X64_MINGW,
+      :x64_mingw_20 => Gem::Platform::X64_MINGW
     }.freeze
 
     def initialize(name, version, options = {}, &blk)

data/lib/bundler/dsl.rb

@@ -230,7 +230,7 @@ module Bundler
 
       if github = opts.delete("github")
         github = "#{github}/#{github}" unless github.include?("/")
-        opts["git"] = "https://github.com/#{github}.git"
+        opts["git"] = "git://github.com/#{github}.git"
       end
 
       if gist = opts.delete("gist")

data/lib/bundler/fetcher.rb

@@ -217,7 +217,7 @@ module Bundler
       begin
         Bundler.ui.debug "Fetching from: #{uri}"
         req = Net::HTTP::Get.new uri.request_uri
-        req.basic_auth(uri.user, uri.password) if uri.user && uri.password
+        req.basic_auth(uri.user, uri.password) if uri.user
         if defined?(Net::HTTP::Persistent)
           response = @connection.request(uri, req)
         else

data/lib/bundler/friendly_errors.rb

@@ -1,3 +1,5 @@
+require "bundler/vendored_thor"
+
 module Bundler
   def self.with_friendly_errors
     yield
@@ -5,6 +7,9 @@ module Bundler
     Bundler.ui.error e.message, :wrap => true
     Bundler.ui.trace e
     exit e.status_code
+  rescue Thor::AmbiguousTaskError => e
+    Bundler.ui.error e.message
+    exit 15
   rescue Thor::UndefinedTaskError => e
     Bundler.ui.error e.message
     exit 15