Skip to content

Commit

Permalink
prepare for releasing version 4.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
eitoball committed Jan 20, 2024
1 parent 0d8650a commit f21f6ab
Show file tree
Hide file tree
Showing 29 changed files with 990 additions and 819 deletions.
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: ['2.7', '3.0', '3.1', '3.2', '3.3']
gemfile: ['active6.0.3.6', 'active6.1.3.1', 'active7.0.8', 'active7.1.3', 'rails6.0.3.6', 'rails6.1.3.1', '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'
39 changes: 15 additions & 24 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,24 +1,5 @@
# 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'
gem 'rspec-rails'
Expand All @@ -41,12 +22,22 @@ appraise 'active6.1.3.1' do
gem 'activerecord', '6.1.3.1'
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.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.0.0' do
gem 'activesupport', '7.0.0'
gem 'activerecord', '7.0.0'
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'
45 changes: 25 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
comma (4.7.0)
comma (4.8.0)
activesupport (>= 4.2.0)

GEM
Expand Down Expand Up @@ -39,20 +39,23 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mini_portile2 (2.8.5)
minitest (5.14.4)
multi_json (1.1.0)
netrc (0.11.0)
parallel (1.22.1)
parser (3.1.2.0)
parallel (1.24.0)
parser (3.3.0.4)
ast (~> 2.4.1)
racc
racc (1.7.3)
rainbow (3.1.1)
rake (13.0.1)
regexp_parser (2.5.0)
regexp_parser (2.9.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rexml (3.2.6)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand All @@ -73,33 +76,35 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rubocop (1.0.0)
rubocop (1.30.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.6.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.18.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.19.1)
parser (>= 3.1.1.0)
rubocop-performance (1.1.0)
rubocop (>= 0.67.0)
ruby-progressbar (1.11.0)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-performance (1.10.2)
rubocop (>= 0.90.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.13.0)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
sqlite3 (1.3.11)
sqlite3 (1.7.0)
mini_portile2 (~> 2.8.0)
thor (0.19.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.8.0)
unicode-display_width (2.5.0)

PLATFORMS
ruby
Expand All @@ -113,9 +118,9 @@ DEPENDENCIES
rspec (~> 3.5.0)
rspec-activemodel-mocks
rspec-its
rubocop (~> 1.0.0)
rubocop (~> 1.30.0)
rubocop-performance
sqlite3

BUNDLED WITH
2.1.4
2.5.5
Loading

0 comments on commit f21f6ab

Please sign in to comment.