bundler 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.2.1
+
+Bugfixes:
+
+  - `bundle clean` now works with BUNDLE_WITHOUT groups again
+  - have a net/http read timeout around the Gemcutter API Endpoint
+
 ## 1.2.0 (Aug 30, 2012)
 
 Bugfixes:

data/ISSUES.md

@@ -4,7 +4,7 @@ So! You're having problems with Bundler. This file is here to help. If you're ru
 
 ## Documentation
 
-Instructions for common Bundler uses can be found on the [Bundler documentation site](http://gembundler.com/v1.1/).
+Instructions for common Bundler uses can be found on the [Bundler documentation site](http://gembundler.com/).
 
 Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html).
 

data/lib/bundler/definition.rb

@@ -30,7 +30,7 @@ module Bundler
       specs, then we can try to resolve locally.
 =end
 
-    def initialize(lockfile, dependencies, sources, unlock, ruby_version = "")
+    def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil)
       @unlocking = unlock == true || !unlock.empty?
 
       @dependencies, @sources, @unlock = dependencies, sources, unlock
@@ -108,9 +108,9 @@ module Bundler
       specs
     end
 
-    def specs(deps = requested_dependencies)
+    def specs
       @specs ||= begin
-        specs = resolve.materialize(deps)
+        specs = resolve.materialize(requested_dependencies)
 
         unless specs["bundler"].any?
           local = Bundler.settings[:frozen] ? rubygems_index : index
@@ -130,10 +130,6 @@ module Bundler
       @locked_specs - specs
     end
 
-    def all_specs
-      specs(dependencies)
-    end
-
     def new_platform?
       @new_platform
     end

data/lib/bundler/fetcher.rb

@@ -5,6 +5,8 @@ module Bundler
   # Handles all the fetching with the rubygems server
   class Fetcher
     REDIRECT_LIMIT = 5
+    # how long to wait for each gemcutter API call
+    API_TIMEOUT    = 10
 
     attr_reader :has_api
 
@@ -44,6 +46,7 @@ module Bundler
       @remote_uri = remote_uri
       @has_api    = true # will be set to false if the rubygems index is ever fetched
       @@connection ||= Net::HTTP::Persistent.new nil, :ENV
+      @@connection.read_timeout = API_TIMEOUT
     end
 
     # fetch a gem specification
@@ -142,6 +145,7 @@ module Bundler
 
       begin
         Bundler.ui.debug "Fetching from: #{uri}"
+        response = nil
         response = @@connection.request(uri)
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              SocketError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,

data/lib/bundler/runtime.rb

@@ -123,12 +123,12 @@ module Bundler
       gemspec_files        = Dir["#{Gem.dir}/specifications/*.gemspec"]
       spec_gem_paths       = []
       # need to keep git sources around
-      spec_git_paths       = []
+      spec_git_paths       = @definition.sources.select {|s| s.is_a?(Bundler::Source::Git) }.map {|s| s.path.to_s }
       spec_git_cache_dirs  = []
       spec_gem_executables = []
       spec_cache_paths     = []
       spec_gemspec_paths   = []
-      @definition.all_specs.each do |spec|
+      specs.each do |spec|
         spec_gem_paths << spec.full_gem_path
         # need to check here in case gems are nested like for the rails git repo
         md = %r{(.+bundler/gems/.+-[a-f0-9]{7,12})}.match(spec.full_gem_path)

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

data/spec/install/gems/dependency_api_spec.rb

@@ -158,6 +158,50 @@ describe "gemcutter's dependency API" do
     out.should match(/Too many redirects/)
   end
 
+  context "when Gemcutter API takes too long to respond" do
+    let(:port)       { 2000 }
+    let(:server_uri) { "http://localhost:2000" }
+
+    before do
+      # need to hack, so we can require rack
+      old_gem_home = ENV['GEM_HOME']
+      ENV['GEM_HOME'] = Spec::Path.base_system_gems.to_s
+      require 'rack'
+      ENV['GEM_HOME'] = old_gem_home
+
+      require File.expand_path('../../../support/artifice/endpoint_timeout', __FILE__)
+      require 'thread'
+      @t = Thread.new {
+        server = Rack::Server.start(:app       => EndpointTimeout,
+                                    :Host      => '0.0.0.0',
+                                    :Port      => port,
+                                    :server    => 'webrick',
+                                    :AccessLog => [])
+        server.start
+      }
+      @t.run
+
+      # ensure server is started
+      require 'timeout'
+      Timeout.timeout(15) { sleep(0.1) until @t.status == "sleep" }
+    end
+
+    after do
+      @t.kill
+    end
+
+    it "times out and falls back on the modern index" do
+      gemfile <<-G
+        source "#{server_uri}"
+        gem "rack"
+      G
+
+      bundle :install
+      out.should include("\nFetching full source index from #{server_uri}")
+      should_be_installed "rack 1.0.0"
+    end
+  end
+
   context "when --full-index is specified" do
     it "should use the modern index for install" do
       gemfile <<-G

data/spec/other/clean_spec.rb

@@ -100,6 +100,29 @@ describe "bundle clean" do
     vendored_gems("bin/rackup").should exist
   end
 
+  it "remove gems in bundle without groups" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+
+      group :test_group do
+        gem "rack", "1.0.0"
+      end
+    G
+
+    bundle "install --path vendor/bundle"
+    bundle "install --without test_group"
+    bundle :clean
+
+    out.should eq("Removing rack (1.0.0)")
+
+    should_have_gems 'foo-1.0'
+    should_not_have_gems 'rack-1.0.0'
+
+    vendored_gems("bin/rackup").should_not exist
+  end
+
   it "does not remove cached git dir if it's being used" do
     build_git "foo"
     revision = revision_for(lib_path("foo-1.0"))
@@ -231,9 +254,27 @@ describe "bundle clean" do
     out.should eq("")
     vendored_gems("bundler/gems/foo-#{revision[0..11]}").should exist
     digest = Digest::SHA1.hexdigest(git_path.to_s)
-    vendored_gems("cache/bundler/git/foo-#{digest}").should exist
+    vendored_gems("cache/bundler/git/foo-#{digest}").should_not exist
   end
 
+  it "does not blow up when using without groups" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+
+      group :development do
+        gem "foo"
+      end
+    G
+
+    bundle "install --path vendor/bundle --without development"
+
+    bundle :clean, :exitstatus => true
+    exitstatus.should == 0
+  end
+
+
   it "displays an error when used without --path" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"

data/spec/other/platform_spec.rb

@@ -158,6 +158,19 @@ G
 
       exitstatus.should_not == 0
     end
+
+    it "should print if no ruby version is specified" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+
+        gem "foo"
+      G
+
+      bundle "platform --ruby"
+      puts err
+
+      out.should eq("No ruby version specified")
+    end
   end
 
   let(:ruby_version_correct) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{local_engine_version}\"" }

data/spec/support/artifice/endpoint_timeout.rb

@@ -0,0 +1,13 @@
+require File.expand_path("../endpoint_fallback", __FILE__)
+
+Artifice.deactivate
+
+class EndpointTimeout < EndpointFallback
+  SLEEP_TIMEOUT = 15
+
+  get "/api/v1/dependencies" do
+    sleep(SLEEP_TIMEOUT)
+  end
+end
+
+Artifice.activate_with(EndpointTimeout)

data/spec/support/rubygems_ext.rb

@@ -11,13 +11,14 @@ module Spec
 
       unless File.exist?("#{Path.base_system_gems}")
         FileUtils.mkdir_p(Path.base_system_gems)
-        puts "fetching fakeweb, artifice, sinatra, rake, and builder for the tests to use..."
+        puts "fetching fakeweb, artifice, sinatra, rake, rack, and builder for the tests to use..."
         `gem install fakeweb artifice --no-rdoc --no-ri`
         `gem install sinatra --version 1.2.7 --no-rdoc --no-ri`
         # Rake version has to be consistent for tests to pass
         `gem install rake --version 0.8.7 --no-rdoc --no-ri`
         # 3.0.0 breaks 1.9.2 specs
         `gem install builder --version 2.1.2 --no-rdoc --no-ri`
+        `gem install rack --no-rdoc --no-ri`
       end
 
       ENV['HOME'] = Path.home.to_s

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 Z
+date: 2012-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -225,6 +225,7 @@ files:
 - 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