bundler 1.2.2 → 1.2.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.3 (Nov 29, 2012)
+
+Bugfixes:
+
+  - fix exceptions while loading some gemspecs
+
 ## 1.2.2 (Nov 14, 2012)
 
 Bugfixes:

data/lib/bundler.rb

@@ -290,23 +290,15 @@ module Bundler
       # Eval the gemspec from its parent directory
       Dir.chdir(path.dirname.to_s) do
         contents = File.read(path.basename.to_s)
-        begin
-          Gem::Specification.from_yaml(contents)
-        rescue YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception
+
+        if contents =~ /\A---/ # try YAML
           begin
-            eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
-          rescue LoadError, SyntaxError => e
-            original_line = e.backtrace.find { |line| line.include?(path.to_s) }
-            msg  = "There was a #{e.class} while evaluating #{path.basename}: \n#{e.message}"
-            msg << " from\n  #{original_line}" if original_line
-            msg << "\n"
-
-            if e.is_a?(LoadError) && RUBY_VERSION >= "1.9"
-              msg << "\nDoes it try to require a relative path? That's been removed in Ruby 1.9."
-            end
-
-            raise GemspecError, msg
+            Gem::Specification.from_yaml(contents)
+          rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception
+            eval_gemspec(path, contents)
           end
+        else
+          eval_gemspec(path, contents)
         end
       end
     end
@@ -317,6 +309,21 @@ module Bundler
 
   private
 
+    def eval_gemspec(path, contents)
+      eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
+    rescue LoadError, SyntaxError => e
+      original_line = e.backtrace.find { |line| line.include?(path.to_s) }
+      msg  = "There was a #{e.class} while evaluating #{path.basename}: \n#{e.message}"
+      msg << " from\n  #{original_line}" if original_line
+      msg << "\n"
+
+      if e.is_a?(LoadError) && RUBY_VERSION >= "1.9"
+        msg << "\nDoes it try to require a relative path? That's been removed in Ruby 1.9."
+      end
+
+      raise GemspecError, msg
+    end
+
     def configure_gem_home_and_path
       blank_home = ENV['GEM_HOME'].nil? || ENV['GEM_HOME'].empty?
 

data/lib/bundler/psyched_yaml.rb

@@ -13,15 +13,14 @@ rescue LoadError
 end
 
 # At least load the YAML stdlib, whatever that may be
-require 'yaml'
+require 'yaml' unless defined?(YAML)
 
 module Bundler
   # On encountering invalid YAML,
   # Psych raises Psych::SyntaxError
-  # Syck raises ArgumentError
   if defined?(::Psych::SyntaxError)
     YamlSyntaxError = ::Psych::SyntaxError
-  else
+  else # Syck raises ArgumentError
     YamlSyntaxError = ::ArgumentError
   end
 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.2.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.2.3" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -159,9 +159,6 @@ describe "gemcutter's dependency API" do
   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']
@@ -169,6 +166,10 @@ describe "gemcutter's dependency API" do
       require 'rack'
       ENV['GEM_HOME'] = old_gem_home
 
+      port = 21453
+      port += 1 while TCPSocket.new("127.0.0.1", port) rescue false
+      @server_uri = "http://127.0.0.1:#{port}"
+
       require File.expand_path('../../../support/artifice/endpoint_timeout', __FILE__)
       require 'thread'
       @t = Thread.new {
@@ -192,12 +193,16 @@ describe "gemcutter's dependency API" do
 
     it "times out and falls back on the modern index" do
       gemfile <<-G
-        source "#{server_uri}"
+        source "#{@server_uri}"
         gem "rack"
+
+        old_v, $VERBOSE = $VERBOSE, nil
+        Bundler::Fetcher::API_TIMEOUT = 1
+        $VERBOSE = old_v
       G
 
       bundle :install
-      out.should include("\nFetching full source index from #{server_uri}")
+      expect(out).to include("\nFetching full source index from #{@server_uri}")
       should_be_installed "rack 1.0.0"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn