From 0485ecd18e3621f0fb2b665970f20b0643f3e5f0 Mon Sep 17 00:00:00 2001 From: Yohei Osanai Date: Wed, 25 May 2022 11:22:15 +0900 Subject: [PATCH] Enable `Gemspec/RequireMFA` and `Style/FetchEnvVar` cops Because `.rubocop.yml` is set to `NewCops: enable`, these newly added cops detect offenses when Rake Task is running. * https://github.com/rubocop/rubocop/pull/10243 * https://github.com/rubocop/rubocop/pull/10502 --- armg.gemspec | 1 + spec/mysql_helper.rb | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/armg.gemspec b/armg.gemspec index ae75110..4d1e5c6 100644 --- a/armg.gemspec +++ b/armg.gemspec @@ -14,6 +14,7 @@ Gem::Specification.new do |spec| spec.description = 'Add MySQL geometry type to Active Record.' spec.homepage = 'https://github.com/winebarrel/armg' spec.license = 'MIT' + spec.metadata = { 'rubygems_mfa_required' => 'true' } spec.files = `git ls-files -z`.split("\x0").reject do |f| f.match(%r{^(test|spec|features)/}) diff --git a/spec/mysql_helper.rb b/spec/mysql_helper.rb index 429b13f..b307901 100644 --- a/spec/mysql_helper.rb +++ b/spec/mysql_helper.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true class MysqlHelper - MYSQL_HOST = ENV['ARMG_TEST_MYSQL_HOST'] || '127.0.0.1' - MYSQL_PORT = ENV['ARMG_TEST_MYSQL_PORT'] || 10_056 - MYSQL_USER = ENV['ARMG_TEST_MYSQL_USER'] || 'root' - MYSQL_DB = ENV['ARMG_TEST_MYSQL_DB'] || 'armg_test' - MYSQL_ENGINE = ENV['ARMG_TEST_MYSQL_ENGINE'] || 'MyISAM' + MYSQL_HOST = ENV.fetch('ARMG_TEST_MYSQL_HOST', '127.0.0.1') + MYSQL_PORT = ENV.fetch('ARMG_TEST_MYSQL_PORT', 10_056) + MYSQL_USER = ENV.fetch('ARMG_TEST_MYSQL_USER', 'root') + MYSQL_DB = ENV.fetch('ARMG_TEST_MYSQL_DB', 'armg_test') + MYSQL_ENGINE = ENV.fetch('ARMG_TEST_MYSQL_ENGINE', 'MyISAM') TABLE_OPTIONS = if ActiveRecord.gem_version < Gem::Version.new('6.1.0') "ENGINE=#{MYSQL_ENGINE} DEFAULT CHARSET=utf8" elsif MYSQL_ENGINE == 'InnoDB'