diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-02 14:45:10 +0100 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-13 15:41:12 +0100 |
| commit | e2d839fb7e711aa420a0f0165618bbb3b381b2ba (patch) | |
| tree | fa2453110cc50c59c662d7ae6ab9f464341df0cd | |
| parent | ac282dc9de5e20db85e9cdf23b97763a2a2cc292 (diff) | |
| download | bundler-e2d839fb7e711aa420a0f0165618bbb3b381b2ba.tar.gz | |
Remove LessThanProc
| -rw-r--r-- | spec/spec_helper.rb | 6 | ||||
| -rw-r--r-- | spec/support/less_than_proc.rb | 20 | ||||
| -rw-r--r-- | spec/support/requirement_checker.rb | 11 |
3 files changed, 14 insertions, 23 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fc085a4b10..4cc15d2b4c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -84,10 +84,10 @@ RSpec.configure do |config| config.filter_run_excluding :realworld => true end - config.filter_run_excluding :ruby => LessThanProc.with(RUBY_VERSION) - config.filter_run_excluding :rubygems => LessThanProc.with(Gem::VERSION) + config.filter_run_excluding :ruby => RequirementChecker.against(RUBY_VERSION) + config.filter_run_excluding :rubygems => RequirementChecker.against(Gem::VERSION) config.filter_run_excluding :rubygems_master => (ENV["RGV"] != "master") - config.filter_run_excluding :bundler => LessThanProc.with(Bundler::VERSION.split(".")[0, 2].join(".")) + config.filter_run_excluding :bundler => RequirementChecker.against(Bundler::VERSION.split(".")[0, 2].join(".")) config.filter_run_excluding :ruby_repo => !(ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]).nil? config.filter_run_when_matching :focus unless ENV["CI"] diff --git a/spec/support/less_than_proc.rb b/spec/support/less_than_proc.rb deleted file mode 100644 index 68d37b44c9..0000000000 --- a/spec/support/less_than_proc.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -class LessThanProc < Proc - attr_accessor :present - - def self.with(present) - provided = Gem::Version.new(present.dup) - new do |required| - if required.is_a?(String) && required =~ /[=><~]/ - !Gem::Requirement.new(required).satisfied_by?(provided) - else - provided < Gem::Version.new(required) - end - end.tap {|l| l.present = present } - end - - def inspect - "\"=< #{present}\"" - end -end diff --git a/spec/support/requirement_checker.rb b/spec/support/requirement_checker.rb new file mode 100644 index 0000000000..d8f5fd5e5f --- /dev/null +++ b/spec/support/requirement_checker.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class RequirementChecker < Proc + def self.against(present) + provided = Gem::Version.new(present) + + new do |required| + !Gem::Requirement.new(required).satisfied_by?(provided) + end + end +end |