Cleanup

Rakefile

@@ -1,8 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |test|
   test.warning = true
   test.pattern = 'test/**/test_*.rb'
 end
 
-task :default => :test
+task default: :test

lib/sidekiq/cli.rb

@@ -44,7 +44,7 @@ def run
       daemonize if options[:daemon]
       write_pid
       boot_system
-      print_banner
+      print_banner if environment == 'development' && $stdout.tty?
 
       self_read, self_write = IO.pipe
       sigs = %w(INT TERM TTIN TSTP)
@@ -181,21 +181,16 @@ def handle_signal(sig)
     private
 
     def print_banner
-      # Print logo and banner for development
-      if environment == 'development' && $stdout.tty?
-        puts "\e[#{31}m"
-        puts Sidekiq::CLI.banner
-        puts "\e[0m"
-      end
+      puts "\e[#{31}m"
+      puts Sidekiq::CLI.banner
+      puts "\e[0m"
     end
 
     def daemonize
       raise ArgumentError, "You really should set a logfile if you're going to daemonize" unless options[:logfile]
-      files_to_reopen = []
-      ObjectSpace.each_object(File) do |file|
-        files_to_reopen << file unless file.closed?
-      end
 
+      files_to_reopen = ObjectSpace.each_object(File).reject { |f| f.closed? }
+
       ::Process.daemon(true, true)
 
       files_to_reopen.each do |file|

lib/sidekiq/rails.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Sidekiq
   class Rails < ::Rails::Engine
     # We need to setup this up before any application configuration which might
@@ -54,4 +55,4 @@ def inspect
   $stderr.puts("**************************************************")
   $stderr.puts("⛔️ WARNING: Sidekiq server is no longer supported by Rails 3.2 - please ensure your server/workers are updated")
   $stderr.puts("**************************************************")
-end
+end

test/test_cli.rb

@@ -6,11 +6,11 @@
 class TestCLI < Minitest::Test
   describe '#parse' do
     before do
-      @cli = Sidekiq::CLI.new
       Sidekiq.options = Sidekiq::DEFAULTS.dup
       @logger = Sidekiq.logger
       @logdev = StringIO.new
       Sidekiq.logger = Logger.new(@logdev)
+      @cli = Sidekiq::CLI.new
     end
 
     after do
@@ -267,6 +267,7 @@ class TestCLI < Minitest::Test
   describe '#run' do
     before do
       Sidekiq.options = Sidekiq::DEFAULTS.dup
+      Sidekiq.options[:require] = './test/fake_env.rb'
       @logger = Sidekiq.logger
       @logdev = StringIO.new
       Sidekiq.logger = Logger.new(@logdev)
@@ -279,7 +280,6 @@ class TestCLI < Minitest::Test
 
     describe 'pidfile' do
       it 'writes process pid to file' do
-        Sidekiq.options[:require] = './test/fake_env.rb'
         Sidekiq.options[:pidfile] = '/tmp/sidekiq.pid'
         @cli.stub(:launch, nil) do
           @cli.run
@@ -292,8 +292,8 @@ class TestCLI < Minitest::Test
     describe 'require workers' do
       describe 'when path is a rails directory' do
         before do
-          @cli.environment = 'test'
           Sidekiq.options[:require] = './test/dummy'
+          @cli.environment = 'test'
         end
 
         it 'requires sidekiq railtie and rails application with environment' do
@@ -315,10 +315,6 @@ class TestCLI < Minitest::Test
       end
 
       describe 'when path is file' do
-        before do
-          Sidekiq.options[:require] = './test/fake_env.rb'
-        end
-
         it 'requires application' do
           @cli.stub(:launch, nil) do
             @cli.run
@@ -330,10 +326,6 @@ class TestCLI < Minitest::Test
     end
 
     describe 'when development environment and stdout tty' do
-      before do
-        Sidekiq.options[:require] = './test/fake_env.rb'
-      end
-
       it 'prints banner' do
         @cli.stub(:environment, 'development') do
           assert_output(/#{Regexp.escape(Sidekiq::CLI.banner)}/) do