bundler 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e9f5b888313b638da49ec89a873a0a45e939f231
-  data.tar.gz: 7314e890b63791d90e43f607bbd67ebcc82dc9dd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjNkYWY4MzNjOGQxZjE5ODZmZjk4ODcyNDAxNGZkMDMzZTI3ODEzYg==
+  data.tar.gz: !binary |-
+    OTA4YjBmMTFhZjM0ZDhmMjY0NGY1M2I5Mjc0MTY3MzIxNTZiYjc2ZA==
 SHA512:
-  metadata.gz: a1fea5817b4f75be5febd306d2bfe8dd00cc7a4f26fccbed099d2e65034837a4f8482fa895fe61cf1f4a20f080db88f96871de73c102bbbff26536c3ed88b58d
-  data.tar.gz: aa2cefdbec40e01a9319fbac7e98ca307f8dc4e7edf9ed701264c23194c0a22cdd7ad12bf9380c2f90094d92e829cc5e4cc6328c1ee9b612bf8577be4f9c0c1c
+  metadata.gz: !binary |-
+    NDhkZmM0MTA0NDZlMjg4YTViY2Q4MTUxOTIxOTJhMWJmYmVmYjNiMmJmNDNl
+    OTEyNzk2YzUwM2ViN2JhNTU5N2FhZDBmYmM1ZjQxMDI1N2YxODdiODA4N2Uy
+    NmI5MDczN2FkMjM5ZjBlMzgxZDVhOWE2M2E1Y2YwMTNhZTU5YWQ=
+  data.tar.gz: !binary |-
+    ZjcwNTM2MWQwNzIwMGEzYmM2MTI5MWU0MmI1ZjVkZjAwN2VjYzYwMGJiNDU4
+    MjdkYTUyMWY4MGIzOTYxYTk2OGM0ZTBlZTcyOWJiYzQ4YzU1YTEzNzM2NTRm
+    MDE2ZGExMDY0MWY1ZWYxYmMxNWM3MGI2NTYxNzkxOTgzNDliMTY=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.10.2 (2015-05-29)
+
+Bugfixes:
+
+  - fix regression in `bundle update GEM` performance introduced in 1.10.0 (#3687, @segiddins)
+
 ## 1.10.1 (2015-05-28)
 
 Bugfixes:

data/lib/bundler/resolver.rb

@@ -305,12 +305,16 @@ module Bundler
     def amount_constrained(dependency)
       @amount_constrained ||= {}
       @amount_constrained[dependency.name] ||= begin
-        base_dep = Dependency.new dependency.name, '>= 0.a'
-        all = search_for(DepProxy.new base_dep, dependency.__platform)
-        if all.size == 0
-          0
+        if base = @base[dependency.name] and !base.empty?
+          dependency.requirement.satisfied_by?(base.first.version) ? 0 : 1
         else
-          search_for(dependency).size.to_f / all.size.to_f
+          base_dep = Dependency.new dependency.name, '>= 0.a'
+          all = search_for(DepProxy.new base_dep, dependency.__platform)
+          if all.size == 0
+            0
+          else
+            search_for(dependency).size.to_f / all.size.to_f
+          end
         end
       end
     end

data/lib/bundler/rubygems_integration.rb

@@ -482,6 +482,13 @@ module Bundler
       def stub_rubygems(specs)
         stub_source_index(specs)
       end
+
+      def validate(spec)
+        # Missing summary is downgraded to a warning in later versions,
+        # so we set it to an empty string to prevent an exception here.
+        spec.summary ||= ""
+        Bundler.ui.silence { spec.validate(false) }
+      end
     end
 
     # Rubygems 1.8.5-1.8.19

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -31,56 +31,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Bundler manages an application's dependencies through its entire life,
@@ -93,9 +93,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -305,19 +305,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
-has_rdoc: