Skip to content

Commit 79cf4d7

Browse files
committed
Use Gem::Version to compare RUBY_VERSION
1 parent a34d55b commit 79cf4d7

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

.simplecov

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Due to dependency resolution, on Ruby 2.x we're stuck with a _very_ old
44
# SimpleCov version, and it doesn't really give us any benefit to run coverage
55
# in separate ruby versions since we don't branch on ruby version in the code.
6-
return if RUBY_VERSION < "3.0"
6+
return if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
77
return if ENV["DISABLE_COVERAGE"] == "true"
88

99
# Output coverage as LCOV to support CodeCov

bin/console

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
require "bundler/setup"
55
require "aikido/zen"
6-
require "debug" if RUBY_VERSION >= "3.0"
6+
require "debug" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0")
77

88
# You can add fixtures and/or initialization code here to make experimenting
99
# with your gem easier. You can also use a different console, if you like.

lib/aikido/zen/sinks.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
# http.rb aims to support and is tested against Ruby 3.0+:
2323
# https://github.com/httprb/http?tab=readme-ov-file#supported-ruby-versions
24-
require_relative "sinks/http" if RUBY_VERSION >= "3.0"
24+
require_relative "sinks/http" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0")
2525

2626
require_relative "sinks/httpx"
2727
require_relative "sinks/httpclient"

test/aikido/zen/scanners/sql_injection_scanner_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def refute_attack(query, input = query, *args)
276276
end
277277

278278
test "it flags regular expression matching timeouts as attacks" do
279-
skip if RUBY_VERSION < "3.2"
279+
skip_if_ruby_lower_than("3.2")
280280

281281
begin
282282
timeout = Regexp.timeout

test/aikido/zen/sinks/async_http_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
# Async::HTTP only supports ruby 3.1+
4-
return if RUBY_VERSION < "3.1"
4+
return if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.1")
55

66
require "test_helper"
77
require "async/http/middleware/location_redirector"

test/aikido/zen/sinks/http_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# http.rb aims to support and is tested against Ruby 3.0+:
44
# https://github.com/httprb/http?tab=readme-ov-file#supported-ruby-versions
5-
return if RUBY_VERSION < "3.0"
5+
return if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
66

77
require "test_helper"
88

test/test_helper.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "bundler"
44
Bundler.setup
55

6-
require "simplecov-lcov" if RUBY_VERSION >= "3"
6+
require "simplecov-lcov" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0")
77
require "simplecov"
88

99
$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
@@ -16,7 +16,7 @@
1616
require "action_dispatch"
1717
require "action_dispatch/routing/inspector"
1818
require "pathname"
19-
require "debug" if RUBY_VERSION >= "3"
19+
require "debug" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0")
2020
require "support/capture_stream"
2121

2222
class FakeDetachedAgent
@@ -167,7 +167,7 @@ def assert_hash_subset_of(container, subset)
167167
end
168168

169169
def skip_if_ruby_lower_than(expected_ruby_version)
170-
if expected_ruby_version > RUBY_VERSION
170+
if Gem::Version.new(expected_ruby_version) > Gem::Version.new(RUBY_VERSION)
171171
skip "Skipping test #{__method__} because unexpected ruby version (#{RUBY_VERSION} < #{expected_ruby_version})"
172172
end
173173
end

0 commit comments

Comments
 (0)