bundler 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.1.1 (March 14, 2012)
+
+Bugfixes:
+
+  - Rescue EAGAIN so the fetcher works on JRuby on Windows
+  - Stop asking users to report gem installation errors
+  - Clarify "no sources" message
+  - Use $\ so `bundle gem` gemspecs work on Windows (@postmodern)
+  - URI-encode gem names for dependency API (@rohit, #1672)
+  - Fix `cache` edge case in rubygems 1.3.7 (#1202)
+
+Performance:
+
+  - Reduce invocation of git ls-files in `bundle gem` gemspecs (@knu)
+
 ## 1.1.0 (Mar 7, 2012)
 
 Bugfixes:

data/bin/bundle

@@ -24,6 +24,8 @@ rescue SystemExit => e
 rescue Exception => e
   Bundler.ui.error "Unfortunately, a fatal error has occurred. " +
     "Please report this error to the Bundler issue tracker at " +
-    "https://github.com/carlhuda/bundler/issues so that we can fix it. Thanks!"
+    "https://github.com/carlhuda/bundler/issues so that we can fix it. " +
+    "Please include the full output of the command, your Gemfile and Gemfile.lock. " +
+    "Thanks!"
   raise e
 end

data/lib/bundler.rb

@@ -45,6 +45,7 @@ module Bundler
   class GemNotFound      < BundlerError; status_code(7)  ; end
   class GemfileError     < BundlerError; status_code(4)  ; end
   class InstallError     < BundlerError; status_code(5)  ; end
+  class InstallHookError < BundlerError; status_code(6)  ; end
   class PathError        < BundlerError; status_code(13) ; end
   class GitError         < BundlerError; status_code(11) ; end
   class DeprecatedError  < BundlerError; status_code(12) ; end
@@ -251,9 +252,9 @@ module Bundler
       if File.executable?(executable)
         executable
       else
-        path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |path|
-          File.executable?(File.join(path, executable))
-        }
+        path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p|
+          File.executable?(File.join(p, executable))
+        end
         path && File.expand_path(executable, path)
       end
     end

data/lib/bundler/cli.rb

@@ -240,7 +240,9 @@ module Bundler
       end
 
       if Bundler.definition.no_sources?
-        Bundler.ui.warn "Your Gemfile doesn't have any sources. You can add one with a line like 'source :rubygems'"
+        Bundler.ui.warn "Your Gemfile has no remote sources. If you need " \
+          "gems that are not already on\nyour machine, add a line like this " \
+          "to your Gemfile:\n    source 'https://rubygems.org'"
       end
       raise e
     end

data/lib/bundler/fetcher.rb

@@ -158,7 +158,8 @@ module Bundler
     # fetch from Gemcutter Dependency Endpoint API
     def fetch_dependency_remote_specs(gem_names)
       Bundler.ui.debug "Query Gemcutter Dependency Endpoint API: #{gem_names.join(' ')}"
-      uri = URI.parse("#{@remote_uri}api/v1/dependencies?gems=#{gem_names.join(",")}")
+      encoded_gem_names = URI.encode(gem_names.join(","))
+      uri = URI.parse("#{@remote_uri}api/v1/dependencies?gems=#{encoded_gem_names}")
       marshalled_deps = fetch(uri)
       gem_list = Marshal.load(marshalled_deps)
       deps_list = []

data/lib/bundler/installer.rb

@@ -83,7 +83,7 @@ module Bundler
       FileUtils.rm_rf(Bundler.tmp)
     rescue Exception => e
       # install hook failed
-      raise e if e.is_a?(Gem::InstallError)
+      raise e if e.is_a?(Bundler::InstallHookError)
 
       # other failure, likely a native extension build failure
       Bundler.ui.info ""

data/lib/bundler/rubygems_integration.rb

@@ -265,6 +265,15 @@ module Bundler
       end
     end
 
+    # This backport fixes the marshaling of @segments.
+    def backport_yaml_initialize
+      Gem::Version.send(:define_method, :yaml_initialize) do |tag, map|
+        @version = map['version']
+        @segments = nil
+        @hash = nil
+      end
+    end
+
     # This backports base_dir which replaces installation path
     # Rubygems 1.8+
     def backport_base_dir
@@ -301,6 +310,7 @@ module Bundler
         backport_base_dir
         backport_cache_file
         backport_spec_file
+        backport_yaml_initialize
       end
 
       def stub_rubygems(specs)

data/lib/bundler/source.rb

@@ -472,7 +472,7 @@ module Bundler
           if result == false
             location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
             message = "#{type} hook#{location} failed for #{installer.spec.full_name}"
-            raise Gem::InstallError, message
+            raise InstallHookError, message
           end
         end
       end

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

@@ -8,9 +8,9 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{TODO: Write a gem summary}
   gem.homepage      = ""
 
-  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.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = <%=config[:name].inspect%>
   gem.require_paths = ["lib"]
   gem.version       = <%=config[:constant_name]%>::VERSION

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

@@ -13,7 +13,7 @@ class Net::BufferedIO #:nodoc:
     if @io.respond_to? :read_nonblock then
       begin
         @rbuf << @io.read_nonblock(65536)
-      rescue Errno::EWOULDBLOCK => e
+      rescue Errno::EWOULDBLOCK, Errno::EAGAIN => e
         retry if IO.select [@io], nil, nil, @read_timeout
         raise Timeout::Error, e.message
       end

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

data/spec/install/gems/dependency_api_spec.rb

@@ -14,6 +14,16 @@ describe "gemcutter's dependency API" do
     should_be_installed "rack 1.0.0"
   end
 
+  it "should URI encode gem names" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem " sinatra"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    out.should include("Could not find gem ' sinatra")
+  end
+
   it "should handle nested dependencies" do
     gemfile <<-G
       source "#{source_uri}"

data/spec/install/gems/simple_case_spec.rb

@@ -291,7 +291,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install, :expect_err => true
-      out.should =~ /Your Gemfile doesn't have any sources/i
+      out.should =~ /Your Gemfile has no remote sources/i
     end
 
     it "creates a Gemfile.lock on a blank Gemfile" do
@@ -486,7 +486,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install, :quiet => true
-      out.should =~ /doesn't have any sources/
+      out.should =~ /Your Gemfile has no remote sources/
     end
   end
 

data/spec/install/git_spec.rb

@@ -642,7 +642,7 @@ describe "bundle install with git sources" do
 
       bundle :install, :expect_err => true,
         :requires => [lib_path('install_hooks.rb')]
-      err.should include("failed for foo-1.0")
+      out.should include("failed for foo-1.0")
     end
   end
 end

data/spec/other/clean_spec.rb

@@ -465,8 +465,8 @@ describe "bundle clean" do
 
     sys_status "foo"
 
-    exitstatus.should == 0
-    out.should == "1.0"
+    exitstatus.should eq(0)
+    out.should eq("1.0")
   end
 
   it "doesn't blow up on path gems without a .gempsec" do

data/spec/quality_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-if defined?(Encoding)
+if defined?(Encoding) && Encoding.default_external != "UTF-8"
   Encoding.default_external = "UTF-8"
 end
 

data/spec/realworld/edgecases_spec.rb

@@ -14,7 +14,8 @@ describe "real world edgecases", :realworld => true do
   it "bundle cache works with rubygems 1.3.7 and pre gems" do
     install_gemfile <<-G
       source :rubygems
-      gem "rack", "1.3.0.beta2"
+      gem "rack",          "1.3.0.beta2"
+      gem "will_paginate", "3.0.pre2"
     G
     bundle :cache
     out.should_not include("Removing outdated .gem files from vendor/cache")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 Z
+date: 2012-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn