bundler 1.3.0.pre.5 → 1.3.0.pre.6

data/.travis.yml

@@ -32,7 +32,7 @@ matrix:
     # we want to know how we're doing with head, but not fail the build
     - rvm: ruby-head
     # until the 2.0 rc, it's okay for failures to crop up
-    - rvm: 2.0.0-preview2
+    - rvm: 2.0.0
     # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
     - rvm: 1.9.2
   include:
@@ -40,8 +40,8 @@ matrix:
     - rvm: ruby-head
       env: RGV=master
     # 2.0 release track
-    - rvm: 2.0.0-preview2
-      env: RGV=v2.0.0.preview2.2
+    - rvm: 2.0.0
+      env: RGV=v2.0.0.rc.1
     # Bundler 1.x supports Rubygems down to 1.5.3 on Ruby 1.9.3
     - rvm: 1.9.3
       env: RGV=v1.7.2

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.3.0.pre.6 (January 22, 2013)
+
+Features:
+
+  - `binstubs` lists child gem bins if a gem has no binstubs
+  - `bundle gem --edit` will open the new gemspec (@ndbroadbent)
+  - `bundle gem --test rspec` now makes working tests (@tricknotes)
+  - add `BUNDLE_IGNORE_CONFIG` environment variable support (@richo)
+
+Bugfixes:
+
+  - don't overwrite custom binstubs during `install --binstubs`
+  - don't throw an exception if `binstubs` gem doesn't exist
+  - `bundle config` now works in directories without a Gemfile
+
 ## 1.3.0.pre.5 (Jan 9, 2013)
 
 Features:
@@ -30,6 +45,7 @@ Features:
   - pushing gems during `rake release` can be disabled (@trans)
   - installing gems with `rake install` is much faster (@utkarshkukreti)
   - added platforms :ruby_20 and :mri_20, since the ABI has changed
+  - added '--edit' option to open generated gemspec in editor
 
 Bugfixes:
 

data/CONTRIBUTE.md

@@ -3,7 +3,7 @@ Great to have you here! Here are a few ways you can help out with [Bundler](http
 
 # Learn & listen
 
-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/forum/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://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.
 
 ## Core Team
 

data/ISSUES.md

@@ -16,7 +16,9 @@ Please open a ticket with Heroku if you're having trouble deploying. They have a
 
 ### Something else
 
-After reading the documentation, try these troubleshooting steps:
+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.
+
+If the instructions don't work, or you can't find any instructions, you can try these troubleshooting steps:
 
     # remove user-specific gems and git repos
     rm -rf ~/.bundle/ ~/.gem/bundler/ ~/.gems/cache/bundler/
@@ -24,10 +26,10 @@ After reading the documentation, try these troubleshooting steps:
     # remove system-wide git repos and git checkouts
     rm -rf $GEM_HOME/bundler/ $GEM_HOME/cache/bundler/
 
-    # remove project-specific settings and git repos
+    # remove project-specific settings
     rm -rf .bundle/
 
-    # remove project-specific cached .gem files
+    # remove project-specific cached gems and repos
     rm -rf vendor/cache/
 
     # remove the saved resolve of the Gemfile
@@ -42,10 +44,17 @@ After reading the documentation, try these troubleshooting steps:
 
 ## Reporting unresolved problems
 
-The Bundler team needs to know some things in order to diagnose and hopefully fix the bug you've found. When you report a bug, 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. When you report a problem, please include the following information:
 
+  - What you're trying to accomplish
   - The command you ran
-  - Exception backtrace(s), if any
+  - 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`)
@@ -56,14 +65,15 @@ The Bundler team needs to know some things in order to diagnose and hopefully fi
   - 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 have either `rubygems-bundler` or `open_gem` installed, please try removing them and then following the troublshooting steps above before opening a new ticket.
-
 If you are using Rails 2.3, please also include:
 
   - Your boot.rb file
   - Your preinitializer.rb file
   - Your environment.rb file
 
+
+If you have either `rubygems-bundler` or `open_gem` installed, please try removing them and then following the troublshooting steps above before opening a new ticket.
+
 [Create a gist](https://gist.github.com) containing all of that information, then visit the [Bundler issue tracker](https://github.com/carlhuda/bundler/issues) and [create a ticket](https://github.com/carlhuda/bundler/issues/new) describing your problem and linking to your gist.
 
-Thanks for reporting issues and making Bundler better!
+Thanks for reporting issues and helping make Bundler better!

data/Rakefile

@@ -43,11 +43,6 @@ 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")
-      # 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

data/bin/bundle

@@ -8,8 +8,9 @@ require 'bundler'
 # Check if an older version of bundler is installed
 $:.each do |path|
   if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
-    err = "Please remove Bundler 0.8 versions."
-    err << "This can be done by running `gem cleanup bundler`."
+    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
 end

data/lib/bundler.rb

@@ -17,6 +17,7 @@ module Bundler
   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'
@@ -188,7 +189,11 @@ module Bundler
     end
 
     def settings
-      @settings ||= Settings.new(app_config_path)
+      @settings ||= begin
+        Settings.new(app_config_path)
+      rescue GemfileNotFound
+        Settings.new
+      end
     end
 
     def with_original_env

data/lib/bundler/cli.rb

@@ -111,8 +111,8 @@ module Bundler
         definition.validate_ruby!
         not_installed = definition.missing_specs
       rescue GemNotFound, VersionConflict
-        Bundler.ui.error "Your Gemfile's dependencies could not be satisfied"
-        Bundler.ui.warn  "Install missing gems with `bundle install`"
+        Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies."
+        Bundler.ui.warn  "Install missing gems with `bundle install`."
         exit 1
       end
 
@@ -333,23 +333,23 @@ module Bundler
 
     desc "binstubs [GEM]", "install the binstubs of the listed gem"
     long_desc <<-D
-      This command will install bundler generated binstubs of the [GEM] specified in
-      the bin directory specified by --binstubs or the default location.
+      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 =>
-      "the directory to put the binstubs, defaults to ./bin"
+      "binstub destination directory (default bin)"
     method_option "force", :type => :boolean, :default => false, :banner =>
-      "forces the writing of a binstub, even if it already exists"
+      "overwrite existing binstubs if they exist"
     def binstubs(gem_name)
       Bundler.definition.validate_ruby!
       Bundler.settings[:bin] = options["path"] if options["path"]
       Bundler.settings[:bin] = nil if options["path"] && options["path"].empty?
       installer              = Installer.new(Bundler.root, Bundler.definition)
       spec                   = installer.specs.find{|s| s.name == gem_name }
-      raise GemNotFound, not_found_message(name, Bundler.load.specs) unless spec
+      raise GemNotFound, not_found_message(gem_name, Bundler.load.specs) unless spec
 
       if spec.name == "bundler"
-        Bundler.ui.warn "Skipping bundler since can't bundle bundler."
+        Bundler.ui.warn "Sorry, Bundler can only be run via Rubygems."
       else
         installer.generate_bundler_executable_stubs(spec, :force => options[:force], :binstubs_cmd => true)
       end
@@ -626,6 +626,11 @@ module Bundler
     desc "gem GEM", "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, :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)"
+
     def gem(name)
       name = name.chomp("/") # remove trailing slash if present
       namespaced_path = name.tr('-', '/')
@@ -641,14 +646,16 @@ module Bundler
         :constant_name   => constant_name,
         :constant_array  => constant_array,
         :author          => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
-        :email           => git_user_email.empty? ? "TODO: Write your email address" : git_user_email
+        :email           => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
+        :test            => options[:test]
       }
+      gemspec_dest = File.join(target, "#{name}.gemspec")
       template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                             opts)
       template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),                            opts)
       template(File.join("newgem/LICENSE.txt.tt"),           File.join(target, "LICENSE.txt"),                         opts)
       template(File.join("newgem/README.md.tt"),             File.join(target, "README.md"),                           opts)
       template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),                          opts)
-      template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{name}.gemspec"),                     opts)
+      template(File.join("newgem/newgem.gemspec.tt"),        gemspec_dest,                                             opts)
       template(File.join("newgem/lib/newgem.rb.tt"),         File.join(target, "lib/#{namespaced_path}.rb"),           opts)
       template(File.join("newgem/lib/newgem/version.rb.tt"), File.join(target, "lib/#{namespaced_path}/version.rb"),   opts)
       if options[:bin]
@@ -665,6 +672,10 @@ module Bundler
       end
       Bundler.ui.info "Initializating git repo in #{target}"
       Dir.chdir(target) { `git init`; `git add .` }
+
+      if options[:edit]
+        run("#{options["edit"]} \"#{gemspec_dest}\"")  # Open gemspec in editor
+      end
     end
 
     def self.source_root
@@ -721,7 +732,7 @@ module Bundler
       Bundler.ui.info output.join("\n\n")
     end
 
-    desc "add GEM VERSION ...", "Add the named gem(s), with version requirements, to the resolved Gemfile"
+    desc "inject GEM VERSION ...", "Add the named gem(s), with version requirements, to the resolved Gemfile"
     def inject(name, version, *gems)
       # The required arguments allow Thor to give useful feedback when the arguments
       # are incorrect. This adds those first two arguments onto the list as a whole.
@@ -743,6 +754,11 @@ module Bundler
       end
     end
 
+    desc "env", "Print information about the environment Bundler is running under"
+    def env
+      Env.new.write($stdout)
+    end
+
   private
 
     def setup_cache_all

data/lib/bundler/env.rb

@@ -0,0 +1,56 @@
+module Bundler
+  class Env
+
+    def write(io)
+      io.write(report)
+    end
+
+    def report
+      out = "Bundler #{Bundler::VERSION}\n"
+
+      out << "Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}"
+      out << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
+      out << ") [#{RUBY_PLATFORM}]\n"
+
+      out << "Rubygems #{Gem::VERSION}\n"
+
+      out << "rvm #{ENV['rvm_version']}\n" if ENV['rvm_version']
+
+      out << "GEM_HOME #{ENV['GEM_HOME']}\n"
+
+      out << "GEM_PATH #{ENV['GEM_PATH']}\n" unless ENV['GEM_PATH'] == ENV['GEM_HOME']
+
+      %w(rubygems-bundler open_gem).each do |name|
+        specs = Gem::Specification.find_all{|s| s.name == name }
+        out << "#{name} (#{specs.map(&:version).join(',')})\n" unless specs.empty?
+      end
+
+      out << "\nBundler settings\n" unless Bundler.settings.all.empty?
+      Bundler.settings.all.each do |setting|
+        out << "  #{setting}\n"
+        Bundler.settings.pretty_values_for(setting).each do |line|
+          out << "    " << line << "\n"
+        end
+      end
+
+      out << "\n\n" << "Gemfile\n"
+      out << read_file("Gemfile") << "\n"
+
+      out << "\n\n" << "Gemfile.lock\n"
+      out << read_file("Gemfile.lock") << "\n"
+
+      out
+    end
+
+  private
+
+    def read_file(filename)
+      File.read(filename).strip
+    rescue Errno::ENOENT
+      "<No #{filename} found>"
+    rescue => e
+      "#{e.class}: #{e.message}"
+    end
+
+  end
+end

data/lib/bundler/installer.rb

@@ -127,28 +127,55 @@ module Bundler
     end
 
     def generate_bundler_executable_stubs(spec, options = {})
+      if spec.executables.empty?
+        options = {}
+        spec.dependencies.each do |dep|
+          bins = Bundler.definition.specs[dep].first.executables
+          options[dep.name] = bins unless bins.empty?
+        end
+        if options.any?
+          Bundler.ui.warn "#{spec.name} has no executables, but you may want " +
+            "one from a gem it depends on."
+          options.each{|name,bins| Bundler.ui.warn "  #{name} has: #{bins.join(', ')}" }
+        else
+          Bundler.ui.warn "There are no executables for the gem #{spec.name}."
+        end
+        return
+      end
+
       # double-assignment to avoid warnings about variables that will be used by ERB
       bin_path = bin_path = Bundler.bin_path
       template = template = File.read(File.expand_path('../templates/Executable', __FILE__))
       relative_gemfile_path = relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path)
       ruby_command = ruby_command = Thor::Util.ruby_command
 
+      exists = []
       spec.executables.each do |executable|
-        write        = true
-        binstub_path = "#{bin_path}/#{executable}"
         next if executable == "bundle"
-        if File.exists?(binstub_path) && !options[:force] && options[:binstubs_cmd]
-          write = false
-          Bundler.ui.warn <<-MSG
-            Skipping #{executable} since it already exists. Pass --force to overwrite.
-          MSG
+
+        binstub_path = "#{bin_path}/#{executable}"
+        if File.exists?(binstub_path) && !options[:force]
+          exists << executable
+          next
+        end
+
+        File.open(binstub_path, 'w', 0755) do |f|
+          f.puts ERB.new(template, nil, '-').result(binding)
         end
+      end
 
-        if write
-          File.open binstub_path, 'w', 0755 do |f|
-            f.puts ERB.new(template, nil, '-').result(binding)
-          end
+      if options[:binstubs_cmd] && !exists.empty?
+        case exists.size
+        when 1
+          Bundler.ui.warn "Skipped #{exists[0]} since it already exists."
+        when 2
+          Bundler.ui.warn "Skipped #{exists.join(' and ')} since they already exist."
+        else
+          items = exists[0...-1].empty? ? nil : exists[0...-1].join(', ')
+          skipped = [items, exists[-1]].compact.join(' and ')
+          Bundler.ui.warn "Skipped #{skipped} since they already exist."
         end
+        Bundler.ui.warn "If you want to overwrite skipped stubs, use --force."
       end
     end
 

data/lib/bundler/settings.rb

@@ -1,6 +1,6 @@
 module Bundler
   class Settings
-    def initialize(root)
+    def initialize(root = nil)
       @root          = root
       @local_config  = load_config(local_config_file)
       @global_config = load_config(global_config_file)
@@ -12,6 +12,7 @@ module Bundler
     end
 
     def []=(key, value)
+      local_config_file || raise(GemfileNotFound)
       set_key(key, value, @local_config, local_config_file)
     end
 
@@ -98,6 +99,10 @@ module Bundler
       !@local_config.key?(key_for(:path))
     end
 
+    def ignore_config?
+      ENV['BUNDLE_IGNORE_CONFIG']
+    end
+
   private
     def key_for(key)
       key = key.to_s.sub(".", "__").upcase
@@ -123,11 +128,12 @@ module Bundler
     end
 
     def local_config_file
-      Pathname.new("#{@root}/config")
+      Pathname.new(@root).join("config") if @root
     end
 
     def load_config(config_file)
-      if config_file.exist? && !config_file.size.zero?
+      valid_file = config_file && config_file.exist? && !config_file.size.zero?
+      if !ignore_config? && valid_file
         Hash[config_file.read.scan(/^(BUNDLE_.+): ['"]?(.+?)['"]?$/)]
       else
         {}

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -19,4 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
+<% if config[:test] -%>
+  gem.add_development_dependency "<%=config[:test]%>"
+<% end -%>
 end

data/lib/bundler/templates/newgem/rspec.tt

@@ -1,2 +1,2 @@
---format specdoc
+--format documentation
 --color

data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe <%= config[:constant_name] %> do
   it 'should have a version number' do
     <%= config[:constant_name] %>::VERSION.should_not be_nil

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.3.0.pre.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.3.0.pre.6" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -31,6 +31,9 @@ the local application. The configuration will be stored in `app/.bundle/config`.
 Executing `bundle config --delete <name>` will delete the configuration in both
 local and global sources.
 
+Executing bundle with the `BUNDLE_IGNORE_CONFIG` environment variable set will
+cause it to ignore all configuration.
+
 ## BUILD OPTIONS
 
 You can use `bundle config` to give bundler the flags to pass to the gem
@@ -127,4 +130,4 @@ accidental locking to a different branch.
 
 Finally, Bundler also ensures that the current revision in the
 `Gemfile.lock` exists in the local git repository. By doing this, Bundler
-forces you to fetch the latest changes in the remotes.
+forces you to fetch the latest changes in the remotes.

data/man/gemfile.5.ronn

@@ -23,7 +23,8 @@ might contain the gems listed in the `Gemfile`.
     source "http://rubygems.org"
     source "http://gems.github.com"
 
-Each of these _source_s `MUST` be a valid Rubygems repository.
+Each of these _source_s `MUST` be a valid Rubygems repository. Sources are
+checked for gems following the heuristics described in [SOURCE PRIORITY][].
 
 ## RUBY (#ruby)
 

data/spec/other/binstubs_spec.rb

@@ -34,7 +34,7 @@ describe "bundle binstubs <gem>" do
       bundle "binstubs bundler"
 
       expect(bundled_app("bin/bundle")).not_to exist
-      expect(out).to eq("Skipping bundler since can't bundle bundler.")
+      expect(out).to eq("Sorry, Bundler can only be run via Rubygems.")
     end
 
     it "install binstubs from git gems" do
@@ -110,7 +110,8 @@ describe "bundle binstubs <gem>" do
 
       expect(bundled_app("bin/rackup")).to exist
       expect(File.read(bundled_app("bin/rackup"))).to eq("OMG")
-      expect(out).to eq("Skipping rackup since it already exists. Pass --force to overwrite.")
+      expect(out).to include("Skipped rackup")
+      expect(out).to include("overwrite skipped stubs, use --force")
     end
 
     context "when using --force" do

data/spec/other/check_spec.rb

@@ -58,7 +58,7 @@ describe "bundle check" do
     G
 
     bundle :check
-    expect(out).to include("Your Gemfile's dependencies could not be satisfied")
+    expect(out).to include("Bundler can't satisfy your Gemfile's dependencies.")
   end
 
   it "prints a generic error if a Gemfile.lock does not exist and a toplevel dependency does not exist" do
@@ -69,7 +69,7 @@ describe "bundle check" do
 
     bundle :check, :exitstatus => true
     expect(@exitstatus).to be > 0
-    expect(out).to include("could not be satisfied")
+    expect(out).to include("Bundler can't satisfy your Gemfile's dependencies.")
   end
 
   it "prints a generic message if you changed your lockfile" do
@@ -89,7 +89,7 @@ describe "bundle check" do
     G
 
     bundle :check
-    expect(out).to include("Your Gemfile's dependencies could not be satisfied")
+    expect(out).to include("Bundler can't satisfy your Gemfile's dependencies.")
   end
 
   it "remembers --without option from install" do

data/spec/other/help_spec.rb

@@ -7,8 +7,8 @@ describe "bundle help" do
     system_gems "bundler-0.8.1"
 
     bundle "help", :expect_err => true
-    expect(err).to include("Please remove Bundler 0.8 versions.")
-    expect(err).to include("This can be done by running `gem cleanup bundler`.")
+    expect(err).to include("older than 0.9")
+    expect(err).to include("running `gem cleanup bundler`.")
   end
 
   it "uses groff when available" do

data/spec/other/newgem_spec.rb

@@ -179,6 +179,16 @@ RAKEFILE
         expect(bundled_app("test_gem/test/minitest_helper.rb")).to_not exist
       end
     end
+
+    context "--edit option" do
+      it "opens the generated gemspec in the user's text editor" do
+        reset!
+        in_app_root
+        output = bundle "gem #{gem_name} --edit=echo"
+        gemspec_path = File.join(Dir.pwd, gem_name, "#{gem_name}.gemspec")
+        expect(output).to include("echo \"#{gemspec_path}\"")
+      end
+    end
   end
 
   context "gem naming with dashed" do

data/spec/runtime/executable_spec.rb

@@ -130,7 +130,7 @@ describe "Running bin/* commands" do
     expect(bundled_app("bin/rackup")).to exist
   end
 
-  it "always reinstalls the binstub" do
+  it "doesn't overwrite on --binstub" do
     gemfile <<-G
       source "file://#{gem_repo1}"
       gem "rack"
@@ -144,6 +144,6 @@ describe "Running bin/* commands" do
 
     bundle "install"
 
-    expect(File.read(bundled_app("bin/rackup"))).not_to eq("OMG")
+    expect(bundled_app("bin/rackup").read).to eq("OMG")
   end
 end

data/spec/support/builders.rb

@@ -514,11 +514,8 @@ module Spec
     end
 
     class GitUpdater < LibBuilder
-      WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
-      NULL    = WINDOWS ? "NUL" : "/dev/null"
-
       def silently(str)
-        `#{str} 2>#{NULL}`
+        `#{str} 2>#{Bundler::NULL}`
       end
 
       def _build(options)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: -3803691018
-  prerelease: 6
+  prerelease: true
   segments: 
   - 1
   - 3
   - 0
   - pre
-  - 5
-  version: 1.3.0.pre.5
+  - 6
+  version: 1.3.0.pre.6
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -20,17 +19,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-10 00:00:00 Z
+date: 2013-01-22 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,11 +38,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
         - 11
@@ -85,6 +81,7 @@ files:
 - lib/bundler/deprecate.rb
 - lib/bundler/dsl.rb
 - lib/bundler/endpoint_specification.rb
+- lib/bundler/env.rb
 - lib/bundler/environment.rb
 - lib/bundler/fetcher.rb
 - lib/bundler/friendly_errors.rb
@@ -269,22 +266,23 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle-exec
 - lib/bundler/man/bundle
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-exec
+- lib/bundler/man/bundle-exec.txt
 - lib/bundler/man/bundle-install
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-install.txt
 - lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-platform.txt
 - lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-platform.txt
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
+has_rdoc: true
 homepage: http://gembundler.com
 licenses: 
 - MIT
@@ -294,22 +292,18 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -318,9 +312,94 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: []
-
+test_files: 
+- spec/bundler/bundler_spec.rb
+- spec/bundler/cli_rspec.rb
+- spec/bundler/definition_spec.rb
+- spec/bundler/dsl_spec.rb
+- spec/bundler/gem_helper_spec.rb
+- spec/bundler/psyched_yaml_spec.rb
+- spec/bundler/source_spec.rb
+- spec/cache/gems_spec.rb
+- spec/cache/git_spec.rb
+- spec/cache/path_spec.rb
+- spec/cache/platform_spec.rb
+- spec/install/deploy_spec.rb
+- spec/install/gems/c_ext_spec.rb
+- spec/install/gems/dependency_api_spec.rb
+- spec/install/gems/env_spec.rb
+- spec/install/gems/flex_spec.rb
+- spec/install/gems/groups_spec.rb
+- spec/install/gems/packed_spec.rb
+- spec/install/gems/platform_spec.rb
+- spec/install/gems/post_install_spec.rb
+- spec/install/gems/resolving_spec.rb
+- spec/install/gems/simple_case_spec.rb
+- spec/install/gems/standalone_spec.rb
+- spec/install/gems/sudo_spec.rb
+- spec/install/gems/win32_spec.rb
+- spec/install/gemspec_spec.rb
+- spec/install/git_spec.rb
+- spec/install/invalid_spec.rb
+- spec/install/path_spec.rb
+- spec/install/upgrade_spec.rb
+- spec/integration/inject.rb
+- spec/lock/git_spec.rb
+- spec/lock/lockfile_spec.rb
+- spec/other/binstubs_spec.rb
+- spec/other/bundle_ruby_spec.rb
+- spec/other/check_spec.rb
+- spec/other/clean_spec.rb
+- spec/other/config_spec.rb
+- spec/other/console_spec.rb
+- spec/other/exec_spec.rb
+- spec/other/ext_spec.rb
+- spec/other/help_spec.rb
+- spec/other/init_spec.rb
+- spec/other/newgem_spec.rb
+- spec/other/open_spec.rb
+- spec/other/outdated_spec.rb
+- spec/other/platform_spec.rb
+- spec/other/show_spec.rb
+- spec/quality_spec.rb
+- spec/realworld/dependency_api_spec.rb
+- spec/realworld/edgecases_spec.rb
+- spec/resolver/basic_spec.rb
+- spec/resolver/platform_spec.rb
+- spec/runtime/executable_spec.rb
+- spec/runtime/load_spec.rb
+- spec/runtime/platform_spec.rb
+- spec/runtime/require_spec.rb
+- spec/runtime/setup_spec.rb
+- spec/runtime/with_clean_env_spec.rb
+- spec/spec_helper.rb
+- spec/support/artifice/endopint_marshal_fail_basic_authentication.rb
+- spec/support/artifice/endpoint.rb
+- spec/support/artifice/endpoint_500.rb
+- spec/support/artifice/endpoint_api_missing.rb
+- spec/support/artifice/endpoint_basic_authentication.rb
+- spec/support/artifice/endpoint_extra.rb
+- spec/support/artifice/endpoint_extra_missing.rb
+- spec/support/artifice/endpoint_fallback.rb
+- spec/support/artifice/endpoint_marshal_fail.rb
+- spec/support/artifice/endpoint_redirect.rb
+- spec/support/artifice/endpoint_timeout.rb
+- spec/support/builders.rb
+- spec/support/fakeweb/rack-1.0.0.marshal
+- spec/support/fakeweb/windows.rb
+- spec/support/helpers.rb
+- spec/support/indexes.rb
+- spec/support/matchers.rb
+- spec/support/path.rb
+- spec/support/platforms.rb
+- spec/support/ruby_ext.rb
+- spec/support/rubygems_ext.rb
+- spec/support/rubygems_hax/platform.rb
+- spec/support/sudo.rb
+- spec/update/gems_spec.rb
+- spec/update/git_spec.rb
+- spec/update/source_spec.rb