bundler 1.2.1 → 1.2.2

data/.travis.yml

@@ -2,6 +2,8 @@ before_script:
   - sudo apt-get install groff -y
   - rake spec:deps
 
+# Rubygems versions MUST be available as rake tasks
+# see Rakefile:66 for the list of possible RGV values
 env:
   - RGV=v1.3.6
   - RGV=v1.3.7
@@ -9,24 +11,41 @@ env:
   - RGV=v1.5.3
   - RGV=v1.6.2
   - RGV=v1.7.2
-  - RGV=v1.8.10
+  - RGV=v1.8.24
 
 language: ruby
 
 matrix:
   exclude:
-    - rvm: 1.9.2
+    # 2.0.0-preview1 shipped with Rubygems 1.8.24, so start there.
+    - rvm: 2.0.0-preview1
+      env: RGV=v1.4.2
+    - rvm: 2.0.0-preview1
       env: RGV=v1.3.6
-    - rvm: 1.9.2
+    - rvm: 2.0.0-preview1
       env: RGV=v1.3.7
-    - rvm: 1.9.2
+    - rvm: 2.0.0-preview1
       env: RGV=v1.4.2
+    - rvm: 2.0.0-preview1
+      env: RGV=v1.5.3
+    - rvm: 2.0.0-preview1
+      env: RGV=v1.6.2
+    - rvm: 2.0.0-preview1
+      env: RGV=v1.7.2
+    # 1.9.2 and 1.9.3 both shipped with Rubygems 1.3.7
+    # Unfortunately, Rubygems 1.4 wasn't compatible.
     - rvm: 1.9.3
       env: RGV=v1.3.6
     - rvm: 1.9.3
       env: RGV=v1.3.7
     - rvm: 1.9.3
       env: RGV=v1.4.2
+    - rvm: 1.9.2
+      env: RGV=v1.3.6
+    - rvm: 1.9.2
+      env: RGV=v1.3.7
+    - rvm: 1.9.2
+      env: RGV=v1.4.2
 
 notifications:
   email:
@@ -35,8 +54,8 @@ notifications:
     - sferik@gmail.com
 
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 1.9.2
+  - 1.8.7
 
 script: rake spec:travis

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## 1.2.1
+## 1.2.2 (Nov 14, 2012)
+
+Bugfixes:
+
+  - support new Psych::SyntaxError for Ruby 2.0.0 (@tenderlove, @sol)
+  - `bundle viz` works with git gems again (@hirochachacha)
+  - recognize more cases when OpenSSL is not present
+
+## 1.2.1 (Sep 19, 2012)
 
 Bugfixes:
 

data/Rakefile

@@ -63,7 +63,7 @@ begin
     namespace :rubygems do
       # Rubygems specs by version
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.10).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.24).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)

data/lib/bundler.rb

@@ -292,8 +292,7 @@ module Bundler
         contents = File.read(path.basename.to_s)
         begin
           Gem::Specification.from_yaml(contents)
-          # Raises ArgumentError if the file is not valid YAML
-        rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception
+        rescue YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception
           begin
             eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
           rescue LoadError, SyntaxError => e

data/lib/bundler/fetcher.rb

@@ -107,16 +107,6 @@ module Bundler
       end
 
       index
-    rescue LoadError => e
-      if e.message.include?("cannot load such file -- openssl")
-        raise InstallError,
-          "\nCould not load OpenSSL." \
-          "\nYou must recompile Ruby with OpenSSL support or change the sources in your" \
-          "\nGemfile from 'https' to 'http'. Instructions for compiling with OpenSSL" \
-          "\nusing RVM are available at rvm.io/packages/openssl."
-      else
-        raise e
-      end
     end
 
     # fetch index

data/lib/bundler/friendly_errors.rb

@@ -12,6 +12,19 @@ module Bundler
       exit 1
     rescue SystemExit => e
       exit e.status
+    rescue LoadError => e
+      case e.message
+      when /cannot load such file -- openssl/, /openssl.so/, /libcrypto.so/
+        Bundler.ui.error "\nCould not load OpenSSL."
+        Bundler.ui.warn "You must recompile Ruby with OpenSSL support or change the sources in your" \
+          "\nGemfile from 'https' to 'http'. Instructions for compiling with OpenSSL" \
+          "\nusing RVM are available at rvm.io/packages/openssl."
+        Bundler.ui.debug "#{e.class}: #{e.message}"
+        Bundler.ui.debug e.backtrace.join("\n")
+        exit 1
+      else
+        raise e
+      end
     rescue Exception => e
       Bundler.ui.error(
         "Unfortunately, a fatal error has occurred. Please see the Bundler \n" \

data/lib/bundler/graph.rb

@@ -15,6 +15,7 @@ module Bundler
       @node_options      = {}
       @edge_options      = {}
 
+      _patching_gem_dependency_class
       _populate_relations
     end
 
@@ -27,7 +28,6 @@ module Bundler
     private
 
     def _populate_relations
-      relations = Hash.new {|h, k| h[k] = Set.new}
       parent_dependencies = _groups.values.to_set.flatten
       while true
         if parent_dependencies.empty?
@@ -36,7 +36,6 @@ module Bundler
           tmp = Set.new
           parent_dependencies.each do |dependency|
             child_dependencies = dependency.to_spec.runtime_dependencies.to_set
-            relations[dependency.name] += child_dependencies.to_set
             @relations[dependency.name] += child_dependencies.map(&:name).to_set
             tmp += child_dependencies
 
@@ -48,7 +47,6 @@ module Bundler
           parent_dependencies = tmp
         end
       end
-      @relations
     end
 
     def _groups
@@ -87,6 +85,27 @@ module Bundler
       label.nil? ? {} : { :label => label }
     end
 
+    def _patching_gem_dependency_class
+      # method borrow from rubygems/dependency.rb
+      # redefinition of matching_specs will also redefine to_spec and to_specs
+      Gem::Dependency.class_eval do
+        def matching_specs platform_only = false
+          matches = Bundler.load.specs.select { |spec|
+            self.name === spec.name and # TODO: == instead of ===
+              requirement.satisfied_by? spec.version
+          }
+
+          if platform_only
+            matches.reject! { |spec|
+              not Gem::Platform.match spec.platform
+            }
+          end
+
+          matches = matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
+        end
+      end
+    end
+
     class GraphVizClient
       def initialize(graph_instance)
         @graph_name    = graph_instance.class::GRAPH_NAME

data/lib/bundler/psyched_yaml.rb

@@ -1,15 +1,27 @@
-# Psych could be a gem
+# Psych could be a gem, so try to ask for it
 begin
   gem 'psych'
-rescue Gem::LoadError
-end if defined?(Gem)
+rescue LoadError
+end if defined?(gem)
 
-# Psych could be a stdlib
+# Psych could just be in the stdlib
+# but it's too late if Syck is already loaded
 begin
-  # it's too late if Syck is already loaded
   require 'psych' unless defined?(Syck)
 rescue LoadError
+  # Apparently Psych wasn't available. Oh well.
 end
 
-# Psych might NOT EXIST AT ALL
+# At least load the YAML stdlib, whatever that may be
 require 'yaml'
+
+module Bundler
+  # On encountering invalid YAML,
+  # Psych raises Psych::SyntaxError
+  # Syck raises ArgumentError
+  if defined?(::Psych::SyntaxError)
+    YamlSyntaxError = ::Psych::SyntaxError
+  else
+    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.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.2.2" unless defined?(::Bundler::VERSION)
 end

data/spec/bundler/bundler_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'bundler'
+
+describe Bundler do
+  describe "#load_gemspec_uncached" do
+    it "should catch Psych syntax errors" do
+      gemspec = <<-GEMSPEC
+{:!00 ao=gu\g1= 7~f
+GEMSPEC
+      File.open(tmp("test.gemspec"), 'wb') do |file|
+        file.puts gemspec
+      end
+
+      proc {
+        Bundler.load_gemspec_uncached(tmp("test.gemspec"))
+      }.should raise_error(Bundler::GemspecError)
+    end
+  end
+end

data/spec/bundler/psyched_yaml_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Bundler::YamlSyntaxError do
+  it "is raised on YAML parse errors" do
+    expect{ YAML.parse "{foo" }.to raise_error(Bundler::YamlSyntaxError)
+  end
+end

data/spec/realworld/edgecases_spec.rb

@@ -41,7 +41,7 @@ describe "real world edgecases", :realworld => true do
     gemfile <<-G
       source :rubygems
 
-      gem 'rack', '1.0.0'
+      gem 'rack', '1.0.1'
     G
 
     bundle "install --path vendor/bundle", :expect_err => true

metadata

@@ -1,64 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bundler
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
-- "Andr\xC3\xA9 Arko"
+authors:
+- André Arko
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ronn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description: Bundler manages an application's dependencies through its entire life,
+  across many machines, systematically and repeatably
+email:
 - andre@arko.net
-executables: 
+executables:
 - bundle
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -162,9 +158,11 @@ files:
 - man/bundle.ronn
 - man/gemfile.5.ronn
 - man/index.txt
+- spec/bundler/bundler_spec.rb
 - spec/bundler/definition_spec.rb
 - spec/bundler/dsl_spec.rb
 - spec/bundler/gem_helper_spec.rb
+- spec/bundler/psyched_yaml_spec.rb
 - spec/bundler/source_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
@@ -241,58 +239,125 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle-exec
 - lib/bundler/man/bundle
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-exec
+- lib/bundler/man/bundle-exec.txt
 - lib/bundler/man/bundle-install
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-install.txt
 - lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-platform.txt
 - lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-platform.txt
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
 homepage: http://gembundler.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: bundler
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: []
-
+test_files:
+- spec/bundler/bundler_spec.rb
+- spec/bundler/definition_spec.rb
+- spec/bundler/dsl_spec.rb
+- spec/bundler/gem_helper_spec.rb
+- spec/bundler/psyched_yaml_spec.rb
+- spec/bundler/source_spec.rb
+- spec/cache/gems_spec.rb
+- spec/cache/git_spec.rb
+- spec/cache/path_spec.rb
+- spec/cache/platform_spec.rb
+- spec/install/deploy_spec.rb
+- spec/install/gems/c_ext_spec.rb
+- spec/install/gems/dependency_api_spec.rb
+- spec/install/gems/env_spec.rb
+- spec/install/gems/flex_spec.rb
+- spec/install/gems/groups_spec.rb
+- spec/install/gems/packed_spec.rb
+- spec/install/gems/platform_spec.rb
+- spec/install/gems/post_install_spec.rb
+- spec/install/gems/resolving_spec.rb
+- spec/install/gems/simple_case_spec.rb
+- spec/install/gems/standalone_spec.rb
+- spec/install/gems/sudo_spec.rb
+- spec/install/gems/win32_spec.rb
+- spec/install/gemspec_spec.rb
+- spec/install/git_spec.rb
+- spec/install/invalid_spec.rb
+- spec/install/path_spec.rb
+- spec/install/upgrade_spec.rb
+- spec/lock/git_spec.rb
+- spec/lock/lockfile_spec.rb
+- spec/other/check_spec.rb
+- spec/other/clean_spec.rb
+- spec/other/config_spec.rb
+- spec/other/console_spec.rb
+- spec/other/exec_spec.rb
+- spec/other/ext_spec.rb
+- spec/other/help_spec.rb
+- spec/other/init_spec.rb
+- spec/other/newgem_spec.rb
+- spec/other/open_spec.rb
+- spec/other/outdated_spec.rb
+- spec/other/platform_spec.rb
+- spec/other/show_spec.rb
+- spec/quality_spec.rb
+- spec/realworld/edgecases_spec.rb
+- spec/resolver/basic_spec.rb
+- spec/resolver/platform_spec.rb
+- spec/runtime/executable_spec.rb
+- spec/runtime/load_spec.rb
+- spec/runtime/platform_spec.rb
+- spec/runtime/require_spec.rb
+- spec/runtime/setup_spec.rb
+- spec/runtime/with_clean_env_spec.rb
+- spec/spec_helper.rb
+- spec/support/artifice/endopint_marshal_fail_basic_authentication.rb
+- spec/support/artifice/endpoint.rb
+- spec/support/artifice/endpoint_500.rb
+- spec/support/artifice/endpoint_api_missing.rb
+- spec/support/artifice/endpoint_basic_authentication.rb
+- spec/support/artifice/endpoint_extra.rb
+- spec/support/artifice/endpoint_extra_missing.rb
+- 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
+- spec/support/helpers.rb
+- spec/support/indexes.rb
+- spec/support/matchers.rb
+- spec/support/path.rb
+- spec/support/platforms.rb
+- spec/support/ruby_ext.rb
+- spec/support/rubygems_ext.rb
+- spec/support/rubygems_hax/platform.rb
+- spec/support/sudo.rb
+- spec/update/gems_spec.rb
+- spec/update/git_spec.rb
+- spec/update/source_spec.rb