bundler 1.1.pre.4 → 1.1.pre.5

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

@@ -1,21 +1,17 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "<%=config[:name]%>/version"
+require File.expand_path('../lib/<%=config[:name]%>/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name        = <%=config[:name].inspect%>
-  s.version     = <%=config[:constant_name]%>::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = [<%=config[:author].inspect%>]
-  s.email       = [<%=config[:email].inspect%>]
-  s.homepage    = ""
-  s.summary     = %q{TODO: Write a gem summary}
-  s.description = %q{TODO: Write a gem description}
+Gem::Specification.new do |gem|
+  gem.authors       = [<%=config[:author].inspect%>]
+  gem.email         = [<%=config[:email].inspect%>]
+  gem.description   = %q{TODO: Write a gem description}
+  gem.summary       = %q{TODO: Write a gem summary}
+  gem.homepage      = ''
 
-  s.rubyforge_project = <%=config[:name].inspect%>
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = <%=config[:name].inspect%>
+  gem.require_paths = ['lib']
+  gem.version       = <%=config[:constant_name]%>::VERSION
 end

data/lib/bundler/ui.rb

@@ -2,19 +2,23 @@ require 'rubygems/user_interaction'
 
 module Bundler
   class UI
-    def warn(message)
+    def warn(message, newline = nil)
     end
 
-    def debug(message)
+    def debug(message, newline = nil)
     end
 
-    def error(message)
+    def error(message, newline = nil)
     end
 
-    def info(message)
+    def info(message, newline = nil)
     end
 
-    def confirm(message)
+    def confirm(message, newline = nil)
+    end
+
+    def debugging?
+      false
     end
 
     class Shell < UI
@@ -26,24 +30,28 @@ module Bundler
         @debug = ENV['DEBUG']
       end
 
-      def debug(msg)
-        @shell.say(msg) if @debug && !@quiet
+      def debug(msg, newline = nil)
+        tell_me(msg, nil, newline) if debugging?
+      end
+
+      def debugging?
+        @debug && !@quiet
       end
 
-      def info(msg)
-        @shell.say(msg) if !@quiet
+      def info(msg, newline = nil)
+        tell_me(msg, nil, newline) if !@quiet
       end
 
-      def confirm(msg)
-        @shell.say(msg, :green) if !@quiet
+      def confirm(msg, newline = nil)
+        tell_me(msg, :green, newline) if !@quiet
       end
 
-      def warn(msg)
-        @shell.say(msg, :yellow)
+      def warn(msg, newline = nil)
+        tell_me(msg, :yellow, newline)
       end
 
-      def error(msg)
-        @shell.say(msg, :red)
+      def error(msg, newline = nil)
+        tell_me(msg, :red, newline)
       end
 
       def be_quiet!
@@ -53,6 +61,12 @@ module Bundler
       def debug!
         @debug = true
       end
+
+      private
+      # valimism
+      def tell_me(msg, color = nil, newline = nil)
+        newline.nil? ? @shell.say(msg) : @shell.say(msg, nil, newline)
+      end
     end
 
     class RGProxy < ::Gem::SilentUI

data/lib/bundler/vendor/net/http/persistent.rb

@@ -348,6 +348,10 @@ class Net::HTTP::Persistent
       req.add_field(*pair)
     end
 
+    if uri.user or uri.password
+      req.basic_auth uri.user, uri.password
+    end
+
     req.add_field 'Connection', 'keep-alive'
     req.add_field 'Keep-Alive', @keep_alive
 

data/lib/bundler/vendored_thor.rb

@@ -0,0 +1,7 @@
+if defined?(Thor)
+  Bundler.ui.warn "Thor has already been required. " +
+    "This may cause Bundler to malfunction in unexpected ways."
+end
+$:.unshift File.expand_path('../vendor', __FILE__)
+require 'thor'
+require 'thor/actions'

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.1.pre.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.pre.5" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -8,6 +8,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--without=GROUP1[ GROUP2...]]
                  [--local] [--deployment]
                  [--binstubs[=DIRECTORY]]
+                 [--standalone[=GROUP1[ GROUP2...]]]
                  [--quiet]
 
 ## DESCRIPTION
@@ -69,6 +70,12 @@ update process below under [CONSERVATIVE UPDATING][].
   a `bin/rails` executable that ensures that all dependencies used
   come from the bundled gems.
 
+* `--standalone[=<list>]`:
+  Make a bundle that can work without Ruby Gems or Bundler at runtime.
+  It takes a space separated list of groups to install. It creates a
+  `bundle` directory and installs the bundle there. It also generates
+  a `bundle/bundler/setup.rb` file to replace Bundler's own setup.
+
 ## DEPLOYMENT MODE
 
 Bundler's defaults are optimized for development. To switch to

data/man/bundle.ronn

@@ -66,6 +66,12 @@ We divide `bundle` subcommands into primary commands and utilities.
 
 * `bundle viz(1)`:
   Generate a visual representation of your dependencies
+<<<<<<< HEAD
+
+* `bundle benchmark(1)`:
+  Display the time taken for each each gem to be loaded into the environment
+=======
+>>>>>>> parent of e547c86... Add documentation for the benchmark CLI utility
 
 * `bundle init(1)`:
   Generate a simple `Gemfile`, placed in the current directory

data/man/gemfile.5.ronn

@@ -120,6 +120,8 @@ There are a number of `Gemfile` platforms:
     _mri_ `AND` version 1.8
   * `mri_19`:
     _mri_ `AND` version 1.9
+  * `rbx`:
+    Same as _ruby_, but only Rubinius (not MRI)
   * `jruby`:
     JRuby
   * `mswin`:

data/spec/cache/gems_spec.rb

@@ -214,6 +214,17 @@ describe "bundle cache" do
       bundle "install"
       out.should_not =~ /removing/i
     end
+
+    it "should install gems with the name bundler in them (that aren't bundler)" do
+      build_gem "foo-bundler", "1.0",
+        :path => bundled_app('vendor/cache')
+
+      install_gemfile <<-G
+        gem "foo-bundler"
+      G
+
+      should_be_installed "foo-bundler 1.0"
+    end
   end
 
 end

data/spec/install/deploy_spec.rb

@@ -21,7 +21,7 @@ describe "install with --deployment or --frozen" do
   it "works after you try to deploy without a lock" do
     bundle "install --deployment"
     bundle :install, :exitstatus => true
-    check exitstatus.should == 0
+    exitstatus.should eq(0)
     should_be_installed "rack 1.0"
   end
 

data/spec/install/gems/dependency_api_spec.rb

@@ -1,23 +1,27 @@
 require "spec_helper"
 
 describe "gemcutter's dependency API" do
+  let(:source_uri) { "http://localgemserver.test" }
+
   it "should use the API" do
     gemfile <<-G
-      source "http://localgemserver.test"
+      source "#{source_uri}"
       gem "rack"
     G
 
     bundle :install, :artifice => "endpoint"
+    out.should include("Fetching dependency information from the API at #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
   it "should handle nested dependencies" do
     gemfile <<-G
-      source "http://localgemserver.test"
+      source "#{source_uri}"
       gem "rails"
     G
 
     bundle :install, :artifice => "endpoint"
+    out.should include("Fetching dependency information from the API at #{source_uri}/...")
     should_be_installed(
       "rails 2.3.2",
       "actionpack 2.3.2",
@@ -27,21 +31,59 @@ describe "gemcutter's dependency API" do
       "activesupport 2.3.2")
   end
 
+  it "should handle multiple gem dependencies on the same gem" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "net-sftp"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    should_be_installed "net-sftp 1.1.1"
+  end
+
+  it "should use the endpoint when using --deployment" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+    bundle :install, :artifice => "endpoint"
+
+    bundle "install --deployment", :artifice => "endpoint"
+    out.should include("Fetching dependency information from the API at #{source_uri}")
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "passes basic authentication details" do
+    uri = URI.parse(source_uri)
+    uri.user = "hello"
+    uri.password = "there"
+
+    gemfile <<-G
+      source "#{uri}"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint_basic_authentication"
+    out.should include("Fetching dependency information from the API at #{uri}")
+    should_be_installed "rack 1.0.0"
+  end
+
   it "falls back when the API errors out" do
     simulate_platform mswin
 
     gemfile <<-G
-      source "http://localgemserver.test/"
+      source "#{source_uri}"
       gem "rcov"
     G
 
     bundle :install, :fakeweb => "windows"
+    out.should include("\nError using the API\nFetching source index for #{source_uri}")
     should_be_installed "rcov 1.0.0"
   end
 
   it "falls back when hitting the Gemcutter Dependency Limit" do
     gemfile <<-G
-      source "http://localgemserver.test"
+      source "#{source_uri}"
       gem "activesupport"
       gem "actionpack"
       gem "actionmailer"
@@ -51,6 +93,7 @@ describe "gemcutter's dependency API" do
       gem "rails"
     G
     bundle :install, :artifice => "endpoint_fallback"
+    out.should include("\nError using the API\nFetching source index for #{source_uri}")
 
     should_be_installed(
       "activesupport 2.3.2",
@@ -65,21 +108,33 @@ describe "gemcutter's dependency API" do
 
   it "falls back when Gemcutter API doesn't return proper Marshal format" do
     gemfile <<-G
-      source "http://localgemserver.test"
+      source "#{source_uri}"
       gem "rack"
     G
 
     bundle :install, :artifice => "endpoint_marshal_fail"
+    out.should include("\nError using the API\nFetching source index for #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
-  it "timeouts when Bundler::Fetcher redirects to much" do
+  it "timeouts when Bundler::Fetcher redirects too much" do
     gemfile <<-G
-      source "http://localgemserver.test"
+      source "#{source_uri}"
       gem "rack"
     G
 
     bundle :install, :artifice => "endpoint_redirect"
     out.should match(/Too many redirects/)
   end
+
+  it "should use the modern index when the --full-index" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --full-index", :artifice => "endpoint"
+    out.should include("Fetching source index for #{source_uri}")
+    should_be_installed "rack 1.0.0"
+  end
 end

data/spec/install/gems/groups_spec.rb

@@ -35,13 +35,13 @@ describe "bundle install with gem sources" do
 
       it "sets up everything if Bundler.setup is used with no groups" do
         out = run("require 'rack'; puts RACK")
-        check out.should == '1.0.0'
+        out.should eq('1.0.0')
 
         out = run("require 'activesupport'; puts ACTIVESUPPORT")
-        check out.should == '2.3.5'
+        out.should eq('2.3.5')
 
         out = run("require 'thin'; puts THIN")
-        out.should == '1.0'
+        out.should eq('1.0')
       end
 
       it "removes old groups when new groups are set up" do

data/spec/install/gems/post_install_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe 'bundle install with gem sources' do
+  describe 'when gems include post install messages' do
+    it "should display the post-install messages after installing" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'rack'
+        gem 'thin'
+        gem 'rack-obama'
+      G
+
+      bundle :install
+      out.should include("Post-install message from rack:")
+      out.should include("Rack's post install message")
+      out.should include("Post-install message from thin:")
+      out.should include("Thin's post install message")
+      out.should include("Post-install message from rack-obama:")
+      out.should include("Rack-obama's post install message")
+    end
+  end
+
+  describe 'when gems do not include post install messages' do
+    it "should not display any post-install messages" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "activesupport"
+      G
+
+      bundle :install
+      out.should_not include("Post-install message")
+    end
+  end
+
+  describe "when a dependecy includes a post install message" do
+    it "should display the post install message" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'rack_middleware'
+      G
+
+      bundle :install
+      out.should include("Post-install message from rack:")
+      out.should include("Rack's post install message")
+    end
+  end
+end

data/spec/install/gems/sudo_spec.rb

@@ -10,10 +10,11 @@ describe "when using sudo", :sudo => true do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack", '1.0'
+        gem "thin"
       G
 
       system_gem_path("gems/rack-1.0.0").should exist
-      check system_gem_path("gems/rack-1.0.0").stat.uid.should == 0
+      system_gem_path("gems/rack-1.0.0").stat.uid.should eq(0)
       should_be_installed "rack 1.0"
     end
 
@@ -29,7 +30,7 @@ describe "when using sudo", :sudo => true do
       G
 
       bundle_path.join("gems/rack-1.0.0").should exist
-      check bundle_path.join("gems/rack-1.0.0").stat.uid.should == 0
+      bundle_path.join("gems/rack-1.0.0").stat.uid.should eq(0)
       should_be_installed "rack 1.0"
     end
 

data/spec/install/git_spec.rb

@@ -145,7 +145,7 @@ describe "bundle install with git sources" do
           gem "foo"
         end
       G
-      check err.should == ""
+      err.should eq("")
 
       run <<-RUBY
         require 'foo'
@@ -351,7 +351,6 @@ describe "bundle install with git sources" do
     out.should include("Git error:")
     err.should include("fatal")
     err.should include("omgomg")
-    err.should include("fatal: The remote end hung up unexpectedly")
   end
 
   it "works when the gem path has spaces in it" do