Consider prerelease versions last if in Gemfile as non-prerelease

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index cc87bcb0cb..fcd893fa77 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -42,6 +42,7 @@ module Bundler
     end
 
     def start(requirements)
+      @initial_requirements = requirements
       verify_gemfile_dependencies_are_found!(requirements)
       dg = @resolver.resolve(requirements, @base_dg)
       dg.map(&:payload).
@@ -100,6 +101,15 @@ module Bundler
       search = @search_for[dependency] ||= begin
         index = index_for(dependency)
         results = index.search(dependency, @base[dependency.name])
+
+        inital_requirement = @initial_requirements.find {|req| req.name == dependency.name }
+        if inital_requirement && !inital_requirement.requirement.prerelease?
+          # Move prereleases to the beginning of the list, so they're considered
+          # last during resolution.
+          pre, results = results.partition {|spec| spec.version.prerelease? }
+          results = pre + results
+        end
+
         if vertex = @base_dg.vertex_named(dependency.name)
           locked_requirement = vertex.payload.requirement
         end