From 2c9f7662fcdcb52d59b72ba0fe7dc5f963de4904 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Thu, 31 Dec 2015 15:33:35 -0800 Subject: [PATCH] Freeze all string literals in source, fixes #2741 Tests pass and smoke test works perfectly. --- lib/sidekiq.rb | 1 + lib/sidekiq/api.rb | 1 + lib/sidekiq/cli.rb | 1 + lib/sidekiq/client.rb | 1 + lib/sidekiq/core_ext.rb | 1 + lib/sidekiq/exception_handler.rb | 1 + lib/sidekiq/extensions/action_mailer.rb | 1 + lib/sidekiq/extensions/active_record.rb | 1 + lib/sidekiq/extensions/class_methods.rb | 1 + lib/sidekiq/extensions/generic_proxy.rb | 1 + lib/sidekiq/fetch.rb | 1 + lib/sidekiq/launcher.rb | 1 + lib/sidekiq/logging.rb | 1 + lib/sidekiq/manager.rb | 1 + lib/sidekiq/middleware/chain.rb | 1 + lib/sidekiq/middleware/i18n.rb | 1 + lib/sidekiq/paginator.rb | 1 + lib/sidekiq/processor.rb | 1 + lib/sidekiq/rails.rb | 1 + lib/sidekiq/redis_connection.rb | 1 + lib/sidekiq/scheduled.rb | 1 + lib/sidekiq/testing.rb | 1 + lib/sidekiq/testing/inline.rb | 1 + lib/sidekiq/util.rb | 1 + lib/sidekiq/version.rb | 1 + lib/sidekiq/web.rb | 1 + lib/sidekiq/web_helpers.rb | 1 + lib/sidekiq/worker.rb | 1 + test/fake_env.rb | 1 + test/helper.rb | 1 + test/test_actors.rb | 1 + test/test_api.rb | 1 + test/test_cli.rb | 1 + test/test_client.rb | 1 + test/test_exception_handler.rb | 1 + test/test_extensions.rb | 1 + test/test_fetch.rb | 1 + test/test_launcher.rb | 1 + test/test_logging.rb | 1 + test/test_manager.rb | 1 + test/test_middleware.rb | 1 + test/test_processor.rb | 1 + test/test_rails.rb | 1 + test/test_redis_connection.rb | 1 + test/test_retry.rb | 1 + test/test_scheduled.rb | 1 + test/test_scheduling.rb | 1 + test/test_sidekiq.rb | 1 + test/test_testing.rb | 1 + test/test_testing_fake.rb | 1 + test/test_testing_inline.rb | 1 + test/test_util.rb | 1 + test/test_web.rb | 1 + test/test_web_helpers.rb | 1 + 54 files changed, 54 insertions(+) diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb index b6c75b60..50981ab7 100644 --- a/lib/sidekiq.rb +++ b/lib/sidekiq.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 require 'sidekiq/version' fail "Sidekiq #{Sidekiq::VERSION} does not support Ruby 1.9." if RUBY_PLATFORM != 'java' && RUBY_VERSION < '2.0.0' diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb index 66b313ce..f9913f7e 100644 --- a/lib/sidekiq/api.rb +++ b/lib/sidekiq/api.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 require 'sidekiq' diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb index 43e3848c..5534012b 100644 --- a/lib/sidekiq/cli.rb +++ b/lib/sidekiq/cli.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 $stdout.sync = true diff --git a/lib/sidekiq/client.rb b/lib/sidekiq/client.rb index 17970393..87c819ed 100644 --- a/lib/sidekiq/client.rb +++ b/lib/sidekiq/client.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'securerandom' require 'sidekiq/middleware/chain' diff --git a/lib/sidekiq/core_ext.rb b/lib/sidekiq/core_ext.rb index 1de78e3a..d1e43069 100644 --- a/lib/sidekiq/core_ext.rb +++ b/lib/sidekiq/core_ext.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true begin require 'active_support/core_ext/class/attribute' rescue LoadError diff --git a/lib/sidekiq/exception_handler.rb b/lib/sidekiq/exception_handler.rb index a788c9a3..8a6530ba 100644 --- a/lib/sidekiq/exception_handler.rb +++ b/lib/sidekiq/exception_handler.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq' module Sidekiq diff --git a/lib/sidekiq/extensions/action_mailer.rb b/lib/sidekiq/extensions/action_mailer.rb index 34de4d34..b962e199 100644 --- a/lib/sidekiq/extensions/action_mailer.rb +++ b/lib/sidekiq/extensions/action_mailer.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq/extensions/generic_proxy' module Sidekiq diff --git a/lib/sidekiq/extensions/active_record.rb b/lib/sidekiq/extensions/active_record.rb index 24b38dbc..9ec17418 100644 --- a/lib/sidekiq/extensions/active_record.rb +++ b/lib/sidekiq/extensions/active_record.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq/extensions/generic_proxy' module Sidekiq diff --git a/lib/sidekiq/extensions/class_methods.rb b/lib/sidekiq/extensions/class_methods.rb index bfdcba80..fcd0b663 100644 --- a/lib/sidekiq/extensions/class_methods.rb +++ b/lib/sidekiq/extensions/class_methods.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq/extensions/generic_proxy' module Sidekiq diff --git a/lib/sidekiq/extensions/generic_proxy.rb b/lib/sidekiq/extensions/generic_proxy.rb index 00fd2796..42cc9d26 100644 --- a/lib/sidekiq/extensions/generic_proxy.rb +++ b/lib/sidekiq/extensions/generic_proxy.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'yaml' module Sidekiq diff --git a/lib/sidekiq/fetch.rb b/lib/sidekiq/fetch.rb index 64c33aaa..0f0fa6f2 100644 --- a/lib/sidekiq/fetch.rb +++ b/lib/sidekiq/fetch.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq' module Sidekiq diff --git a/lib/sidekiq/launcher.rb b/lib/sidekiq/launcher.rb index 2fafde4d..65b7c031 100644 --- a/lib/sidekiq/launcher.rb +++ b/lib/sidekiq/launcher.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 require 'sidekiq/manager' require 'sidekiq/fetch' diff --git a/lib/sidekiq/logging.rb b/lib/sidekiq/logging.rb index fa18ffda..f566f2f7 100644 --- a/lib/sidekiq/logging.rb +++ b/lib/sidekiq/logging.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'time' require 'logger' diff --git a/lib/sidekiq/manager.rb b/lib/sidekiq/manager.rb index 8a7edb66..0061a2e9 100644 --- a/lib/sidekiq/manager.rb +++ b/lib/sidekiq/manager.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 require 'sidekiq/util' require 'sidekiq/processor' diff --git a/lib/sidekiq/middleware/chain.rb b/lib/sidekiq/middleware/chain.rb index 2b12782e..ec963c6e 100644 --- a/lib/sidekiq/middleware/chain.rb +++ b/lib/sidekiq/middleware/chain.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true module Sidekiq # Middleware is code configured to run before/after # a message is processed. It is patterned after Rack diff --git a/lib/sidekiq/middleware/i18n.rb b/lib/sidekiq/middleware/i18n.rb index 075e976f..ed59ac7e 100644 --- a/lib/sidekiq/middleware/i18n.rb +++ b/lib/sidekiq/middleware/i18n.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # Simple middleware to save the current locale and restore it when the job executes. # Use it by requiring it in your initializer: diff --git a/lib/sidekiq/paginator.rb b/lib/sidekiq/paginator.rb index 87ad3c56..829f5a78 100644 --- a/lib/sidekiq/paginator.rb +++ b/lib/sidekiq/paginator.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true module Sidekiq module Paginator diff --git a/lib/sidekiq/processor.rb b/lib/sidekiq/processor.rb index 754a4541..b6ab241e 100644 --- a/lib/sidekiq/processor.rb +++ b/lib/sidekiq/processor.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq/util' require 'sidekiq/fetch' require 'thread' diff --git a/lib/sidekiq/rails.rb b/lib/sidekiq/rails.rb index fed3d1d0..a8f6b040 100644 --- a/lib/sidekiq/rails.rb +++ b/lib/sidekiq/rails.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true module Sidekiq def self.hook_rails! return if defined?(@delay_removed) diff --git a/lib/sidekiq/redis_connection.rb b/lib/sidekiq/redis_connection.rb index ffb513ba..f6de188b 100644 --- a/lib/sidekiq/redis_connection.rb +++ b/lib/sidekiq/redis_connection.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'connection_pool' require 'redis' require 'uri' diff --git a/lib/sidekiq/scheduled.rb b/lib/sidekiq/scheduled.rb index 6f138d4b..f6b634f5 100644 --- a/lib/sidekiq/scheduled.rb +++ b/lib/sidekiq/scheduled.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq' require 'sidekiq/util' require 'sidekiq/api' diff --git a/lib/sidekiq/testing.rb b/lib/sidekiq/testing.rb index d236db97..91384296 100644 --- a/lib/sidekiq/testing.rb +++ b/lib/sidekiq/testing.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'securerandom' require 'sidekiq' diff --git a/lib/sidekiq/testing/inline.rb b/lib/sidekiq/testing/inline.rb index a2cb76a4..4ca64e44 100644 --- a/lib/sidekiq/testing/inline.rb +++ b/lib/sidekiq/testing/inline.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq/testing' ## diff --git a/lib/sidekiq/util.rb b/lib/sidekiq/util.rb index f079e476..02f338a2 100644 --- a/lib/sidekiq/util.rb +++ b/lib/sidekiq/util.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'socket' require 'securerandom' require 'sidekiq/exception_handler' diff --git a/lib/sidekiq/version.rb b/lib/sidekiq/version.rb index 24e571a6..42521b4a 100644 --- a/lib/sidekiq/version.rb +++ b/lib/sidekiq/version.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true module Sidekiq VERSION = "4.0.2" end diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index 82651b7e..22a4837c 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'erb' require 'yaml' require 'sinatra/base' diff --git a/lib/sidekiq/web_helpers.rb b/lib/sidekiq/web_helpers.rb index a49c5c33..fbf0e01c 100644 --- a/lib/sidekiq/web_helpers.rb +++ b/lib/sidekiq/web_helpers.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'uri' module Sidekiq diff --git a/lib/sidekiq/worker.rb b/lib/sidekiq/worker.rb index 0ab9c5bf..bc0952e4 100644 --- a/lib/sidekiq/worker.rb +++ b/lib/sidekiq/worker.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'sidekiq/client' require 'sidekiq/core_ext' diff --git a/test/fake_env.rb b/test/fake_env.rb index e69de29b..8e9b8f90 100644 --- a/test/fake_env.rb +++ b/test/fake_env.rb @@ -0,0 +1 @@ +# frozen_string_literal: true diff --git a/test/helper.rb b/test/helper.rb index a1bf4235..5c92b0f4 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true $TESTING = true # disable minitest/parallel threads ENV["N"] = "0" diff --git a/test/test_actors.rb b/test/test_actors.rb index d25f18cb..7f76484f 100644 --- a/test/test_actors.rb +++ b/test/test_actors.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/cli' require 'sidekiq/fetch' diff --git a/test/test_api.rb b/test/test_api.rb index 0c2b7ae1..9d117772 100644 --- a/test/test_api.rb +++ b/test/test_api.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/api' require 'active_job' diff --git a/test/test_cli.rb b/test/test_cli.rb index 11c88279..eb0d75e5 100644 --- a/test/test_cli.rb +++ b/test/test_cli.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/cli' require 'tempfile' diff --git a/test/test_client.rb b/test/test_client.rb index d9eccb47..c9d9fc35 100644 --- a/test/test_client.rb +++ b/test/test_client.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' class TestClient < Sidekiq::Test diff --git a/test/test_exception_handler.rb b/test/test_exception_handler.rb index e9e1aecc..ce8a8bbc 100644 --- a/test/test_exception_handler.rb +++ b/test/test_exception_handler.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/exception_handler' require 'stringio' diff --git a/test/test_extensions.rb b/test/test_extensions.rb index 10485cba..3dd38b8d 100644 --- a/test/test_extensions.rb +++ b/test/test_extensions.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq' require 'active_record' diff --git a/test/test_fetch.rb b/test/test_fetch.rb index fd0da2d5..ca8caeaf 100644 --- a/test/test_fetch.rb +++ b/test/test_fetch.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/fetch' diff --git a/test/test_launcher.rb b/test/test_launcher.rb index b177a0f2..03e786f6 100644 --- a/test/test_launcher.rb +++ b/test/test_launcher.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/launcher' diff --git a/test/test_logging.rb b/test/test_logging.rb index 7780fb25..efddf091 100644 --- a/test/test_logging.rb +++ b/test/test_logging.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/logging' diff --git a/test/test_manager.rb b/test/test_manager.rb index c9b4995a..f26b5380 100644 --- a/test/test_manager.rb +++ b/test/test_manager.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/manager' diff --git a/test/test_middleware.rb b/test/test_middleware.rb index f245964d..e11ad0cf 100644 --- a/test/test_middleware.rb +++ b/test/test_middleware.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/middleware/chain' require 'sidekiq/processor' diff --git a/test/test_processor.rb b/test/test_processor.rb index 732b9a7f..bb7d0690 100644 --- a/test/test_processor.rb +++ b/test/test_processor.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/fetch' require 'sidekiq/cli' diff --git a/test/test_rails.rb b/test/test_rails.rb index 62a4dbbb..95a75f7f 100644 --- a/test/test_rails.rb +++ b/test/test_rails.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' $HAS_AJ = true diff --git a/test/test_redis_connection.rb b/test/test_redis_connection.rb index 02b1f990..8ecd2b39 100644 --- a/test/test_redis_connection.rb +++ b/test/test_redis_connection.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' class TestRedisConnection < Sidekiq::Test diff --git a/test/test_retry.rb b/test/test_retry.rb index c5f34a23..92defcc8 100644 --- a/test/test_retry.rb +++ b/test/test_retry.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 require_relative 'helper' require 'sidekiq/scheduled' diff --git a/test/test_scheduled.rb b/test/test_scheduled.rb index 95e7ec6e..3219d28f 100644 --- a/test/test_scheduled.rb +++ b/test/test_scheduled.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/scheduled' diff --git a/test/test_scheduling.rb b/test/test_scheduling.rb index 8cb0654e..0d3e4dc6 100644 --- a/test/test_scheduling.rb +++ b/test/test_scheduling.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'sidekiq/scheduled' diff --git a/test/test_sidekiq.rb b/test/test_sidekiq.rb index b47915f2..9eb45f79 100644 --- a/test/test_sidekiq.rb +++ b/test/test_sidekiq.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 require_relative 'helper' diff --git a/test/test_testing.rb b/test/test_testing.rb index 0bbf233a..8c311306 100644 --- a/test/test_testing.rb +++ b/test/test_testing.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'active_record' diff --git a/test/test_testing_fake.rb b/test/test_testing_fake.rb index edb84eb6..d1bef02a 100644 --- a/test/test_testing_fake.rb +++ b/test/test_testing_fake.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'active_record' diff --git a/test/test_testing_inline.rb b/test/test_testing_inline.rb index e26253c0..229c0eb1 100644 --- a/test/test_testing_inline.rb +++ b/test/test_testing_inline.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' require 'active_record' diff --git a/test/test_util.rb b/test/test_util.rb index aea1c0cf..68fbb113 100644 --- a/test/test_util.rb +++ b/test/test_util.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' class TestUtil < Sidekiq::Test diff --git a/test/test_web.rb b/test/test_web.rb index 72ded94e..440fc342 100644 --- a/test/test_web.rb +++ b/test/test_web.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # encoding: utf-8 require_relative 'helper' require 'sidekiq/web' diff --git a/test/test_web_helpers.rb b/test/test_web_helpers.rb index 2ac92b09..b5762a21 100644 --- a/test/test_web_helpers.rb +++ b/test/test_web_helpers.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'helper' class TestWebHelpers < Sidekiq::Test