bundler 1.1.pre.10 → 1.1.rc

data/lib/bundler/rubygems_ext.rb

@@ -7,6 +7,7 @@ end
 
 require 'rubygems'
 require 'rubygems/specification'
+require 'bundler/match_platform'
 
 module Gem
   @loaded_stacks = Hash.new { |h,k| h[k] = [] }
@@ -143,79 +144,10 @@ module Gem
 
     alias eql? ==
   end
-
-end
-
-module Bundler
-  class DepProxy
-
-    attr_reader :required_by, :__platform, :dep
-
-    def initialize(dep, platform)
-      @dep, @__platform, @required_by = dep, platform, []
-    end
-
-    def hash
-      @hash ||= dep.hash
-    end
-
-    def ==(o)
-      dep == o.dep && __platform == o.__platform
-    end
-
-    alias eql? ==
-
-    def type
-      @dep.type
-    end
-
-    def to_s
-      "#{name} (#{requirement}) #{__platform}"
-    end
-
-  private
-
-    def method_missing(*args)
-      @dep.send(*args)
-    end
-
-  end
-
-  module GemHelpers
-
-    GENERIC_CACHE = {}
-    GENERICS = [
-      Gem::Platform::JAVA,
-      Gem::Platform::MSWIN,
-      Gem::Platform::MINGW,
-      Gem::Platform::RUBY
-    ]
-
-    def generic(p)
-      return p if p == Gem::Platform::RUBY
-
-      GENERIC_CACHE[p] ||= begin
-        found = GENERICS.find do |p2|
-          p2.is_a?(Gem::Platform) && p.os == p2.os
-        end
-        found || Gem::Platform::RUBY
-      end
-    end
-  end
-
-  module MatchPlatform
-    include GemHelpers
-
-    def match_platform(p)
-      Gem::Platform::RUBY == platform or
-      platform.nil? or p == platform or
-      generic(Gem::Platform.new(platform)) == p
-    end
-  end
 end
 
 module Gem
   class Specification
-    include Bundler::MatchPlatform
+    include ::Bundler::MatchPlatform
   end
 end

data/lib/bundler/templates/Executable

@@ -1,4 +1,4 @@
-#!/usr/bin/env <%= RbConfig::CONFIG['ruby_install_name'] %>
+#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG['ruby_install_name'] %>
 #
 # This file was generated by Bundler.
 #

data/lib/bundler/ui.rb

@@ -17,7 +17,7 @@ module Bundler
     def confirm(message, newline = nil)
     end
 
-    def debugging?
+    def debug?
       false
     end
 
@@ -50,8 +50,9 @@ module Bundler
         @quiet = true
       end
 
-      def debugging?
-        @debug && !@quiet
+      def debug?
+        # needs to be false instead of nil to be newline param to other methods
+        !!@debug && !@quiet
       end
 
       def debug!
@@ -59,7 +60,7 @@ module Bundler
       end
 
       def debug(msg, newline = nil)
-        tell_me(msg, nil, newline) if debugging?
+        tell_me(msg, nil, newline) if debug?
       end
 
       private

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.10" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.rc" unless defined?(::Bundler::VERSION)
 end

data/man/gemfile.5.ronn

@@ -45,19 +45,19 @@ Each _gem_ `MAY` have one or more version specifiers.
 
 ### REQUIRE AS (:require)
 
-Each _gem_ `MAY` specify its main file, which should be used when autorequiring
-(`Bundler.require`).
+Each _gem_ `MAY` specify files that should be used when autorequiring via
+`Bundler.require`. You may pass an array with multiple files, or `false` to
+prevent any file from being autorequired.
 
     gem "sqlite3-ruby", :require => "sqlite3"
+    gem "redis", :require => ["redis/connection/hiredis", "redis"]
+    gem "webmock", :require => false
 
-This defaults to the name of the gem itself. For instance, these are identical:
+The argument defaults to the name of the gem. For example, these are identical:
 
     gem "nokogiri"
     gem "nokogiri", :require => "nokogiri"
 
-Specify `:require => false` to prevent bundler from requiring the gem, but still
-install it and maintain dependencies.
-
 ### GROUPS (:group or :groups)
 
 Each _gem_ `MAY` specify membership in one or more groups. Any _gem_ that does

data/spec/install/gems/dependency_api_spec.rb

@@ -10,7 +10,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Fetching dependency information from the API at #{source_uri}")
+    out.should include("Fetching gem metadata from #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
@@ -21,7 +21,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Fetching dependency information from the API at #{source_uri}/...")
+    out.should include("Fetching gem metadata from #{source_uri}/...")
     should_be_installed(
       "rails 2.3.2",
       "actionpack 2.3.2",
@@ -49,22 +49,7 @@ describe "gemcutter's dependency API" do
     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}")
+    out.should include("Fetching gem metadata from #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
@@ -113,7 +98,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :fakeweb => "windows"
-    out.should include("\nError using the API\nFetching source index for #{source_uri}")
+    out.should include("\nFetching full source index from #{source_uri}")
     should_be_installed "rcov 1.0.0"
   end
 
@@ -129,7 +114,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}")
+    out.should include("\nFetching full source index from #{source_uri}")
 
     should_be_installed(
       "activesupport 2.3.2",
@@ -149,7 +134,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint_marshal_fail"
-    out.should include("\nError using the API\nFetching source index for #{source_uri}")
+    out.should include("\nFetching full source index from #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
@@ -170,7 +155,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle "install --full-index", :artifice => "endpoint"
-    out.should include("Fetching source index for #{source_uri}")
+    out.should include("Fetching source index from #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
@@ -192,6 +177,29 @@ describe "gemcutter's dependency API" do
     should_be_installed "back_deps 1.0"
   end
 
+  it "prints API output properly with back deps" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra"
+
+    output = <<OUTPUT
+Fetching gem metadata from http://localgemserver.test/..
+Fetching gem metadata from http://localgemserver.test/extra/.
+OUTPUT
+    out.should include(output)
+  end
+
   it "does not fetch every specs if the index of gems is large when doing back deps" do
     build_repo2 do
       build_gem "back_deps" do |s|
@@ -255,7 +263,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint"
-    out.scan(/Fetching dependency information from the API/).size.should == 1
+    out.should include("Fetching gem metadata from #{source_uri}")
   end
 
   it "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
@@ -281,4 +289,70 @@ describe "gemcutter's dependency API" do
     gembin "rackup"
     out.should == "1.0.0"
   end
+
+  it "installs the bins when using --path and uses autoclean" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --path vendor/bundle", :artifice => "endpoint"
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "installs the bins when using --path and uses bundle clean" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --path vendor/bundle --no-clean", :artifice => "endpoint"
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  context "when using basic authentication" do
+    let(:user)     { "user" }
+    let(:password) { "pass" }
+    let(:basic_auth_source_uri) do
+      uri          = URI.parse(source_uri)
+      uri.user     = user
+      uri.password = password
+
+      uri
+    end
+
+    it "passes basic authentication details and strips out creds" do
+      gemfile <<-G
+        source "#{basic_auth_source_uri}"
+        gem "rack"
+      G
+
+      bundle :install, :artifice => "endpoint_basic_authentication"
+      out.should_not include("#{user}:#{password}")
+      should_be_installed "rack 1.0.0"
+    end
+
+    it "strips http basic authentication creds for modern index" do
+      gemfile <<-G
+        source "#{basic_auth_source_uri}"
+        gem "rack"
+      G
+
+      bundle :install, :artifice => "endopint_marshal_fail_basic_authentication"
+      out.should_not include("#{user}:#{password}")
+      should_be_installed "rack 1.0.0"
+    end
+
+    it "strips http basic auth creds when it can't reach the server" do
+      gemfile <<-G
+        source "#{basic_auth_source_uri}"
+        gem "rack"
+      G
+
+      bundle :install, :artifice => "endpoint_500"
+      out.should_not include("#{user}:#{password}")
+    end
+  end
 end

data/spec/install/gems/flex_spec.rb

@@ -193,7 +193,7 @@ describe "bundle flex_install" do
 
     it "suggests bundle update when the Gemfile requires different versions than the lock" do
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index for file:#{gem_repo2}/
+        Fetching source index from file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "rack":
           In snapshot (Gemfile.lock):
             rack (0.9.1)

data/spec/install/gems/groups_spec.rb

@@ -21,16 +21,23 @@ describe "bundle install with gem sources" do
       it "installs gems in a group block into that group" do
         should_be_installed "activesupport 2.3.5"
 
-        run("require 'activesupport'; puts ACTIVESUPPORT",
-          :default, :expect_err => true)
-        @err.should =~ /no such file to load -- activesupport/
+        load_error_run <<-R, 'activesupport', :default
+          require 'activesupport'
+          puts ACTIVESUPPORT
+        R
+
+        err.should == "ZOMG LOAD ERROR"
       end
 
       it "installs gems with inline :groups into those groups" do
         should_be_installed "thin 1.0"
 
-        run("require 'thin'; puts THIN", :default, :expect_err => true)
-        @err.should =~ /no such file to load -- thin/
+        load_error_run <<-R, 'thin', :default
+          require 'thin'
+          puts THIN
+        R
+
+        err.should == "ZOMG LOAD ERROR"
       end
 
       it "sets up everything if Bundler.setup is used with no groups" do
@@ -45,11 +52,13 @@ describe "bundle install with gem sources" do
       end
 
       it "removes old groups when new groups are set up" do
-        run <<-RUBY, :emo, :expect_err => true
+        load_error_run <<-RUBY, 'thin', :emo
           Bundler.setup(:default)
-          require 'thin'; puts THIN
+          require 'thin'
+          puts THIN
         RUBY
-        @err.should =~ /no such file to load -- thin/i
+
+        err.should == "ZOMG LOAD ERROR"
       end
 
       it "sets up old groups when they have previously been removed" do

data/spec/install/gems/simple_case_spec.rb

@@ -610,7 +610,7 @@ describe "bundle install with gem sources" do
       G
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index for file:#{gem_repo2}/
+        Fetching source index from file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
             bundler (= 0.9.2) ruby
@@ -667,7 +667,7 @@ describe "bundle install with gem sources" do
       G
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index for file:#{gem_repo2}/
+        Fetching source index from file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             activemerchant (>= 0) ruby depends on
@@ -687,7 +687,7 @@ describe "bundle install with gem sources" do
       G
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index for file:#{gem_repo2}/
+        Fetching source index from file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             rails_fail (>= 0) ruby depends on

data/spec/install/gems/standalone_spec.rb

@@ -113,7 +113,7 @@ describe "bundle install --standalone" do
     it "allows creating a standalone file with limited groups" do
       bundle "install --standalone default"
 
-      ruby <<-RUBY, :no_lib => true, :expect_err => true
+      load_error_ruby <<-RUBY, 'spec', :no_lib => true
         $:.unshift File.expand_path("bundle")
         require "bundler/setup"
 
@@ -123,13 +123,13 @@ describe "bundle install --standalone" do
       RUBY
 
       out.should be == "2.3.2"
-      err.should =~ /no such file to load.*spec/
+      err.should == "ZOMG LOAD ERROR"
     end
 
     it "allows --without to limit the groups used in a standalone" do
       bundle "install --standalone --without test"
 
-      ruby <<-RUBY, :no_lib => true, :expect_err => true
+      load_error_ruby <<-RUBY, 'spec', :no_lib => true
         $:.unshift File.expand_path("bundle")
         require "bundler/setup"
 
@@ -139,7 +139,7 @@ describe "bundle install --standalone" do
       RUBY
 
       out.should be == "2.3.2"
-      err.should =~ /no such file to load.*spec/
+      err.should == "ZOMG LOAD ERROR"
     end
 
     it "allows --path to change the location of the standalone bundle" do
@@ -160,7 +160,7 @@ describe "bundle install --standalone" do
       bundle "install --without test"
       bundle "install --standalone"
 
-      ruby <<-RUBY, :no_lib => true, :expect_err => true
+      load_error_ruby <<-RUBY, 'spec', :no_lib => true
         $:.unshift File.expand_path("bundle")
         require "bundler/setup"
 
@@ -170,7 +170,7 @@ describe "bundle install --standalone" do
       RUBY
 
       out.should be == "2.3.2"
-      err.should =~ /no such file to load.*spec/
+      err.should == "ZOMG LOAD ERROR"
     end
   end