summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-01-23 15:54:12 +0000
committerColby Swandale <me@colby.fyi>2019-04-01 22:47:03 +1100
commitd92c08cde859b270b903ff3b329426b7e38da2d1 (patch)
tree275420c8424dc1eefbe053ce82175fcaa81b43a8
parent0bddeb6ecc87842d2876c103c7b7b61e892b5ba5 (diff)
downloadbundler-d92c08cde859b270b903ff3b329426b7e38da2d1.tar.gz
Merge #6923
6923: Ignore `Object =~` warnings. r=segiddins a=hsbt ### What was the end-user problem that led to this PR? We faced a lot of warnings with `rake spec` of bundler repository. ### What was your diagnosis of the problem? Ruby 2.7.0-dev added the warnings for `Object =~` comparison. ### What is your fix for the problem, implemented in this PR? I added the additional condition and bump a version of the development dependency. Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> (cherry picked from commit e66e6f2fb7d595151bd77a342a07c9cd15e3cac0)
-rw-r--r--bundler.gemspec2
-rw-r--r--spec/support/less_than_proc.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundler.gemspec b/bundler.gemspec
index 7b31506536..2886042bbf 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "automatiek", "~> 0.1.0"
s.add_development_dependency "mustache", "0.99.6"
- s.add_development_dependency "rake", "~> 10.0"
+ s.add_development_dependency "rake", "~> 12.0"
s.add_development_dependency "rdiscount", "~> 2.2"
s.add_development_dependency "ronn", "~> 0.7.3"
s.add_development_dependency "rspec", "~> 3.6"
diff --git a/spec/support/less_than_proc.rb b/spec/support/less_than_proc.rb
index ddac5458b7..68d37b44c9 100644
--- a/spec/support/less_than_proc.rb
+++ b/spec/support/less_than_proc.rb
@@ -6,7 +6,7 @@ class LessThanProc < Proc
def self.with(present)
provided = Gem::Version.new(present.dup)
new do |required|
- if required =~ /[=><~]/
+ if required.is_a?(String) && required =~ /[=><~]/
!Gem::Requirement.new(required).satisfied_by?(provided)
else
provided < Gem::Version.new(required)