chore: upgrade CI and RuboCop configs

Author: palkan

.codeclimate.yml

@@ -12,22 +12,14 @@ jobs:
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
+      BUNDLE_GEMFILE: gemfiles/jruby.gemfile
+      CI: true
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path:  /home/runner/bundle
-        key: bundle-${{ hashFiles('**/gemfiles/jruby.gemfile') }}-${{ hashFiles('**/*.gemspec') }}
-        restore-keys: |
-          bundle-
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: jruby-9.2.15.0
-    - name: Bundle install
-      run: |
-        bundle config path /home/runner/bundle
-        bundle config --global gemfile gemfiles/jruby.gemfile
-        bundle install
+        ruby-version: jruby
+        bundler-cache: true
     - name: Run RSpec
       run: |
         bundle exec rspec --force-color

.github/workflows/rspec-jruby.yml

@@ -12,24 +12,13 @@ jobs:
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
+      CI: true
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path:  /home/runner/bundle
-        key: bundle-${{ hashFiles('**/Gemfile') }}-${{ hashFiles('**/*.gemspec') }}
-        restore-keys: |
-          bundle-
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: truffleruby-head
-        bundler: 2.2.15
+        ruby-version: truffleruby
         bundler-cache: true
-
-    - name: Bundle install
-      run: |
-        bundle config path /home/runner/bundle
-        bundle install
     - name: Run RSpec
       run: |
         bundle exec rspec --force-color

.github/workflows/rspec-truffle.yml

@@ -12,37 +12,26 @@ jobs:
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+      CI: true
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7]
+        ruby: [3.2]
         gemfile: ["gemfiles/railsmaster.gemfile"]
         include:
-        - ruby: ruby-head
-          gemfile: "gemfiles/railsmaster.gemfile"
+        - ruby: 3.1
+          gemfile: "Gemfile"
         - ruby: 3.0
           gemfile: "Gemfile"
         - ruby: 2.7
           gemfile: "Gemfile"
-        - ruby: 2.6.5
-          gemfile: "Gemfile"
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: /home/runner/bundle
-        key: bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}
-        restore-keys: |
-          bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Bundle install
-      run: |
-        bundle config path /home/runner/bundle
-        bundle config --global gemfile ${{ matrix.gemfile }}
-        bundle install
-        bundle update
+        bundler-cache: true
     - name: Run RSpec
       run: |
         bundle exec rspec --force-color

.github/workflows/rspec.yml

@@ -9,12 +9,16 @@ on:
 jobs:
   rubocop:
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      BUNDLE_GEMFILE: "gemfiles/rubocop.gemfile"
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
+        bundler-cache: true
     - name: Lint Ruby code with RuboCop
       run: |
-        bundle install --jobs 4 --retry 3
         bundle exec rubocop

.github/workflows/rubocop.yml

@@ -1,29 +1,18 @@
 require:
-  # add after moving docs to another tool
-  - 'standard/cop/block_single_line_braces'
-  - 'rubocop-md'
+  - standard
 
 inherit_gem:
   standard: config/base.yml
 
 AllCops:
-  Exclude:
-    - 'bin/**/*'
-    - 'tmp/**/*'
-    - 'vendor/**/*'
-    - 'gemfiles/vendor/**/*'
-    - 'clowne.gemspec'
   DisplayCopNames: true
+  SuggestExtensions: false
+  NewCops: disable
   TargetRubyVersion: 2.7
 
-Markdown:
-  WarnInvalid: true
-
-Lint/Void:
-  Exclude:
-    - 'docs/README.md'
-    - 'README.md'
+Style/FrozenStringLiteralComment:
+  Enabled: true
 
 Lint/ConstantDefinitionInBlock:
   Exclude:
-    - 'spec/**/*'
+    - 'spec/**/*'

.rubocop.yml

@@ -1,18 +1,22 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in clowne.gemspec
 gemspec
 
-gem "pry-byebug", platform: :mri
+gem "debug", platform: :mri
 
 gem "sqlite3", "~> 1.4.2", platform: :ruby
 gem "activerecord-jdbcsqlite3-adapter", ">= 50.0", "< 70.0", platform: :jruby
 gem "jdbc-sqlite3", platform: :jruby
 
-gem "activerecord", ">= 6.0", "< 6.2.0"
+gem "activerecord", ">= 6.0"
 gem "sequel", ">= 5.0"
 gem "simplecov"
 
+eval_gemfile "gemfiles/rubocop.gemfile"
+
 local_gemfile = "Gemfile.local"
 
 if File.exist?(local_gemfile)

.rufo

@@ -1,6 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/clowne.svg)](https://badge.fury.io/rb/clowne)
 [![Build Status](https://github.com/clowne-rb/clowne/actions/workflows/rspec.yml/badge.svg?branch=master)](https://github.com/clowne-rb/clowne/actions?query=branch%3Amaster+)
-[![Maintainability](https://api.codeclimate.com/v1/badges/9143c4f91e9d1d2a4bd1/maintainability)](https://codeclimate.com/github/clowne-rb/clowne/maintainability)
 [![Docs](https://img.shields.io/badge/docs-link-brightgreen.svg)](https://clowne.evilmartians.io)
 
 # Clowne
@@ -14,7 +13,6 @@ A flexible gem for cloning your models. Clowne focuses on ease of use and provid
 <a href="https://evilmartians.com/">
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54"></a>
 
-
 ## Installation
 
 To install Clowne with RubyGems:

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"

README.md

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "clowne"

Rakefile

@@ -1,36 +1,34 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'clowne/version'
+# frozen_string_literal: true
+
+require_relative "lib/clowne/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'clowne'
-  spec.version       = Clowne::VERSION
-  spec.authors       = ['Vladimir Dementyev', 'Sverchkov Nikolay']
-  spec.email         = ['[email protected]', '[email protected]']
-
-  spec.summary       = 'A flexible gem for cloning your models'
-  spec.description   = 'A flexible gem for cloning your models.'
-  spec.homepage      = 'https://github.com/clowne-rb/clowne'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
+  spec.name = "clowne"
+  spec.version = Clowne::VERSION
+  spec.authors = ["Vladimir Dementyev", "Sverchkov Nikolay"]
+  spec.email = ["[email protected]", "[email protected]"]
+
+  spec.summary = "A flexible gem for cloning your models"
+  spec.description = "A flexible gem for cloning your models."
+  spec.homepage = "https://github.com/clowne-rb/clowne"
+  spec.license = "MIT"
+
+  spec.required_ruby_version = ">= 2.7.0"
+
+  spec.files = Dir.glob("lib/**/*") + %w[README.md LICENSE.txt CHANGELOG.md]
+
   spec.metadata = {
     "bug_tracker_uri" => "http://github.com/clowne-rb/clowne/issues",
     "changelog_uri" => "https://github.com/clowne-rb/clowne/blob/master/CHANGELOG.md",
     "documentation_uri" => "https://clowne.evilmartians.io/",
     "homepage_uri" => "https://clowne.evilmartians.io/",
     "source_code_uri" => "http://github.com/clowne-rb/clowne"
   }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'factory_bot', '~> 5'
-  spec.add_development_dependency 'rubocop', '~> 1.22'
-  spec.add_development_dependency 'rubocop-md', '~> 1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.5'
-  spec.add_development_dependency 'standard', '~> 1.4.0'
+
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "factory_bot", "~> 5"
 end

bin/console

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord-jdbcsqlite3-adapter", "~> 50.0"
+gem "activerecord-jdbcsqlite3-adapter", "~> 60.0"
 gem "jdbc-sqlite3"
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 6.0"
 gem "sequel", ">= 5.0"
 
 gemspec path: ".."

clowne.gemspec

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org" do
+  gem "standard", "~> 1.28"
+end

gemfiles/jruby.gemfile

@@ -7,7 +7,7 @@ module Associations
         class Noop < Base
           def call(record)
             warn(
-              "[Clowne] Reflection #{reflection.class.name} is not supported "\
+              "[Clowne] Reflection #{reflection.class.name} is not supported " \
               "(#{@association_name} for #{@source.class})"
             )
             record

gemfiles/rubocop.gemfile

@@ -57,7 +57,7 @@ def init_scope
         def cloner_for(child)
           return declaration.clone_with if declaration.clone_with
 
-          return child.class.cloner_class if child.class.respond_to?(:cloner_class)
+          child.class.cloner_class if child.class.respond_to?(:cloner_class)
         end
 
         def cloner_options

lib/clowne/adapters/active_record/associations/noop.rb

@@ -4,7 +4,7 @@ module Clowne
   module Ext
     module RecordKey # :nodoc: all
       def key(record)
-        id = record.respond_to?(:id) && record.id ? record.id : record.__id__
+        id = (record.respond_to?(:id) && record.id) ? record.id : record.__id__
         [record.class.name, id].join("#")
       end
     end

lib/clowne/adapters/base/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::ActiveRecord::Associations::BelongsTo,
   :cleanup, adapter: :active_record do
   let(:adapter) { Clowne::Adapters::ActiveRecord.new }

lib/clowne/ext/record_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::ActiveRecord::Associations::HABTM, :cleanup, adapter: :active_record do
   let(:adapter) { Clowne::Adapters::ActiveRecord.new }
   let(:source) { create(:post, :with_tags, tags_num: 2) }

spec/clowne/adapters/active_record/associations/belongs_to_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::ActiveRecord::Associations::HasMany, :cleanup, adapter: :active_record do
   let(:adapter) { Clowne::Adapters::ActiveRecord.new }
   let(:source) { create(:user, :with_posts, posts_num: 2) }

spec/clowne/adapters/active_record/associations/has_and_belongs_to_many_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::ActiveRecord::Associations::HasOne, :cleanup, adapter: :active_record do
   let(:adapter) { Clowne::Adapters::ActiveRecord.new }
   let(:image) { create(:image, :with_preview_image) }

spec/clowne/adapters/active_record/associations/has_many_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::ActiveRecord::Resolvers::Association do
   let(:params) { double }
   let(:record) { double }

spec/clowne/adapters/active_record/associations/has_one_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::ActiveRecord do
   let(:record) { create(:post) }
 

spec/clowne/adapters/active_record/resolvers/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::Base::Association do
   describe ".clone_one" do
     let(:adapter) { double }

spec/clowne/adapters/active_record_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::Registry do
   subject { described_class.new }
 

spec/clowne/adapters/base/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::Sequel::Associations::ManyToMany, :cleanup, adapter: :sequel do
   let(:adapter) { Clowne::Adapters::Sequel.new }
   let(:source) { create("sequel:post", :with_tags, tags_num: 2) }

spec/clowne/adapters/registry_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::Sequel::Associations::OneToMany, :cleanup, adapter: :sequel do
   let(:adapter) { Clowne::Adapters::Sequel.new }
   let(:source) { create("sequel:user", :with_posts, posts_num: 2) }

spec/clowne/adapters/sequel/associations/many_to_many_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::Sequel::Associations::OneToOne, :cleanup, adapter: :sequel do
   let(:adapter) { Clowne::Adapters::Sequel.new }
   let(:post) { create("sequel:post") }

spec/clowne/adapters/sequel/associations/one_to_many_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Clowne::Adapters::Sequel::Resolvers::Association do
   let(:adapter) { Clowne::Adapters::Sequel.new }
   let(:params) { double }