bundler 1.7.8 → 1.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adfd35f4416630e7c51fc82b523f4f6def3bc717
-  data.tar.gz: 198dfe3a2a9841f9bf269ce3a21156acbaf584ac
+  metadata.gz: e1c6635aa6f9381865c09e22712c65eb6ce6df71
+  data.tar.gz: f7e85da257a62822115cb5450a4a77a538499bae
 SHA512:
-  metadata.gz: e6d8cb12624484c125a154268bc1f02ec058353ce05b1a487cedf53504380a34ac33a8ed131e203bd4dd63b29d39e3bc2b19afd3d572106370dd3748f0c6ebce
-  data.tar.gz: bd488989524220b9b6b9bf096ba93199e3c27e4d823c34972156aabeee8d4b8f593504308131177196036f8fd30bffc3aee95d05bf005ce53695f9fa0161884b
+  metadata.gz: 6effd53e12307044062ea6905c96f7435c8cb986d657483707e6c44daff0360f0cee0d3083d8b5939dec53b79e91282adbca66abe3484ebd20d87676c4d8a6da
+  data.tar.gz: 3e46d038f7c07fbc627766dd87e2e120d79bbd303c0168de029c73f3b90cb91596ec9eb9249c34903aa5ad93a3a8a4862365ffec82f4031430c205dacb581a62

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.7.9 (2014-12-09)
+
+Bugfixes:
+
+  - Fix an issue where bundler sometime spams one gem in Gemfile.lock (#3216, @Who828)
+  - Ensure bundle update installs the newer version of the gem (#3089, @Who828)
+  - Fix an regression which stopped Bundler from resolving some Gemfiles (#3059, #3248, @Who828)
+
 ## 1.7.8 (2014-12-06)
 
 Bugfixes:

data/lib/bundler/resolver.rb

@@ -110,7 +110,7 @@ module Bundler
       end
     end
 
-    attr_reader :errors, :started_at, :iteration_rate, :iteration_counter
+    attr_reader :errors, :started_at, :iteration_rate, :iteration_counter, :initial_reqs
 
     # Figures out the best possible configuration of gems that satisfies
     # the list of passed dependencies and any child dependencies without
@@ -135,6 +135,7 @@ module Bundler
     end
 
     def initialize(index, source_requirements, base)
+      @initial_reqs         = []
       @errors               = {}
       @base                 = base
       @index                = index
@@ -157,11 +158,12 @@ module Bundler
       activated.values.map { |s| s.to_specs }.flatten.compact
     end
 
-    def start(reqs)
+    def start(reqs, current_traversal=false)
+      @initial_reqs = reqs.dup unless current_traversal
       activated = {}
       @gems_size = Hash[reqs.map { |r| [r, gems_size(r)] }]
 
-      resolve(reqs, activated)
+      resolve(reqs, activated, current_traversal)
     end
 
     class State < Struct.new(:reqs, :activated, :requirement, :possibles, :depth, :conflicts)
@@ -171,13 +173,16 @@ module Bundler
     end
 
     def handle_conflict(current, states, existing=nil)
-      until current.nil? && existing.nil?
+      until current.nil?
         current_state = find_state(current, states)
-        existing_state = find_state(existing, states)
         return current if state_any?(current_state)
+        current = current.required_by.last if current
+      end
+
+      until existing.nil?
+        existing_state = find_state(existing, states)
         return existing if state_any?(existing_state)
         existing = existing.required_by.last if existing
-        current = current.required_by.last if current
       end
     end
 
@@ -224,7 +229,7 @@ module Bundler
     end
 
     def resolve_for_conflict(state)
-      raise version_conflict if state.nil? || state.possibles.empty?
+      return version_conflict if state.nil? || state.possibles.empty?
       reqs, activated, depth, conflicts = state.reqs.dup, state.activated.dup, state.depth, state.conflicts.dup
       requirement = state.requirement
       possible = state.possibles.pop
@@ -251,7 +256,7 @@ module Bundler
       return reqs, activated, depth, conflicts
     end
 
-    def resolve(reqs, activated)
+    def resolve(reqs, activated, current_traversal)
       states = []
       depth = 0
       conflicts = Set.new
@@ -310,17 +315,23 @@ module Bundler
             conflicts << current.name
 
             parent = current.required_by.last
-            if existing.respond_to?(:required_by)
-              parent = handle_conflict(current, states, existing.required_by[-2]) unless other_possible?(parent, states)
+
+            if current_traversal
+              parent = handle_conflict(current, states)
             else
-              parent = handle_conflict(current, states) unless other_possible?(parent, states)
+              parent = handle_conflict(parent, states)
             end
 
+
             if parent.nil? && !conflicts.empty?
               parent = states.reverse.detect { |i| conflicts.include?(i.name) && state_any?(i)}
             end
 
-            raise version_conflict if parent.nil? || parent.name == 'bundler'
+            if existing.respond_to?(:required_by)
+              parent = handle_conflict(parent, states, existing.required_by[-2]) unless other_possible?(parent, states)
+            end
+
+            return version_conflict(current_traversal) if parent.nil? || parent.name == 'bundler'
 
             reqs, activated, depth, conflicts = resolve_conflict(parent, states)
           end
@@ -364,6 +375,7 @@ module Bundler
             end
           end
 
+
           state = State.new(reqs.dup, activated.dup, current, matching_versions, depth, conflicts)
           states << state
           requirement = state.possibles.pop
@@ -418,8 +430,15 @@ module Bundler
       end
     end
 
-    def version_conflict
-      VersionConflict.new(errors.keys, error_message)
+    def version_conflict(current_traversal=true)
+      raise VersionConflict.new(errors.keys, error_message) if current_traversal
+      reset_state
+      start(initial_reqs, true)
+    end
+
+    def reset_state
+      clear_search_cache
+      @errors = {}
     end
 
     # For a given conflicted requirement, print out what exactly went wrong

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

data/spec/realworld/edgecases_spec.rb

@@ -35,6 +35,41 @@ describe "real world edgecases", :realworld => true do
     expect(out).to include("activemodel 3.0.5")
   end
 
+  it "resolves dependencies correctly", :ruby => "1.9" do
+    install_gemfile <<-G
+    source "https://rubygems.org"
+
+    gem 'rails', '~> 3.0'
+    gem 'capybara', '~> 2.2.0'
+    G
+    expect(out).to include("rails 3.2.21")
+    expect(out).to include("capybara 2.2.1")
+  end
+
+  it "installs the latest version of gxapi_rails", :ruby => "1.9"  do
+    install_gemfile <<-G
+    source "https://rubygems.org"
+
+    gem "sass-rails"
+    gem "rails", "~> 3"
+    gem "gxapi_rails"
+    G
+    expect(out).to include("gxapi_rails 0.0.6")
+  end
+
+  it "installs the latest version of i18n" do
+    install_gemfile <<-G
+    source "https://rubygems.org"
+
+    gem "i18n", "~> 0.4"
+    gem "activesupport", "~> 3.0"
+    gem "activerecord", "~> 3.0"
+    gem "builder", "~> 2.1.2"
+    G
+    expect(out).to include("i18n 0.6.11")
+    expect(out).to include("activesupport 3.0.5")
+  end
+
   # https://github.com/bundler/bundler/issues/1500
   it "does not fail install because of gem plugins" do
     realworld_system_gems("open_gem --version 1.4.2", "rake --version 0.9.2")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.9
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache