add rubocop fixes

Author: anarchivist

berkeley_library-logging.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.homepage = BerkeleyLibrary::Logging::ModuleInfo::HOMEPAGE
 
   spec.files = `git ls-files -z`.split("\x0")
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features|artifacts)/})
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = ruby_version

lib/berkeley_library/logging.rb

@@ -24,10 +24,10 @@ def logger=(v)
         @logger = (ensure_logger(v) unless v.nil?)
       end
 
-      private
-
       LOG_METHODS = %i[debug info warn error].freeze
 
+      private
+
       def ensure_logger(v)
         return v if (missing = LOG_METHODS.reject { |m| v.respond_to?(m) }).empty?
 

lib/berkeley_library/logging/env.rb

@@ -13,7 +13,7 @@ def env
         @env ||= begin
           # NOTE: can't just self.env= b/c it returns the wrong value -- see
           # https://stackoverflow.com/q/65226532/27358
-          env = (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || FALLBACK_ENV)
+          env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || FALLBACK_ENV
           ensure_rails_env_like(env)
         end
       end

lib/berkeley_library/logging/loggers.rb

@@ -63,7 +63,7 @@ def default_log_file_for(config)
 
         def ensure_log_directory
           File.join(workdir, FALLBACK_LOG_DIR).tap do |log_dir|
-            FileUtils.mkdir(log_dir) unless File.exist?(log_dir)
+            FileUtils.mkdir_p(log_dir)
             raise ArgumentError, "Not a directory: #{log_dir}" unless File.directory?(log_dir)
           end
         end

rakelib/coverage.rake

@@ -1,15 +1,15 @@
 require 'colorize'
 
 namespace :simplecov do
-  task :check_coverage do
+  desc :check_coverage do
     ENV['COVERAGE'] ||= 'true'
     Rake::Task['spec'].invoke
   rescue SystemExit
     puts 'Code coverage analysis aborted, probably due to a previous test failure'.colorize(:red)
     raise
   end
 
-  task :report do
+  desc :report do
     require 'simplecov'
     require 'simplecov-rcov'
     require 'simplecov-console'

rakelib/spec.rake

@@ -1,7 +1,7 @@
 require 'rspec/core/rake_task'
 
 namespace :spec do
-  task :prepare do
+  desc :prepare do
     if ENV['GENERATE_REPORTS']
       ENV['CI_REPORTS'] = 'artifacts/rspec'
 
@@ -26,6 +26,6 @@ desc 'Run all specs in spec directory'
 task spec: ['spec:prepare'] do
   Rake::Task['spec:all'].invoke
 ensure
-  reports_dir = ENV['CI_REPORTS']
+  reports_dir = ENV.fetch('CI_REPORTS', nil)
   puts "JUnit-format XML test report written to #{reports_dir}" if reports_dir
 end

spec/rails/ucblit/logging/configurator_spec.rb

@@ -32,7 +32,7 @@ module Logging
           it 'enables Lograge' do
             Configurator.configure(config)
             lograge = config.lograge
-            expect(lograge.enabled).to eq(true)
+            expect(lograge.enabled).to be(true)
           end
 
           context 'events' do
@@ -86,10 +86,8 @@ module Logging
               allow(session).to receive(:to_hash).and_return(session_hash)
 
               @request = instance_double(ActionDispatch::Request)
-              allow(request).to receive(:origin).and_return('http://example.org:3000')
-              allow(request).to receive(:base_url).and_return('https://example.org:3443')
-              allow(request).to receive(:x_csrf_token).and_return('5551212')
-              allow(request).to receive(:session).and_return(session)
+              allow(request).to receive_messages(origin: 'http://example.org:3000', base_url: 'https://example.org:3443', x_csrf_token: '5551212',
+                                                 session: session)
 
               @payload = {
                 params: params,
@@ -152,7 +150,7 @@ module Logging
 
         describe 'Webpacker' do
           it 'works if Webpacker is not present' do
-            expect(Object.const_defined?(:Webpacker)).to eq(false) # just to be sure
+            expect(Object.const_defined?(:Webpacker)).to be(false) # just to be sure
             expect { Configurator.configure(config) }.not_to raise_error
           end
 

spec/rails/ucblit/logging/env_spec.rb

@@ -18,7 +18,7 @@ module BerkeleyLibrary
         expect(defined?(Rails)).to be_truthy # just to be sure
         Logging.env = 'elvis'
         expect(Rails.env).to eq('elvis')
-        expect(Rails.env.elvis?).to eq(true)
+        expect(Rails.env.elvis?).to be(true)
       end
     end
   end

spec/standalone/ucblit/logging/configurator_spec.rb

@@ -29,7 +29,7 @@ module Logging
           it 'enables Lograge' do
             Configurator.configure(config)
             lograge = config.lograge
-            expect(lograge.enabled).to eq(true)
+            expect(lograge.enabled).to be(true)
           end
 
           it 'extracts request info from log events' do
@@ -79,7 +79,7 @@ module Logging
 
         describe 'Webpacker' do
           it 'works if Webpacker is not present' do
-            expect(Object.const_defined?(:Webpacker)).to eq(false) # just to be sure
+            expect(Object.const_defined?(:Webpacker)).to be(false) # just to be sure
             expect { Configurator.configure(config) }.not_to raise_error
           end