Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 4.8.0 #141

Merged
merged 1 commit into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 2 additions & 23 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,8 @@ jobs:
build:
strategy:
matrix:
ruby: ['2.5', '2.6', '2.7', '3.0']
gemfile: ['active6.0.3.6', 'active6.1.3.1', 'rails6.0.3.6', 'rails6.1.3.1']
include:
- ruby: '2.5'
gemfile: active5.2.5
- ruby: '2.6'
gemfile: active5.2.5
- ruby: '2.7'
gemfile: active5.2.5
- ruby: '2.5'
gemfile: rails5.2.5
- ruby: '2.6'
gemfile: rails5.2.5
- ruby: '2.7'
gemfile: rails5.2.5
- ruby: '2.7'
gemfile: active7.0.0
- ruby: '3.0'
gemfile: active7.0.0
- ruby: '2.7'
gemfile: rails7.0.0
- ruby: '3.0'
gemfile: rails7.0.0
ruby: ['3.0', '3.1', '3.2', '3.3']
gemfile: ['active6.0.6', 'active6.1.7.6', 'active7.0.8', 'active7.1.3', 'rails6.0.6', 'rails6.1.7.6', 'rails7.0.8', 'rails7.1.3']
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ AllCops:
NewCops: enable
TargetRubyVersion: 2.5

Metrics/LineLength:
Layout/LineLength:
IgnoreCopDirectives: true
Max: 120

Expand Down
145 changes: 96 additions & 49 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,104 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2016-10-11 00:30:58 +0900 using RuboCop version 0.43.0.
# on 2024-01-20 09:02:51 UTC using RuboCop version 1.30.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Include.
# Include: **/*.gemspec
Gemspec/DeprecatedAttributeAssignment:
Exclude:
- 'comma.gemspec'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Include.
# Include: **/*.gemspec
Gemspec/RequireMFA:
Exclude:
- 'comma.gemspec'

# Offense count: 1
# Configuration parameters: Include.
# Include: **/*.gemspec
Gemspec/RequiredRubyVersion:
Exclude:
- 'comma.gemspec'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
Layout/EmptyLineBetweenDefs:
Exclude:
- 'spec/rails_app/rails_app.rb'

# Offense count: 4
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowAliasSyntax, AllowedMethods.
# AllowedMethods: alias_method, public, protected, private
Layout/EmptyLinesAroundAttributeAccessor:
Exclude:
- 'spec/comma/comma_spec.rb'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
Layout/SpaceAroundMethodCallOperator:
Exclude:
- 'spec/controllers/users_controller_spec.rb'

# Offense count: 17
# Configuration parameters: AllowedMethods.
# AllowedMethods: enums
Lint/ConstantDefinitionInBlock:
Exclude:
- 'spec/comma/comma_spec.rb'
- 'spec/comma/rails/active_record_spec.rb'
- 'spec/comma/rails/data_mapper_collection_spec.rb'
- 'spec/comma/rails/mongoid_spec.rb'

# Offense count: 4
# Configuration parameters: AllowComments, AllowEmptyLambdas.
Lint/EmptyBlock:
Exclude:
- 'spec/comma/comma_spec.rb'
- 'spec/comma/rails/data_mapper_collection_spec.rb'

# Offense count: 1
Lint/MissingSuper:
Exclude:
- 'spec/comma/comma_spec.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Lint/NonDeterministicRequireOrder:
Exclude:
- 'spec/spec_helper.rb'

# Offense count: 2
# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
Metrics/AbcSize:
Max: 22

# Offense count: 3
# Configuration parameters: CountComments.
# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
Metrics/MethodLength:
Max: 17
Max: 16

# Offense count: 2
# Configuration parameters: EnforcedStyle, AllowedIdentifiers, AllowedPatterns.
# SupportedStyles: snake_case, camelCase
Naming/VariableName:
Exclude:
- 'spec/comma/comma_spec.rb'

# Offense count: 15
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
# SupportedStyles: line_count_based, semantic, braces_for_chaining
# Offense count: 14
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
# FunctionalMethods: let, let!, subject, watch
# IgnoredMethods: lambda, proc, it
Expand All @@ -29,6 +109,7 @@ Style/BlockDelimiters:
- 'spec/comma/header_extractor_spec.rb'

# Offense count: 11
# Configuration parameters: AllowedConstants.
Style/Documentation:
Exclude:
- 'spec/**/*'
Expand All @@ -43,57 +124,23 @@ Style/Documentation:
- 'lib/comma/object.rb'
- 'lib/comma/relation.rb'

Lint/MissingSuper:
Exclude:
- 'lib/comma/data_extractor.rb'
- 'lib/comma/header_extractor.rb'
- 'spec/comma/comma_spec.rb'

# Offense count: 3
Style/MissingRespondToMissing:
Exclude:
- 'lib/comma/data_extractor.rb'
- 'lib/comma/header_extractor.rb'

# Offense count: 2
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: snake_case, camelCase
Naming/VariableName:
Exclude:
- 'spec/comma/comma_spec.rb'

Style/StringConcatenation:
Exclude:
- 'spec/comma/comma_spec.rb'
- 'spec/comma/rails/active_record_spec.rb'
- 'spec/spec_helper.rb'

Lint/NonDeterministicRequireOrder:
Exclude:
- 'spec/spec_helper.rb'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
Style/RedundantBegin:
Exclude:
- 'spec/spec_helper.rb'

Layout/SpaceAroundMethodCallOperator:
Exclude:
- 'spec/controllers/users_controller_spec.rb'

Lint/ConstantDefinitionInBlock:
# Offense count: 6
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Mode.
Style/StringConcatenation:
Exclude:
- 'spec/comma/comma_spec.rb'
- 'spec/comma/rails/active_record_spec.rb'
- 'spec/comma/rails/data_mapper_collection_spec.rb'
- 'spec/comma/rails/mongoid_spec.rb'

Layout/EmptyLinesAroundAttributeAccessor:
Exclude:
- 'spec/comma/comma_spec.rb'

Migration/DepartmentName:
Exclude:
- spec/comma/comma_spec.rb

Gemspec/RequiredRubyVersion:
Exclude:
- comma.gemspec
- 'spec/spec_helper.rb'
59 changes: 25 additions & 34 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,52 +1,43 @@
# frozen_string_literal: true

[
'5.2.5'
].each do |version_number|
clean_number = version_number.gsub(/[<>~=]*/, '')

appraise "rails#{clean_number}" do
gem 'rails', version_number
gem 'rspec-rails'
gem 'sprockets', '< 4'
gem 'sqlite3', '~> 1.3.11'
gem 'test-unit'
end

appraise "active#{clean_number}" do
gem 'activesupport', version_number
gem 'activerecord', version_number
end
end

appraise 'rails6.0.3.6' do
gem 'rails', '6.0.3.6'
appraise 'rails6.0.6' do
gem 'rails', '6.0.6'
gem 'rspec-rails'
gem 'test-unit'
end

appraise 'active6.0.3.6' do
gem 'activesupport', '6.0.3.6'
gem 'activerecord', '6.0.3.6'
appraise 'active6.0.6' do
gem 'activesupport', '6.0.6'
gem 'activerecord', '6.0.6'
end

appraise 'rails6.1.3.1' do
gem 'rails', '6.1.3.1'
appraise 'rails6.1.7.6' do
gem 'rails', '6.1.7.6'
gem 'rspec-rails'
gem 'test-unit'
end

appraise 'active6.1.3.1' do
gem 'activesupport', '6.1.3.1'
gem 'activerecord', '6.1.3.1'
appraise 'active6.1.7.6' do
gem 'activesupport', '6.1.7.6'
gem 'activerecord', '6.1.7.6'
end

appraise 'rails7.0.0' do
gem 'rails', '7.0.0'
appraise 'rails7.0.8' do
gem 'rails', '7.0.8'
gem 'rspec-rails'
end

appraise 'active7.0.0' do
gem 'activesupport', '7.0.0'
gem 'activerecord', '7.0.0'
appraise 'active7.0.8' do
gem 'activesupport', '7.0.8'
gem 'activerecord', '7.0.8'
end

appraise 'rails7.1.3' do
gem 'rails', '7.1.3'
gem 'rspec-rails'
end

appraise 'active7.1.3' do
gem 'activesupport', '7.1.3'
gem 'activerecord', '7.1.3'
end
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ source 'https://rubygems.org'
gemspec

gem 'coveralls', require: false
gem 'rubocop', '~> 1.0.0', require: false
gem 'rubocop', '~> 1.30.0', require: false
gem 'rubocop-performance', require: false
gem 'sqlite3'
Loading