bundler-patch 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96da032d4f30feda0e83bb1869df9e962846bd7c
-  data.tar.gz: 8b73a7082fa6190b406d6204666118717d2328ac
+  metadata.gz: db13e486dca6bfc05d93f62cf35c04e8635ba49d
+  data.tar.gz: 9bc70139fc23c0411919e2c14405ee508ca10527
 SHA512:
-  metadata.gz: 3d0fd0304763dbec00ce7cb8ea9bb60103733527627d470f00526bc2868c4f154cc6ac185dcbc59f198a1f579c3c9a1ea33616c374fceaeec5aa070460b85a53
-  data.tar.gz: ee72e66cea4c8c44b5e3392ca091fc858fbe7929f795a31210d3af92c3bdfd132351739bde6cdc39286c215c4d3e07020fbc9a261ca79136a644cd12e81e3b7f
+  metadata.gz: b48d69a664d17906a3f38b2c1b235124e0c52e015e71afec2030a7a5cc88d9171737f33a34244655456aea0798abe95812dc75422b984739a1e1827dae454024
+  data.tar.gz: 848c2620c837d61da57080be7d5a982c068af6c82c35685eb8edd43243dfee1e917ec6941315497285d2e6aa6b95eeeae9835c7e8d33ce745b0cd744b675cf74

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.3.1

data/.travis.yml

@@ -5,12 +5,16 @@ before_install:
   - gem install bundler -v $BUNDLER_TEST_VERSION
   - bundle --version
 
+script: bundle exec rake test:all
+
 matrix:
   include:
     - rvm: 2.1.10
       env: BUNDLER_TEST_VERSION=1.12.5
     - rvm: 2.2.5
       env: BUNDLER_TEST_VERSION=1.12.5
+    - rvm: 2.3.1
+      env: BUNDLER_TEST_VERSION=1.9.10
     - rvm: 2.3.1
       env: BUNDLER_TEST_VERSION=1.10.5
     - rvm: 2.3.1
@@ -18,4 +22,4 @@ matrix:
     - rvm: 2.3.1
       env: BUNDLER_TEST_VERSION=1.12.5
     - rvm: 2.3.1
-      env: BUNDLER_TEST_VERSION=1.13.0.rc.1
+      env: BUNDLER_TEST_VERSION=1.13.0.rc.2

data/BUNDLER.md

@@ -0,0 +1,154 @@
+# Conservative Bundle Updates
+
+Starting with 1.13.0.rc.2, a subset of bundler-patch behavior was ported to Bundler itself.
+The plan is to leave it undocumented and unsupported in 1.13 to give it a chance to 
+be used and flush out bugs and iron out some design decisions.
+
+Part of that work before 1.14 (or maybe a later version) will be to properly document
+`bundle update` as well as the [Conservative Updating](http://bundler.io/v1.12/man/bundle-install.1.html#CONSERVATIVE-UPDATING)
+section of `bundle install`, but right now we need a placeholder document showing the new
+stuff so folks know how to use it.
+
+This is largely copy/pasta of the bundler-patch [README](README.md).
+
+## Usage
+
+The default `bundle update` behavior remains untouched. Use of the new `--patch`
+or `--minor` options will invoke the new conservative update behavior.
+
+"Conservative" means it will sort all available versions to prefer the
+latest releases from the current version, then the latest minor releases and
+then the latest major releases.
+
+"Prefer" means that no available versions are removed from consideration, to
+help ensure a suitable dependency graph can be reconciled. This does mean some
+gems cannot be upgraded or may be upgraded to unexpected versions. NOTE: There is
+a `--strict` option which _will_ remove versions from consideration, see below.
+
+Gem requirements as defined in the Gemfile will still define what versions are available.
+The new conservative behavior controls the preference order of those versions.
+
+For example, if gem 'foo' is locked at 1.0.2, with no gem requirement defined
+in the Gemfile, and versions 1.0.3, 1.0.4, 1.1.0, 1.1.1, 2.0.0 all exist, the
+default order of preference will be "1.0.4, 1.0.3, 1.0.2, 1.1.1, 1.1.0,
+2.0.0".
+
+In the same example, if gem 'foo' has a requirement of '~> 1.0', version 2.0.0
+will be removed from consideration as always.
+
+With no gem names provided on the command line, all gems will be unlocked and
+open for updating. 
+
+    $ bundle update --patch 
+
+A list of gem names can be passed to restrict to just those gems.
+
+    $ bundle update --patch foo bar
+
+  * `--patch` option will give preference for release/patch versions, then minor,
+    then major.
+    
+  * `--minor` option will give preference for minor versions over
+    release versions, then major versions.
+
+  * `--major` option will give preference for major versions over
+    minor or release versions. This is the default behavior currently, so this
+    flag is cosmetic for now. Bundler 2.0 will likely make `--patch` the default
+    behavior.
+
+  * `--strict` option will actually remove from consideration
+    versions outside either the current release (or minor version if `--minor`
+    specified). This increases the chances of Bundler being unable to
+    reconcile the dependency graph and in some cases could even raise a 
+    `VersionConflict`.
+
+## Examples
+
+### Single Gem
+
+| Requirements| Locked  | Available                        | Option   | Result |
+|-------------|---------|----------------------------------|----------|--------|
+| foo         | 1.4.3   | 1.4.4, 1.4.5, 1.5.0, 1.5.1 1.6.0 | --patch  | 1.4.5  |
+| foo         | 1.4.3   | 1.4.4, 1.4.5, 1.5.0, 1.5.1 1.6.0 | --minor  | 1.5.1  |
+| foo         | 1.4.3   | 1.4.4, 1.4.5, 1.5.0, 1.5.1 1.6.0 | --major  | 1.6.0  |
+
+### Two Gems
+
+Given the following gem specifications:
+
+- foo 1.4.3, requires: ~> bar 2.0
+- foo 1.4.4, requires: ~> bar 2.0
+- foo 1.4.5, requires: ~> bar 2.1
+- foo 1.5.0, requires: ~> bar 2.1
+- foo 1.5.1, requires: ~> bar 3.0
+- bar with versions 2.0.3, 2.0.4, 2.1.0, 2.1.1, 3.0.0
+
+Gemfile: 
+
+    gem 'foo'
+
+Gemfile.lock: 
+
+    foo (1.4.3)
+      bar (~> 2.0)
+    bar (2.0.3)
+
+| # | Command Line                   | Result                    |
+|---|--------------------------------|---------------------------|
+| 1 | bundle update --patch          | 'foo 1.4.5', 'bar 2.1.1'  |
+| 2 | bundle update --patch foo      | 'foo 1.4.4', 'bar 2.0.3'  |
+| 3 | bundle update --minor          | 'foo 1.5.1', 'bar 3.0.0'  |
+| 4 | bundle update --minor --strict | 'foo 1.5.0', 'bar 2.1.1'  |
+| 5 | bundle update --patch --strict | 'foo 1.4.4', 'bar 2.0.4'  |
+
+In case 1, `bar` is upgraded to 2.1.1, a minor version increase, because the
+dependency from `foo` 1.4.5 required it.
+
+In case 2, only `foo` is unlocked, so `foo` can only go to 1.4.4 to maintain
+the dependency to `bar`.
+
+In case 3, `bar` goes up a whole major release, because a minor increase is
+preferred now for `foo`, and when it goes to 1.5.1, it requires 3.0.0 of
+`bar`.
+
+In case 4, `foo` is preferred up to a 1.5.x, but 1.5.1 won't work because the
+`--strict` flag removes `bar` 3.0.0 from consideration since it's a major
+increment.
+
+In case 5, both `foo` and `bar` have any minor or major increments removed
+from consideration because of the `--strict` flag, so the most they can
+move is up to 1.4.4 and 2.0.4.
+
+
+### Troubleshooting
+
+First, make sure the current `bundle` command itself runs to completion on its
+own without any problems.
+
+The most frequent problems with this tool involve expectations around what
+gems should or shouldn't be upgraded. This can quickly get complicated as even
+a small dependency tree can involve many moving parts, and Bundler works hard
+to find a combination that satisfies all of the dependencies and requirements.
+
+NOTE: the requirements in the Gemfile trump anything else. The most control
+you have is by modifying those in the Gemfile, in some circumstances it may be
+better to pin your versions to what you need instead of trying to diagnose why
+Bundler isn't calculating the versions you expect with a broader requirement.
+If there is an incompatibility, pinning to desired versions can also aide in
+debugging dependency conflicts.
+
+You can get a (very verbose) look into how Bundler's resolution algorithm is
+working by setting the `DEBUG_RESOLVER` environment variable. While it can be
+tricky to dig through, it should explain how it came to the conclusions it
+came to.
+
+In particular, grep for 'Unwinding for conflict' in the debug output to
+isolate some key issues that may be preventing the outcome you expect.
+
+To get additional Bundler debugging output, enable the `DEBUG` env variable.
+This will include all of the details of the downloading the full dependency
+data from remote sources.
+
+At the end of all of this though, again, the requirements in the Gemfile
+trump anything else, and the most control you have is by modifying those
+in the Gemfile.

data/README.md

@@ -8,7 +8,9 @@ current version, over the latest minor releases or the latest major releases.
 This is somewhat opposite from `bundle update` which prefers newest/major
 versions first.
 
-Works with Bundler 1.10.x and higher.
+Works with Bundler 1.9 and higher. Starting with Bundler 1.13, much of the
+core behavior in `bundler-patch` has been ported to Bundler itself. Read 
+[BUNDLER.md](BUNDLER.md) for more information.
 
 [![Build Status](https://travis-ci.org/livingsocial/bundler-patch.svg?branch=master)](https://travis-ci.org/livingsocial/bundler-patch)
 
@@ -32,17 +34,10 @@ made.
 latest releases from the current version, then the latest minor releases and
 then the latest major releases.
 
-Gem requirements as defined in the Gemfile will restrict the available version
-options.
-
-For example, if gem 'foo' is locked at 1.0.2, with no gem requirement defined
-in the Gemfile, and versions 1.0.3, 1.0.4, 1.1.0, 1.1.1, 2.0.0 all exist, the
-default order of preference will be "1.0.4, 1.0.3, 1.0.2, 1.1.1, 1.1.0,
-2.0.0".
-
 "Prefer" means that no available versions are removed from consideration*, to
 help ensure a suitable dependency graph can be reconciled. This does mean some
-gems cannot be upgraded or will be upgraded to unexpected versions.
+gems cannot be upgraded or may be upgraded to unexpected versions. NOTE: There is
+a `--strict_updates` option which _will_ remove versions from consideration, see below.
 
 _*That's a white-lie. bundler-patch will actually remove from consideration
 any versions older than the currently locked version, which `bundle update`
@@ -50,6 +45,17 @@ will not do. It's not common, but it is possible for `bundle update` to
 regress a gem to an older version, if necessary to reconcile the dependency
 graph._
 
+Gem requirements as defined in the Gemfile will still define what versions are available.
+The new conservative behavior controls the preference order of those versions.
+
+For example, if gem 'foo' is locked at 1.0.2, with no gem requirement defined
+in the Gemfile, and versions 1.0.3, 1.0.4, 1.1.0, 1.1.1, 2.0.0 all exist, the
+default order of preference will be "1.0.4, 1.0.3, 1.0.2, 1.1.1, 1.1.0,
+2.0.0".
+
+In the same example, if gem 'foo' has a requirement of '~> 1.0', version 2.0.0
+will be removed from consideration as always.
+
 With no gem names provided on the command line, all gems will be unlocked and
 open for updating. A list of gem names can be passed to restrict to just those
 gems.
@@ -84,7 +90,7 @@ in the Gemfile on vulnerable gems to ensure they can be upgraded.
 The rules for updating vulnerable gems are almost identical to the general
 `bundler-patch` behavior described above, and abide by the same options (`-m`,
 `-p`, and `-s`) though there are some tweaks to encourage getting to at least
-a patched version of the gem. Keep in mind Bundler may choose unexpected
+a patched version of the gem. Keep in mind Bundler may still choose unexpected
 versions in order to satisfy the dependency graph.
 
    * `-v/--vulnerable_gems_only` option will automatically restrict the gems
@@ -170,29 +176,40 @@ gems should or shouldn't be upgraded. This can quickly get complicated as even
 a small dependency tree can involve many moving parts, and Bundler works hard
 to find a combination that satisfies all of the dependencies and requirements.
 
+NOTE: the requirements in the Gemfile trump anything else. The most control
+you have is by modifying those in the Gemfile, in some circumstances it may be
+better to pin your versions to what you need instead of trying to diagnose why
+Bundler isn't calculating the versions you expect with a broader requirement.
+If there is an incompatibility, pinning to desired versions can also aide in
+debugging dependency conflicts.
+
 You can get a (very verbose) look into how Bundler's resolution algorithm is
 working by setting the `DEBUG_RESOLVER` environment variable. While it can be
 tricky to dig through, it should explain how it came to the conclusions it
 came to.
 
+In particular, grep for 'Unwinding for conflict' in the debug output to
+isolate some key issues that may be preventing the outcome you expect.
+
 Adding to the usual Bundler complexity, `bundler-patch` is injecting its own
 logic to the resolution process to achieve its goals. If there's a bug
 involved, it's almost certainly in the `bundler-patch` code as Bundler has
 been around a long time and has thorough testing and real world experience.
 
-In particular, grep for 'Unwinding for conflict' in the debug output to
-isolate some key issues that may be preventing the outcome you expect.
+When used with versions of Bundler prior to 1.13, `bundler-patch` can dump
+its own debug output, potentially helpful, with `DEBUG_PATCH_RESOLVER`.
 
-`bundler-patch` can dump its own debug output, potentially helpful, with
-`DEBUG_PATCH_RESOLVER`.
+(When used with version 1.13+ of Bundler, `bundler-patch` only adds some
+additional sorting behavior, the result of which will be included in the
+`DEBUG_RESOLVER` output and `DEBUG_PATCH_RESOLVER` is not used).
 
 To get additional Bundler debugging output, enable the `DEBUG` env variable.
 This will include all of the details of the downloading the full dependency
 data from remote sources.
 
-At the end of all of this though, the requirements in the Gemfile trump
-anything else, and the most control you have is by modifying those in the
-Gemfile.
+At the end of all of this though, again, the requirements in the Gemfile
+trump anything else, and the most control you have is by modifying those
+in the Gemfile.
 
 
 ## Development

data/bundler-patch.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = ['bundler-patch']
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'bundler-advise', '~> 1.0', '>= 1.0.3'
+  spec.add_dependency 'bundler-advise', '~> 1.1', '>= 1.1.2'
   spec.add_dependency 'slop', '~> 3.0'
-  spec.add_dependency 'bundler', '~> 1.10'
+  spec.add_dependency 'bundler', '~> 1.7'
 
   spec.add_development_dependency 'bundler-fixture', '~> 1.3'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.5'
 end

data/lib/bundler/patch/cli.rb

@@ -1,3 +1,5 @@
+require 'bundler'
+require 'bundler/vendor/thor/lib/thor'
 require 'bundler/advise'
 require 'slop'
 

data/lib/bundler/patch/conservative_definition.rb

@@ -16,26 +16,37 @@ module Bundler::Patch
         else
           # Run a resolve against the locally available gems
           base = last_resolve.is_a?(Bundler::SpecSet) ? Bundler::SpecSet.new(last_resolve) : []
-          resolver = ConservativeResolver.new(index, source_requirements, base)
-          locked_specs = if @unlocking && @locked_specs.length == 0
-                           # Have to grab these again. Default behavior is to not store any
-                           # locked_specs if updating all gems, because behavior is the same
-                           # with no lockfile OR lockfile but update them all. In our case,
-                           # we need to know the locked versions for conservative comparison.
-                           locked = Bundler::LockfileParser.new(@lockfile_contents)
-                           Bundler::SpecSet.new(locked.specs)
-                         else
-                           @locked_specs
-                         end
-
-          resolver.gems_to_update = @gems_to_update
-          resolver.locked_specs = locked_specs
-          resolver.strict = @strict
-          resolver.minor_preferred = @minor_preferred
-          resolver.prefer_minimal = @prefer_minimal
+          if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.13.0.rc.2')
+            require 'bundler/patch/gem_version_patch_promoter'
+
+            gvpp = Bundler::Patch::GemVersionPatchPromoter.new(@gem_version_promoter.locked_specs, @gem_version_promoter.unlock_gems)
+            gvpp.level = @minor_preferred ? :minor : :patch
+            gvpp.strict = @strict
+            gvpp.minimal = @prefer_minimal
+            gvpp.gems_to_update = @gems_to_update
+            resolver = Bundler::Resolver.new(index, source_requirements, base, nil, gvpp, additional_base_requirements_for_resolve)
+          else
+            resolver = ConservativeResolver.new(index, source_requirements, base)
+            locked_specs = if @unlocking && @locked_specs.length == 0
+                             # Have to grab these again. Default behavior is to not store any
+                             # locked_specs if updating all gems, because behavior is the same
+                             # with no lockfile OR lockfile but update them all. In our case,
+                             # we need to know the locked versions for conservative comparison.
+                             locked = Bundler::LockfileParser.new(@lockfile_contents)
+                             Bundler::SpecSet.new(locked.specs)
+                           else
+                             @locked_specs
+                           end
+
+            resolver.gems_to_update = @gems_to_update
+            resolver.locked_specs = locked_specs
+            resolver.strict = @strict
+            resolver.minor_preferred = @minor_preferred
+            resolver.prefer_minimal = @prefer_minimal
+          end
+
           result = resolver.start(expanded_dependencies)
           spec_set = Bundler::SpecSet.new(result)
-
           last_resolve.merge spec_set
         end
       end

data/lib/bundler/patch/conservative_resolver.rb

@@ -3,11 +3,10 @@ module Bundler::Patch
     attr_accessor :locked_specs, :gems_to_update, :strict, :minor_preferred, :prefer_minimal
 
     def initialize(index, source_requirements, base)
-      # hack for 1.10 and 1.11+ support
       case Bundler::Resolver.instance_method(:initialize).arity
-      when 3
+      when 3 # 1.9 1.10
         super(index, source_requirements, base)
-      when 4
+      when 4 # 1.11 1.12
         super(index, source_requirements, base, nil)
       end
     end
@@ -74,48 +73,81 @@ module Bundler::Patch
     # reminder: sort still filters anything older than locked version
     def sort_specs(specs, locked_spec)
       return specs unless locked_spec
-      gem_name = locked_spec.name
-      locked_version = locked_spec.version
+      @gem_name = locked_spec.name
+      @locked_version = locked_spec.version
 
-      filtered = specs.select { |s| s.first.version >= locked_version }
+      filtered = specs.select { |s| s.first.version >= @locked_version }
 
-      filtered.sort do |a, b|
-        a_ver = a.first.version
-        b_ver = b.first.version
-        gem_patch = @gems_to_update.gem_patch_for(gem_name)
-        new_version = gem_patch ? gem_patch.new_version : nil
+      @gem_patch = @gems_to_update.gem_patch_for(@gem_name)
+      @new_version = @gem_patch ? @gem_patch.new_version : nil
+
+      result = filtered.sort do |a, b|
+        @a_ver = a.first.version
+        @b_ver = b.first.version
         case
-        when a_ver.segments[0] != b_ver.segments[0]
-          b_ver <=> a_ver
-        when !@minor_preferred && (a_ver.segments[1] != b_ver.segments[1])
-          b_ver <=> a_ver
-        when @prefer_minimal && !@gems_to_update.unlocking_gem?(gem_name)
-          b_ver <=> a_ver
-        when @prefer_minimal && @gems_to_update.unlocking_gem?(gem_name) &&
-          (![a_ver, b_ver].include?(locked_version) &&
-            (!new_version || (new_version && a_ver >= new_version && b_ver >= new_version)))
-          b_ver <=> a_ver
-        else
-          a_ver <=> b_ver
-        end
-      end.tap do |result|
-        if @gems_to_update.unlocking_gem?(gem_name)
-          gem_patch = @gems_to_update.gem_patch_for(gem_name)
-          if gem_patch && gem_patch.new_version && @prefer_minimal
-            move_version_to_end(specs, gem_patch.new_version, result)
-          end
+        when segments_do_not_match(:major)
+          @b_ver <=> @a_ver
+        when !@minor_preferred && segments_do_not_match(:minor)
+          @b_ver <=> @a_ver
+        when @prefer_minimal && !unlocking_gem?
+          @b_ver <=> @a_ver
+        when @prefer_minimal && unlocking_gem? &&
+          (neither_version_matches(@locked_version) &&
+            (!@new_version || both_versions_gt_or_equal_to_version(@new_version)))
+          @b_ver <=> @a_ver
         else
-          move_version_to_end(specs, locked_version, result)
+          @a_ver <=> @b_ver
         end
       end
+      post_sort(result)
     end
 
-    def move_version_to_end(specs, version, result)
-      spec_group = specs.detect { |s| s.first.version.to_s == version.to_s }
-      if spec_group
-        result.reject! { |s| s.first.version.to_s === version.to_s }
-        result << spec_group
+    def post_sort(result)
+      unless unlocking_gem?
+        result = move_version_to_end(result, @locked_version)
+      end
+
+      if @new_version && unlocking_gem? && segments_match(:major, @new_version, @locked_version)
+        if @prefer_minimal || (!@prefer_minimal && (result.last.first.version < @new_version))
+          result = move_version_to_end(result, @new_version)
+        end
       end
+
+      result
+    end
+
+    def unlocking_gem?
+      @gems_to_update.unlocking_gem?(@gem_name)
+    end
+
+    def either_version_older_than_locked(locked_version)
+      @a_ver < locked_version || @b_ver < locked_version
+    end
+
+    def segments_match(level, a_ver=@a_ver, b_ver=@b_ver)
+      !segments_do_not_match(level, a_ver, b_ver)
+    end
+
+    def segments_do_not_match(level, a_ver=@a_ver, b_ver=@b_ver)
+      index = [:major, :minor].index(level)
+      a_ver.segments[index] != b_ver.segments[index]
+    end
+
+    def neither_version_matches(match_version)
+      !one_version_matches(match_version)
+    end
+
+    def one_version_matches(match_version)
+      [@a_ver, @b_ver].include?(match_version)
+    end
+
+    def both_versions_gt_or_equal_to_version(version)
+      version && @a_ver >= version && @b_ver >= version
+    end
+
+    def move_version_to_end(result, version)
+      move, keep = result.partition { |s| s.first.version.to_s == version.to_s }
+      keep.concat(move)
     end
   end
 end

data/lib/bundler/patch/gem_version_patch_promoter.rb

@@ -0,0 +1,75 @@
+module Bundler::Patch
+  class GemVersionPatchPromoter < Bundler::GemVersionPromoter
+    attr_accessor :minimal, :gems_to_update
+
+    private
+
+    def sort_dep_specs(spec_groups, locked_spec)
+      result = super(spec_groups, locked_spec)
+      return result unless locked_spec
+
+      @gem_name = locked_spec.name
+      @locked_version = locked_spec.version
+      gem_patch = @gems_to_update.gem_patch_for(@gem_name)
+      @new_version = gem_patch ? gem_patch.new_version : nil
+
+      return result unless @minimal || @new_version
+
+      # STDERR.puts "during sort_versions: #{debug_format_result(spec_groups.first.first.name, result).inspect}" if ENV["DEBUG_RESOLVER"]
+
+      # Custom sort_by-ish behavior to minimize index calls.
+      result = result.map { |a| [result.index(a), a] }.sort do |(a_index, a), (b_index, b)|
+        @a_ver = a.version
+        @b_ver = b.version
+        case
+        when @minimal && unlocking_gem? &&
+          (neither_version_matches(@locked_version) &&
+            (!@new_version || both_versions_gt_or_equal_to_version(@new_version)))
+          @b_ver <=> @a_ver
+        else
+          a_index <=> b_index # no change in current ordering
+        end
+      end.map { |a| a.last }
+
+      post_sort(result)
+    end
+
+    def unlocking_gem?
+      @gems_to_update.unlocking_gem?(@gem_name)
+    end
+
+    def one_version_matches(match_version)
+      [@a_ver, @b_ver].include?(match_version)
+    end
+
+    def neither_version_matches(match_version)
+      !one_version_matches(match_version)
+    end
+
+    def both_versions_gt_or_equal_to_version(version)
+      version && @a_ver >= version && @b_ver >= version
+    end
+
+    # Sorting won't work properly for some specific arrangements to the end of the list because not
+    # all versions are compared in quicksort and the result isn't deterministic.
+    def post_sort(result)
+      result = super(result)
+
+      if @new_version && unlocking_gem? && segments_match(:major, @new_version, @locked_version)
+        if @minimal || (!@minimal && result.last.version < @new_version)
+          # This handles two cases:
+          # - minimal doesn't want to go past requested new_version
+          # - new_version is up a minor rev but level is :patch
+          result = move_version_to_end(result, @new_version)
+        end
+      end
+
+      result
+    end
+
+    def segments_match(level, a_ver, b_ver)
+      index = [:major, :minor].index(level)
+      a_ver.segments[index] == b_ver.segments[index]
+    end
+  end
+end

data/lib/bundler/patch/gemfile.rb

@@ -78,7 +78,7 @@ module Bundler::Patch
 
     def requirements_args_regexp
       ops = Gem::Requirement::OPS.keys.join "|"
-      re = /(\s*['\"]\s*(#{ops})?\s*#{Gem::Version::VERSION_PATTERN}\s*['"],*)+/
+      /(\s*['\"]\s*(#{ops})?\s*#{Gem::Version::VERSION_PATTERN}\s*['"],*)+/
     end
 
     # See Bundler::Dsl for reference

data/lib/bundler/patch/ruby_version.rb

@@ -1,9 +1,12 @@
 module Bundler::Patch
   class RubyVersion < UpdateSpec
+    RUBY_VERSION_LINE_REGEXPS = [/ruby\s+["'](.*)['"]/]
+
     def self.files
       {
         '.ruby-version' => [/.*/],
-        'Gemfile' => [/ruby\s+["'](.*)['"]/]
+        'Gemfile' => RUBY_VERSION_LINE_REGEXPS,
+        'gems.rb' => RUBY_VERSION_LINE_REGEXPS,
       }
     end
 

data/lib/bundler/patch/updater.rb

@@ -71,15 +71,3 @@ module Bundler::Patch
     end
   end
 end
-
-# def prep_git_checkout(spec)
-#   Dir.chdir(spec.target_dir) do
-#     status_first_line = `git status`.split("\n").first
-#     raise "Not on master: #{status_first_line}" unless status_first_line == '# On branch master'
-#
-#     raise 'Uncommitted files' unless `git status --porcelain`.chomp.empty?
-#
-#     verbose_puts `git pull`
-#   end
-# end
-

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-patch
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-advise
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler-fixture
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +104,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 description: 
 email:
 - chrismo@clabs.org
@@ -126,6 +126,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- BUNDLER.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -139,6 +140,7 @@ files:
 - lib/bundler/patch/cli.rb
 - lib/bundler/patch/conservative_definition.rb
 - lib/bundler/patch/conservative_resolver.rb
+- lib/bundler/patch/gem_version_patch_promoter.rb
 - lib/bundler/patch/gemfile.rb
 - lib/bundler/patch/gems_to_patch_reconciler.rb
 - lib/bundler/patch/ruby_version.rb
@@ -164,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Conservative bundler updates