Removes support for Ruby 2.4 as EOL

This commit is contained in:
erwanlr
2020-04-12 18:21:23 +02:00
parent c362527903
commit 57c6c2d471
6 changed files with 23 additions and 29 deletions

View File

@@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
ruby: [2.4, 2.5, 2.6, 2.7]
ruby: [2.5, 2.6, 2.7]
steps:
- name: Checkout code

View File

@@ -1,6 +1,6 @@
require: rubocop-performance
AllCops:
TargetRubyVersion: 2.4
TargetRubyVersion: 2.5
Exclude:
- '*.gemspec'
- 'vendor/**/*'

View File

@@ -68,11 +68,9 @@ module WPScan
extracted_versions = extracted_versions.select { |x| x =~ /[0-9]+/ }
sorted = extracted_versions.sort do |x, y|
begin
Gem::Version.new(x) <=> Gem::Version.new(y)
rescue StandardError
0
end
Gem::Version.new(x) <=> Gem::Version.new(y)
rescue StandardError
0
end
sorted.last

View File

@@ -139,24 +139,22 @@ module WPScan
updated = []
FILES.each do |filename|
begin
db_checksum = remote_file_checksum(filename)
db_checksum = remote_file_checksum(filename)
# Checking if the file needs to be updated
next if File.exist?(local_file_path(filename)) && db_checksum == local_file_checksum(filename)
# Checking if the file needs to be updated
next if File.exist?(local_file_path(filename)) && db_checksum == local_file_checksum(filename)
create_backup(filename)
dl_checksum = download(filename)
create_backup(filename)
dl_checksum = download(filename)
raise Error::ChecksumsMismatch, filename unless dl_checksum == db_checksum
raise Error::ChecksumsMismatch, filename unless dl_checksum == db_checksum
updated << filename
rescue StandardError => e
restore_backup(filename)
raise e
ensure
delete_backup(filename) if File.exist?(backup_file_path(filename))
end
updated << filename
rescue StandardError => e
restore_backup(filename)
raise e
ensure
delete_backup(filename) if File.exist?(backup_file_path(filename))
end
File.write(last_update_file, Time.now)

View File

@@ -21,13 +21,11 @@ module WPScan
parsers = ALLOWED_PARSERS.include?(self.class::PARSER) ? [self.class::PARSER] : ALLOWED_PARSERS
parsers.each do |parser|
begin
parsed = parser.respond_to?(:safe_load) ? parser.safe_load(body) : parser.load(body)
parsed = parser.respond_to?(:safe_load) ? parser.safe_load(body) : parser.load(body)
return parsed if parsed.is_a?(Hash) || parsed.is_a?(Array)
rescue StandardError
next
end
return parsed if parsed.is_a?(Hash) || parsed.is_a?(Array)
rescue StandardError
next
end
nil # Make sure nil is returned in case none of the parsers managed to parse the body correctly

View File

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
s.name = 'wpscan'
s.version = WPScan::VERSION
s.platform = Gem::Platform::RUBY
s.required_ruby_version = '>= 2.4'
s.required_ruby_version = '>= 2.5'
s.authors = ['WPScanTeam']
s.date = Time.now.utc.strftime('%Y-%m-%d')
s.email = ['team@wpscan.org']
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.executables = ['wpscan']
s.require_paths = ['lib']
s.add_dependency 'cms_scanner', '~> 0.8.6'
s.add_dependency 'cms_scanner', '~> 0.9.0'
s.add_development_dependency 'bundler', '>= 1.6'
s.add_development_dependency 'memory_profiler', '~> 0.9.13'