[DRE-commits] [bundler] 01/03: Imported Upstream version 1.5.1+dfsg

[Christian Hofstaedtler]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository bundler.

commit 79d66e11ba8cb4c96e4e43b90e60ec612b3a3b67
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Jan 6 01:43:10 2014 +0100

    Imported Upstream version 1.5.1+dfsg
---
 CHANGELOG.md                   |   6 ++++++
 checksums.yaml.gz              | Bin 268 -> 0 bytes
 lib/bundler/source/rubygems.rb |  12 +++++++-----
 lib/bundler/version.rb         |   2 +-
 metadata.yml                   |  21 +++++++++++++--------
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b67d6f..49ba83a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.5.1 (2013-12-28)
+
+Bugfixes:
+
+  - correctly find gems installed with Ruby by default
+
 ## 1.5.0 (2013-12-26)
 
 Features:
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
deleted file mode 100644
index dbd3601..0000000
Binary files a/checksums.yaml.gz and /dev/null differ
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index f9d5261..880f78e 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -278,11 +278,13 @@ module Bundler
       end
 
       def gem_dir_exists?(spec)
-        if spec.name == "bundler"
-          true
-        else
-          File.directory?(spec.full_gem_path)
-        end
+        return true if spec.name == "bundler"
+        # Ruby 2 default gems
+        return true if spec.loaded_from.include?("specifications/default/")
+        # Ruby 1.9 default gems
+        return true if spec.summary =~ /is bundled with Ruby/
+
+        File.directory?(spec.full_gem_path)
       end
     end
 
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 64c2ed7..3fa04a8 100644
--- a/lib/bundler/version.rb
+++ b/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.5.0" unless defined?(::Bundler::VERSION)
+  VERSION = "1.5.1" unless defined?(::Bundler::VERSION)
 end
diff --git a/metadata.yml b/metadata.yml
index e9415c0..45c6aa9 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
+  prerelease: 
 platform: ruby
 authors:
 - André Arko
@@ -11,11 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -311,26 +316,27 @@ files:
 homepage: http://bundler.io
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: The best way to manage your application's dependencies
 test_files:
 - spec/bundler/bundler_spec.rb
@@ -436,4 +442,3 @@ test_files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-has_rdoc: 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bundler.git