From 41f6433b5807613a22d2b0c430d650bd9dca8519 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 20 Aug 2019 13:50:04 +0200 Subject: [PATCH] Remove "require" deprecated by Zeitwerk --- app/jobs/ssl_sync_job.rb | 3 ++- app/jobs/whois_sync_job.rb | 3 ++- app/services/notifier.rb | 2 -- app/services/null_logger.rb | 2 -- app/services/ssl.rb | 6 ------ app/services/ssl/parser.rb | 3 --- app/services/system_command.rb | 3 --- app/services/whois.rb | 6 ------ app/services/whois/parser.rb | 10 ---------- app/services/whois/parser/afilias.rb | 4 ---- app/services/whois/parser/afnic.rb | 4 ---- app/services/whois/parser/base.rb | 3 --- app/services/whois/parser/cira.rb | 4 ---- app/services/whois/parser/entry/blank.rb | 2 -- app/services/whois/parser/entry/field.rb | 2 -- app/services/whois/parser/entry/text.rb | 2 -- app/services/whois/parser/entry_builder.rb | 4 ---- app/services/whois/parser/io.rb | 4 ---- app/services/whois/parser/neustar.rb | 4 ---- app/services/whois/parser/sonic.rb | 4 ---- app/services/whois/parser/verisign.rb | 4 ---- lib/tasks/checks.rake | 2 -- lib/tasks/notifications.rake | 2 -- test/helpers/domain_helper_test.rb | 1 - test/services/check_logger_test.rb | 2 -- test/services/notifier/resolver_test.rb | 1 - test/services/notifier_test.rb | 1 - test/services/ssl/parser_test.rb | 2 -- test/services/ssl_test.rb | 2 -- test/services/system_command_test.rb | 1 - test/services/whois/parser/afilias_test.rb | 3 --- test/services/whois/parser/afnic_test.rb | 3 --- test/services/whois/parser/cira_test.rb | 3 --- test/services/whois/parser/io_test.rb | 3 --- test/services/whois/parser/neustar_test.rb | 3 --- test/services/whois/parser/sonic_test.rb | 3 --- test/services/whois/parser/verisign_test.rb | 3 --- test/services/whois/parser_test.rb | 2 -- test/services/whois_test.rb | 2 -- test/test_helper.rb | 2 -- test/test_mocks_helper.rb | 2 -- 41 files changed, 4 insertions(+), 118 deletions(-) diff --git a/app/jobs/ssl_sync_job.rb b/app/jobs/ssl_sync_job.rb index 6027278..47c3696 100644 --- a/app/jobs/ssl_sync_job.rb +++ b/app/jobs/ssl_sync_job.rb @@ -1,4 +1,5 @@ -# require "ssl/errors" +# Copyright (C) 2018 Colin Darie , 2018 Evolix +# License: GNU AGPL-3+ (see full text in LICENSE file) class SSLSyncJob < ApplicationJob queue_as :default diff --git a/app/jobs/whois_sync_job.rb b/app/jobs/whois_sync_job.rb index 2902907..9388e54 100644 --- a/app/jobs/whois_sync_job.rb +++ b/app/jobs/whois_sync_job.rb @@ -1,4 +1,5 @@ -# require "whois/errors" +# Copyright (C) 2018 Colin Darie , 2018 Evolix +# License: GNU AGPL-3+ (see full text in LICENSE file) class WhoisSyncJob < ApplicationJob queue_as :default diff --git a/app/services/notifier.rb b/app/services/notifier.rb index 23400e7..92f68f7 100644 --- a/app/services/notifier.rb +++ b/app/services/notifier.rb @@ -1,8 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "notifier/processor" - module Notifier class << self def process_all(configuration = nil) diff --git a/app/services/null_logger.rb b/app/services/null_logger.rb index ff68cea..fc4b09b 100644 --- a/app/services/null_logger.rb +++ b/app/services/null_logger.rb @@ -1,6 +1,4 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "naught" - NullLogger = Naught.build diff --git a/app/services/ssl.rb b/app/services/ssl.rb index 19a916a..75eb0e3 100644 --- a/app/services/ssl.rb +++ b/app/services/ssl.rb @@ -1,12 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "null_logger" -# require "system_command" -# require_relative "ssl/parser" -# require_relative "ssl/response" -# require_relative "ssl/errors" - module SSL class Error < StandardError; end diff --git a/app/services/ssl/parser.rb b/app/services/ssl/parser.rb index deb04ee..a224d43 100644 --- a/app/services/ssl/parser.rb +++ b/app/services/ssl/parser.rb @@ -1,9 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "null_logger" -# require "ssl/errors" - module SSL class Parser DATE_REGEX = /will expire on (.+)\./ diff --git a/app/services/system_command.rb b/app/services/system_command.rb index 3ad7e6e..c216be9 100644 --- a/app/services/system_command.rb +++ b/app/services/system_command.rb @@ -1,9 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "open4" -# require "null_logger" - class SystemCommand Result = Struct.new(:command, :exit_status, :stdout, :stderr) class NotAllowedError < StandardError; end diff --git a/app/services/whois.rb b/app/services/whois.rb index 7c56234..4da3127 100644 --- a/app/services/whois.rb +++ b/app/services/whois.rb @@ -1,12 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "null_logger" -# require "domain_helper" -# require "system_command" -# require_relative "whois/parser" -# require_relative "whois/response" -# require_relative "whois/errors" module Whois class Error < StandardError; end diff --git a/app/services/whois/parser.rb b/app/services/whois/parser.rb index 9663d7d..d44631a 100644 --- a/app/services/whois/parser.rb +++ b/app/services/whois/parser.rb @@ -1,16 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "null_logger" -# require "whois/errors" -# require "whois/parser/afilias" -# require "whois/parser/afnic" -# require "whois/parser/cira" -# require "whois/parser/io" -# require "whois/parser/neustar" -# require "whois/parser/sonic" -# require "whois/parser/verisign" - module Whois module Parser PARSERS = [ diff --git a/app/services/whois/parser/afilias.rb b/app/services/whois/parser/afilias.rb index 8721bbc..56daed7 100644 --- a/app/services/whois/parser/afilias.rb +++ b/app/services/whois/parser/afilias.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "domain_helper" -# require "whois/errors" -# require_relative "base" - module Whois module Parser class Afilias < Base diff --git a/app/services/whois/parser/afnic.rb b/app/services/whois/parser/afnic.rb index 02880df..459e073 100644 --- a/app/services/whois/parser/afnic.rb +++ b/app/services/whois/parser/afnic.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "domain_helper" -# require "whois/errors" -# require_relative "base" - module Whois module Parser class AFNIC < Base diff --git a/app/services/whois/parser/base.rb b/app/services/whois/parser/base.rb index c435e04..98e3410 100644 --- a/app/services/whois/parser/base.rb +++ b/app/services/whois/parser/base.rb @@ -1,10 +1,7 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "null_logger" require_relative "../response" -# require_relative "../errors" -# require_relative "entry_builder" module Whois module Parser diff --git a/app/services/whois/parser/cira.rb b/app/services/whois/parser/cira.rb index 3d8dcfb..4d13185 100644 --- a/app/services/whois/parser/cira.rb +++ b/app/services/whois/parser/cira.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "domain_helper" -# require "whois/errors" -# require_relative "base" - module Whois module Parser class CIRA < Base diff --git a/app/services/whois/parser/entry/blank.rb b/app/services/whois/parser/entry/blank.rb index eebac1c..2043ae7 100644 --- a/app/services/whois/parser/entry/blank.rb +++ b/app/services/whois/parser/entry/blank.rb @@ -1,8 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require_relative "base" - module Whois module Parser module Entry diff --git a/app/services/whois/parser/entry/field.rb b/app/services/whois/parser/entry/field.rb index dec73bf..d7751ec 100644 --- a/app/services/whois/parser/entry/field.rb +++ b/app/services/whois/parser/entry/field.rb @@ -1,8 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require_relative "base" - module Whois module Parser module Entry diff --git a/app/services/whois/parser/entry/text.rb b/app/services/whois/parser/entry/text.rb index 15c1680..f7acfa6 100644 --- a/app/services/whois/parser/entry/text.rb +++ b/app/services/whois/parser/entry/text.rb @@ -1,8 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require_relative "base" - module Whois module Parser module Entry diff --git a/app/services/whois/parser/entry_builder.rb b/app/services/whois/parser/entry_builder.rb index eefba09..37e6b37 100644 --- a/app/services/whois/parser/entry_builder.rb +++ b/app/services/whois/parser/entry_builder.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require_relative "entry/blank" -# require_relative "entry/field" -# require_relative "entry/text" - module Whois module Parser class EntryBuilder diff --git a/app/services/whois/parser/io.rb b/app/services/whois/parser/io.rb index 3f12068..fe08fa4 100644 --- a/app/services/whois/parser/io.rb +++ b/app/services/whois/parser/io.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "domain_helper" -# require "whois/errors" -# require_relative "base" - module Whois module Parser class IO < Base diff --git a/app/services/whois/parser/neustar.rb b/app/services/whois/parser/neustar.rb index b535f65..303de75 100644 --- a/app/services/whois/parser/neustar.rb +++ b/app/services/whois/parser/neustar.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "domain_helper" -# require "whois/errors" -# require_relative "base" - module Whois module Parser class Neustar < Base diff --git a/app/services/whois/parser/sonic.rb b/app/services/whois/parser/sonic.rb index b0b1c80..406d7a4 100644 --- a/app/services/whois/parser/sonic.rb +++ b/app/services/whois/parser/sonic.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "domain_helper" -# require "whois/errors" -# require_relative "base" - module Whois module Parser class Sonic < Base diff --git a/app/services/whois/parser/verisign.rb b/app/services/whois/parser/verisign.rb index 2b3019f..7943ece 100644 --- a/app/services/whois/parser/verisign.rb +++ b/app/services/whois/parser/verisign.rb @@ -1,10 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "domain_helper" -# require "whois/errors" -# require_relative "base" - module Whois module Parser class Verisign < Base diff --git a/lib/tasks/checks.rake b/lib/tasks/checks.rake index ce7a0d4..ac0f3c6 100644 --- a/lib/tasks/checks.rake +++ b/lib/tasks/checks.rake @@ -1,8 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "null_logger" - namespace :checks do namespace :sync_dates do task all: [:domain, :ssl] diff --git a/lib/tasks/notifications.rake b/lib/tasks/notifications.rake index 4bd53d6..0696d50 100644 --- a/lib/tasks/notifications.rake +++ b/lib/tasks/notifications.rake @@ -1,8 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "services/notifier" - namespace :notifications do desc "Send all notifications after checks have been performend" task send_all: :environment do diff --git a/test/helpers/domain_helper_test.rb b/test/helpers/domain_helper_test.rb index 857c3cf..accb74f 100644 --- a/test/helpers/domain_helper_test.rb +++ b/test/helpers/domain_helper_test.rb @@ -2,7 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "domain_helper" class DomainHelperTest < ActiveSupport::TestCase include DomainHelper diff --git a/test/services/check_logger_test.rb b/test/services/check_logger_test.rb index 7678968..15c2e01 100644 --- a/test/services/check_logger_test.rb +++ b/test/services/check_logger_test.rb @@ -2,8 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "check_logger" -# require "system_command" class CheckLoggerTest < ActiveSupport::TestCase setup do diff --git a/test/services/notifier/resolver_test.rb b/test/services/notifier/resolver_test.rb index 20335d2..80d09b2 100644 --- a/test/services/notifier/resolver_test.rb +++ b/test/services/notifier/resolver_test.rb @@ -2,7 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "notifier/resolver" # rubocop:disable Metrics/LineLength module Notifier diff --git a/test/services/notifier_test.rb b/test/services/notifier_test.rb index c75863b..bfa66be 100644 --- a/test/services/notifier_test.rb +++ b/test/services/notifier_test.rb @@ -2,7 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "notifier" class NotifierTest < ActiveSupport::TestCase test "#process_all process expirable & failures notifications" do diff --git a/test/services/ssl/parser_test.rb b/test/services/ssl/parser_test.rb index b1d69ae..da363c9 100644 --- a/test/services/ssl/parser_test.rb +++ b/test/services/ssl/parser_test.rb @@ -2,8 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "ssl/parser" -# require "ssl/errors" module SSL class ParserTest < ActiveSupport::TestCase diff --git a/test/services/ssl_test.rb b/test/services/ssl_test.rb index 151e4c2..d742643 100644 --- a/test/services/ssl_test.rb +++ b/test/services/ssl_test.rb @@ -2,8 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "ssl" -# require "system_command" module SSL class ServiceTest < ActiveSupport::TestCase diff --git a/test/services/system_command_test.rb b/test/services/system_command_test.rb index 9b0265c..7245f7c 100644 --- a/test/services/system_command_test.rb +++ b/test/services/system_command_test.rb @@ -2,7 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "system_command" class SystemCommandTest < ActiveSupport::TestCase test "should execute and log a command" do diff --git a/test/services/whois/parser/afilias_test.rb b/test/services/whois/parser/afilias_test.rb index 133a191..6fa8946 100644 --- a/test/services/whois/parser/afilias_test.rb +++ b/test/services/whois/parser/afilias_test.rb @@ -2,9 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser/afilias" -# require "whois/response" -# require "whois/errors" module Whois class AfiliasTest < ActiveSupport::TestCase diff --git a/test/services/whois/parser/afnic_test.rb b/test/services/whois/parser/afnic_test.rb index 02bea6d..2d88e1c 100644 --- a/test/services/whois/parser/afnic_test.rb +++ b/test/services/whois/parser/afnic_test.rb @@ -2,9 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser/afnic" -# require "whois/response" -# require "whois/errors" module Whois class AFNICTest < ActiveSupport::TestCase diff --git a/test/services/whois/parser/cira_test.rb b/test/services/whois/parser/cira_test.rb index cb538a3..681af0e 100644 --- a/test/services/whois/parser/cira_test.rb +++ b/test/services/whois/parser/cira_test.rb @@ -2,9 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser/cira" -# require "whois/response" -# require "whois/errors" module Whois class CIRATest < ActiveSupport::TestCase diff --git a/test/services/whois/parser/io_test.rb b/test/services/whois/parser/io_test.rb index 860c7f7..a43b0de 100644 --- a/test/services/whois/parser/io_test.rb +++ b/test/services/whois/parser/io_test.rb @@ -2,9 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser/io" -# require "whois/response" -# require "whois/errors" module Whois class IOTest < ActiveSupport::TestCase diff --git a/test/services/whois/parser/neustar_test.rb b/test/services/whois/parser/neustar_test.rb index 2feb98f..b1f2202 100644 --- a/test/services/whois/parser/neustar_test.rb +++ b/test/services/whois/parser/neustar_test.rb @@ -2,9 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser/neustar" -# require "whois/response" -# require "whois/errors" module Whois class NeustarTest < ActiveSupport::TestCase diff --git a/test/services/whois/parser/sonic_test.rb b/test/services/whois/parser/sonic_test.rb index ced02a5..ded5283 100644 --- a/test/services/whois/parser/sonic_test.rb +++ b/test/services/whois/parser/sonic_test.rb @@ -2,9 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser/sonic" -# require "whois/response" -# require "whois/errors" module Whois class SonicTest < ActiveSupport::TestCase diff --git a/test/services/whois/parser/verisign_test.rb b/test/services/whois/parser/verisign_test.rb index 411ef7e..c757830 100644 --- a/test/services/whois/parser/verisign_test.rb +++ b/test/services/whois/parser/verisign_test.rb @@ -2,9 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser/verisign" -# require "whois/response" -# require "whois/errors" module Whois class VerisignTest < ActiveSupport::TestCase diff --git a/test/services/whois/parser_test.rb b/test/services/whois/parser_test.rb index b68a44d..d8f7830 100644 --- a/test/services/whois/parser_test.rb +++ b/test/services/whois/parser_test.rb @@ -2,8 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois/parser" -# require "whois/errors" module Whois class ParserTest < ActiveSupport::TestCase diff --git a/test/services/whois_test.rb b/test/services/whois_test.rb index afa22cd..6ac3c58 100644 --- a/test/services/whois_test.rb +++ b/test/services/whois_test.rb @@ -2,8 +2,6 @@ # License: GNU AGPL-3+ (see full text in LICENSE file) require "test_helper" -# require "whois" -# require "system_command" module Whois class ServiceTest < ActiveSupport::TestCase diff --git a/test/test_helper.rb b/test/test_helper.rb index cac1e91..4e90c33 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -40,8 +40,6 @@ class ActiveSupport::TestCase end # Disable Open4 real system calls -# require "open4" -# require "errors" module Open4 def popen4(*) fail SystemCommand::NotAllowedError, diff --git a/test/test_mocks_helper.rb b/test/test_mocks_helper.rb index c91ab94..fc50806 100644 --- a/test/test_mocks_helper.rb +++ b/test/test_mocks_helper.rb @@ -1,8 +1,6 @@ # Copyright (C) 2018 Colin Darie , 2018 Evolix # License: GNU AGPL-3+ (see full text in LICENSE file) -# require "system_command" - module TestMocksHelper # rubocop:disable Metrics/MethodLength def mock_system_command(program, args, exit_status: 0, stdout: "", stderr: "")