From 6bd61e29399e91cd443877e294a760001e8043e0 Mon Sep 17 00:00:00 2001 From: Sergey Glukhov Date: Mon, 20 May 2024 12:41:26 +0300 Subject: [PATCH] fix rubocop --- .github/workflows/checkstyle.yml | 3 +-- .github/workflows/test.yml | 4 +++- .gitignore | 1 + .rubocop.yml | 12 +++++++++++- Appraisals | 4 ++++ Gemfile | 2 ++ Rakefile | 2 ++ lib/active_record/data_migration.rb | 2 ++ lib/generators/data_migration_generator.rb | 4 +++- .../templates/data_migration_generator.rb | 2 ++ lib/rails-data-migrations.rb | 4 ++-- lib/rails_data_migrations/log_entry.rb | 4 +++- lib/rails_data_migrations/migrator.rb | 4 +++- lib/rails_data_migrations/railtie.rb | 2 ++ lib/rails_data_migrations/version.rb | 4 +++- lib/tasks/data_migrations.rake | 6 +++++- rails-data-migrations.gemspec | 16 +++++++++++++--- spec/data_migrations_spec.rb | 4 +++- spec/generators/data_migration_generator_spec.rb | 0 spec/spec_helper.rb | 4 +++- 20 files changed, 68 insertions(+), 16 deletions(-) delete mode 100644 spec/generators/data_migration_generator_spec.rb diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index c0a3f005..4dc25f88 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -24,8 +24,7 @@ jobs: - name: Set up Ruby ${{ matrix.ruby-version }} uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 - bundler: 1 + ruby-version: 3.2 bundler-cache: true - name: Run rubocop diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dc4822d3..45dc4319 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,8 +18,10 @@ jobs: timeout-minutes: 15 strategy: + fail-fast: false matrix: - ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3] +# ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3] + ruby-version: [2.3, 2.4, 2.5, 2.6] steps: - name: Cancel previous runs diff --git a/.gitignore b/.gitignore index d00b8694..1ea4d7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ /.idea/ spec/db/ gemfiles/ +vendor/ *.gem \ No newline at end of file diff --git a/.rubocop.yml b/.rubocop.yml index df2edfa7..901a0f4e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,7 +3,13 @@ AllCops: - 'vendor/**/*' - 'gemfiles/**/*' -Layout/TrailingBlankLines: +Gemspec/RequiredRubyVersion: + Enabled: false + +Gemspec/RubyVersionGlobalsUsage: + Enabled: false + +Layout/TrailingEmptyLines: Enabled: false Metrics/BlockLength: @@ -12,6 +18,10 @@ Metrics/BlockLength: Metrics/LineLength: Max: 120 +Naming/FileName: + Exclude: + - lib/rails-data-migrations.rb + Style/Documentation: Enabled: false diff --git a/Appraisals b/Appraisals index cd62312d..b170c55a 100644 --- a/Appraisals +++ b/Appraisals @@ -1,3 +1,5 @@ +# frozen_string_literal: true + ruby_version = Gem::Version.new(RUBY_VERSION) if ruby_version < Gem::Version.new('2.7.0') @@ -28,9 +30,11 @@ end if ruby_version >= Gem::Version.new('2.5.0') appraise 'rails-6.0' do gem 'rails', '~> 6.0.0' + gem 'sqlite3', '~> 1.4.0' end appraise 'rails-6.1' do gem 'rails', '~> 6.1.0' + gem 'sqlite3', '~> 1.4.0' end end diff --git a/Gemfile b/Gemfile index a1cee85f..98c5fb20 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source 'https://rubygems.org' # Specify your gem's dependencies in activerecord-data-migrations.gemspec diff --git a/Rakefile b/Rakefile index 4c774a2b..82bb534a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'bundler/gem_tasks' require 'rspec/core/rake_task' diff --git a/lib/active_record/data_migration.rb b/lib/active_record/data_migration.rb index ee163b14..2bcc5539 100644 --- a/lib/active_record/data_migration.rb +++ b/lib/active_record/data_migration.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails/version' module ActiveRecord diff --git a/lib/generators/data_migration_generator.rb b/lib/generators/data_migration_generator.rb index 231125e5..617341bb 100644 --- a/lib/generators/data_migration_generator.rb +++ b/lib/generators/data_migration_generator.rb @@ -1,8 +1,10 @@ +# frozen_string_literal: true + require 'rails/generators' require 'rails-data-migrations' class DataMigrationGenerator < Rails::Generators::NamedBase - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) def create_migration_file migration_file_name = diff --git a/lib/generators/templates/data_migration_generator.rb b/lib/generators/templates/data_migration_generator.rb index 35cd9e88..6d13e10a 100644 --- a/lib/generators/templates/data_migration_generator.rb +++ b/lib/generators/templates/data_migration_generator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ClassName < ActiveRecord::DataMigration def up # put your code here diff --git a/lib/rails-data-migrations.rb b/lib/rails-data-migrations.rb index ef612e39..8eae380d 100644 --- a/lib/rails-data-migrations.rb +++ b/lib/rails-data-migrations.rb @@ -1,4 +1,5 @@ -# rubocop:disable Naming/FileName +# frozen_string_literal: true + require 'rails' require 'active_record' require 'active_record/data_migration' @@ -6,4 +7,3 @@ require 'rails_data_migrations/log_entry' require 'rails_data_migrations/migrator' require 'rails_data_migrations/railtie' -# rubocop:enable Naming/FileName diff --git a/lib/rails_data_migrations/log_entry.rb b/lib/rails_data_migrations/log_entry.rb index 3b90c97d..0fa1b0b1 100644 --- a/lib/rails_data_migrations/log_entry.rb +++ b/lib/rails_data_migrations/log_entry.rb @@ -1,8 +1,10 @@ +# frozen_string_literal: true + module RailsDataMigrations class LogEntry < ::ActiveRecord::SchemaMigration class << self def table_name - ActiveRecord::Base.table_name_prefix + 'data_migrations' + ActiveRecord::Base.table_name_suffix + "#{ActiveRecord::Base.table_name_prefix}data_migrations#{ActiveRecord::Base.table_name_suffix}" end def index_name diff --git a/lib/rails_data_migrations/migrator.rb b/lib/rails_data_migrations/migrator.rb index 7725e4e2..1234fcf1 100644 --- a/lib/rails_data_migrations/migrator.rb +++ b/lib/rails_data_migrations/migrator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module RailsDataMigrations class Migrator < ::ActiveRecord::Migrator MIGRATOR_SALT = 2053462855 @@ -61,7 +63,7 @@ def list_pending_migrations already_migrated = get_all_versions list_migrations.reject { |m| already_migrated.include?(m.version) } else - open(migrations_path).pending_migrations + open(migrations_path).pending_migrations # rubocop:disable Security/Open end end diff --git a/lib/rails_data_migrations/railtie.rb b/lib/rails_data_migrations/railtie.rb index c6cb88b1..9df6582b 100644 --- a/lib/rails_data_migrations/railtie.rb +++ b/lib/rails_data_migrations/railtie.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails' module RailsDataMigrations diff --git a/lib/rails_data_migrations/version.rb b/lib/rails_data_migrations/version.rb index 9201e431..9cf916d0 100644 --- a/lib/rails_data_migrations/version.rb +++ b/lib/rails_data_migrations/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module RailsDataMigrations - VERSION = '1.2.0'.freeze + VERSION = '1.2.0' end diff --git a/lib/tasks/data_migrations.rake b/lib/tasks/data_migrations.rake index 65a654e2..0f4286e9 100644 --- a/lib/tasks/data_migrations.rake +++ b/lib/tasks/data_migrations.rake @@ -1,8 +1,11 @@ +# frozen_string_literal: true + require 'rake' namespace :data do def apply_single_migration(direction, version) raise 'VERSION is required' unless version + RailsDataMigrations::Migrator.run_migration( direction, RailsDataMigrations::Migrator.migrations_path, @@ -42,7 +45,8 @@ namespace :data do desc 'Skip single data migration using VERSION' task skip: :init_migration do version = ENV['VERSION'].to_i - raise 'VERSION is required' unless version > 0 + raise 'VERSION is required' unless version.positive? + if RailsDataMigrations::LogEntry.where(version: version).any? puts "data migration #{version} was already applied." else diff --git a/rails-data-migrations.gemspec b/rails-data-migrations.gemspec index af1a0c2a..edd08518 100644 --- a/rails-data-migrations.gemspec +++ b/rails-data-migrations.gemspec @@ -1,4 +1,6 @@ -lib = File.expand_path('../lib', __FILE__) +# frozen_string_literal: true + +lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'rails_data_migrations/version' @@ -23,6 +25,14 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'appraisal', '~> 2.1' spec.add_development_dependency 'rake', '>= 12.3.3' spec.add_development_dependency 'rspec', '3.5.0' - spec.add_development_dependency 'rubocop', '0.52.1' - spec.add_development_dependency 'sqlite3', '~> 1.3.6' + + spec.add_development_dependency( + 'rubocop', + Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') ? '~> 1.63' : '0.52.1' + ) + + spec.add_development_dependency( + 'sqlite3', + Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') ? '~> 1.3' : '~> 1.3.6' + ) end diff --git a/spec/data_migrations_spec.rb b/spec/data_migrations_spec.rb index 5f02138f..62fa716f 100644 --- a/spec/data_migrations_spec.rb +++ b/spec/data_migrations_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe RailsDataMigrations do @@ -44,7 +46,7 @@ end def load_rake_rasks - load File.expand_path('../../lib/tasks/data_migrations.rake', __FILE__) + load File.expand_path('../lib/tasks/data_migrations.rake', __dir__) Rake::Task.define_task(:environment) end diff --git a/spec/generators/data_migration_generator_spec.rb b/spec/generators/data_migration_generator_spec.rb deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a1a9d5b6..39825a10 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,9 @@ +# frozen_string_literal: true + require 'rails/generators' require 'rake' -$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__) +$LOAD_PATH.unshift File.expand_path('../lib', __dir__) require 'rails-data-migrations' ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'