bundler 1.7.1.pre → 1.7.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1213efeb576d584ede27b76fe40b77dbd6448ccf
-  data.tar.gz: 9117d8aa3a74e6a2141341beb3c46f355dcb0e8b
+  metadata.gz: e2f0d1093a7e58d8388b0a73a7383b6c7f789c19
+  data.tar.gz: 3533a868f32638343917003e64b777e6d679c1c5
 SHA512:
-  metadata.gz: dfc4d08a4d524d312750479bb191421316e2b3f031aac807ee6032ab15d028718929691de7392cd99bdf16d6365764a4ceb5ee46264db96ecf05953e8a90c745
-  data.tar.gz: 0dfeea04bba5099692f3f90e68f6b4aae7fa682e040974d17087c43de38327a16fc87781f7693b3b40ccead090484229e51ecf8bbec7b8f64609aa73a1271130
+  metadata.gz: 00bd2550673546576a04534a080216f38af0a6096e5053b01c68ae180d01c547cf8bd83217b60005c2b20fedeedf804683d52b2b9159581cab4a46746dde7b94
+  data.tar.gz: dc413aec796d574b8321a5624574aa845f07344a9f0499fd3c9f471ffcf32d2f2d248c46c83f1074f6d43c41b6f84f76bf754f4e08514363862c9fa8f57dc799

data/CHANGELOG.md

@@ -3,6 +3,7 @@
 Bugfixes:
 
   - Install gems from one source needed by gems in another source (@indirect)
+  - Install the same gem versions even after some are installed (@tmoore)
 
 ## 1.7.0 (2014-08-13)
 

data/bundler.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rdiscount', '~> 1.6'
   spec.add_development_dependency 'ronn', '~> 0.7.3'
-  spec.add_development_dependency 'rspec', '~> 3.0.0.beta1'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 
   spec.files       = `git ls-files -z`.split("\x0")
   spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git

data/lib/bundler/definition.rb

@@ -598,10 +598,12 @@ module Bundler
       # Record the specs available in each gem's source, so that those
       # specs will be available later when the resolver knows where to
       # look for that gemspec (or its dependencies)
-      dependencies.each_with_object({}) do |dep, source_requirements|
+      source_requirements = {}
+      dependencies.each do |dep|
         next unless dep.source
         source_requirements[dep.name] = dep.source.specs
       end
+      source_requirements
     end
 
   end

data/lib/bundler/fetcher.rb

@@ -386,7 +386,7 @@ module Bundler
     def fetch_uri
       @fetch_uri ||= begin
         if @remote_uri.host == "rubygems.org"
-          uri = @remote_uri.dup 
+          uri = @remote_uri.dup
           uri.host = "bundler.rubygems.org"
           uri
         else

data/lib/bundler/index.rb

@@ -68,7 +68,7 @@ module Bundler
         end
       end
 
-      results
+      results.sort_by {|s| [s.version, s.platform.to_s == 'ruby' ? "\0" : s.platform.to_s] }
     end
 
     def local_search(query, base = nil)
@@ -173,7 +173,7 @@ module Bundler
           found.reject! { |spec| spec.version.prerelease? }
         end
 
-        found.sort_by {|s| [s.version, s.platform.to_s == 'ruby' ? "\0" : s.platform.to_s] }
+        found
       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.7.1.pre" unless defined?(::Bundler::VERSION)
+  VERSION = "1.7.1.pre.2" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.7.1.pre
+  version: 1.7.1.pre.2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
 email: