diff --git a/.hound.yml b/.hound.yml index 2fe6c6d..1df2318 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,4 +1,4 @@ ruby: Enabled: true config_file: ci/rubocop.yml - version: 1.5.2 + version: 1.22.1 diff --git a/Rakefile b/Rakefile index 80c7163..d1f0cbe 100644 --- a/Rakefile +++ b/Rakefile @@ -61,7 +61,11 @@ namespace :build do aggregation = src.reduce({}) do |acc, file| full_path = path_in_project(file) y = YAML.safe_load(File.read(full_path)) - acc.deep_merge(y) + acc.deep_merge!( + y, + sort_merged_arrays: true, + extend_existing_arrays: true, + ) end target_full_path = path_in_project(to) diff --git a/ci/rubocop.rails.yml b/ci/rubocop.rails.yml index 95194e7..e859085 100644 --- a/ci/rubocop.rails.yml +++ b/ci/rubocop.rails.yml @@ -15,10 +15,10 @@ --- AllCops: Exclude: - - vendor/**/* - db/**/* - - tmp/**/* - db/schema.rb + - tmp/**/* + - vendor/**/* DisplayCopNames: false StyleGuideCopsOnly: false TargetRubyVersion: 3.1 @@ -78,7 +78,7 @@ Style/ClassVars: StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-class-vars Enabled: false Style/CollectionMethods: - Enabled: true + Enabled: false PreferredMethods: find: detect inject: reduce @@ -232,7 +232,7 @@ Naming/BinaryOperatorParameterName: StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg Enabled: false Metrics/ParameterLists: - Description: Avoid parameter lists longer than three or four parameters. + Description: Avoid long parameter lists. StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params Enabled: true Max: 5 diff --git a/ci/rubocop.yml b/ci/rubocop.yml index 7929e40..81b58d5 100644 --- a/ci/rubocop.yml +++ b/ci/rubocop.yml @@ -14,9 +14,9 @@ --- AllCops: Exclude: - - vendor/**/* - db/**/* - tmp/**/* + - vendor/**/* DisplayCopNames: false StyleGuideCopsOnly: false TargetRubyVersion: 3.1 @@ -75,7 +75,7 @@ Style/ClassVars: StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-class-vars Enabled: false Style/CollectionMethods: - Enabled: true + Enabled: false PreferredMethods: find: detect inject: reduce @@ -229,7 +229,7 @@ Naming/BinaryOperatorParameterName: StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg Enabled: false Metrics/ParameterLists: - Description: Avoid parameter lists longer than three or four parameters. + Description: Avoid long parameter lists. StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params Enabled: true Max: 5 diff --git a/src/rubocop/rubocop.ribose.yml b/src/rubocop/rubocop.ribose.yml index 968440c..7e10ea9 100644 --- a/src/rubocop/rubocop.ribose.yml +++ b/src/rubocop/rubocop.ribose.yml @@ -66,14 +66,18 @@ Style/CollectionMethods: Style/TrailingCommaInArguments: EnforcedStyleForMultiline: comma -# From 322cb2c179a721fed382a691124185a01811cf11 +# Contrary to what hound apparently prefers +# (see 322cb2c179a721fed382a691124185a01811cf11), +# we prefer trailing dots. Layout/DotPosition: - EnforcedStyle: leading + EnforcedStyle: trailing # Delete following lines after migrating to Rubocop 2.x, as these checks # will be enabled by default. Style/ArgumentsForwarding: Enabled: true +# Hound CI, being stuck on version 1.22.2 (as of 2023-11-09), +# does not recognize the following cop: Gemspec/RequireMFA: Enabled: false \ No newline at end of file