summaryrefslogtreecommitdiff
path: root/lib/bundler/templates
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-07-23 15:25:28 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:29:59 +0900
commitbb50f87b69049d80117d40e194e91cb650a94f64 (patch)
tree34df3c8c5054b2664ea8da68499064860f0e96d2 /lib/bundler/templates
parentcb6abf551ab091760ec2c834ff3718f83efd5426 (diff)
[bundler/bundler] Add workaround from old rubygems
In these versions, the `approximate_recommendation` method doesn't include the prerelease logic. https://github.com/bundler/bundler/commit/caf13e9e4f
Diffstat (limited to 'lib/bundler/templates')
-rw-r--r--lib/bundler/templates/Executable.bundler10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/bundler/templates/Executable.bundler b/lib/bundler/templates/Executable.bundler
index 95748bba5e..69f26bb9c0 100644
--- a/lib/bundler/templates/Executable.bundler
+++ b/lib/bundler/templates/Executable.bundler
@@ -69,7 +69,15 @@ m = Module.new do
def bundler_requirement
return "#{Gem::Requirement.default}.a" unless bundler_version
- Gem::Version.new(bundler_version).approximate_recommendation
+ bundler_gem_version = Gem::Version.new(bundler_version)
+
+ requirement = bundler_gem_version.approximate_recommendation
+
+ return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+ requirement += ".a" if bundler_gem_version.prerelease?
+
+ requirement
end
def load_bundler!