manageiq-style 1.5.10 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc48f660e6b7546a67b99065b790816427b51c932db3885325b3971fa06bd75
-  data.tar.gz: 6590eca89be23c0a7ee65f75e3f9f1c22cd3069f2b5497a00df9203720e9101c
+  metadata.gz: 8dc8f7e1a74d5a77787a2d8651efbdc584db7e249e44952ee28201d66c4c3a49
+  data.tar.gz: 529873b1b2eecbe335b21c99d9535c5856118d03993d533222e4248d6184aa36
 SHA512:
-  metadata.gz: 8f9933a7651208d68329ed2e56140fe0a8ea0456590999ee1d950eb96933749951d0ed8f6b173a791b123b9999de039094e449a4e99595ea456af1f153303095
-  data.tar.gz: bd87683d426b1f8b2e28702e5535fbc38bf71bc60c93ba7aaa4fe2a33482ca182ecb1b249fce3f4f185e612ee0bfbf89d21cc3da933647a019c427f49b7d29dd
+  metadata.gz: fc8090e743429b29777c7364d074a1a293be8eb0f4a7a646673701a8a3fc1def8079c1db08f3b0f31feb1bbd74946450111c8b17370a20e927fbc129badde5b6
+  data.tar.gz: 39c9d3deefef54684d40e992ab300cd4707a7cfed0c5f8fb2130e135e3bd5bf5b7ad5a4951fb28b237feb9759d9f283d250571fae2174c484c80e48df17af541

data/.github/workflows/ci.yaml

@@ -23,6 +23,9 @@ jobs:
         - '3.0'
         - '3.1'
         - '3.2'
+        - '3.3'
+        - '3.4'
+        - '4.0'
     steps:
     - uses: actions/checkout@v6
     - name: Set up Ruby
@@ -33,3 +36,5 @@ jobs:
       timeout-minutes: 30
     - name: Run tests
       run: bundle exec rake
+    - name: Run rubocop
+      run: bundle exec rubocop

data/.rubocop_local.yml

@@ -1 +1,3 @@
-
+Naming/FileName:
+  Exclude:
+  - lib/manageiq-style.rb

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.6.0] - 2026-03-20
+### Changed
+- Bump rubocop to 1.85 [[#76](https://github.com/ManageIQ/manageiq-style/pull/76)]
+- Bump TargetRubyVersion to 3.3 [[#76](https://github.com/ManageIQ/manageiq-style/pull/76)]
+- Update .rubocop_base.yml after upgrade of rubocop [[#76](https://github.com/ManageIQ/manageiq-style/pull/76)]
+- Add Ruby 3.3, 3.4, and 4.0 [[#77](https://github.com/ManageIQ/manageiq-style/pull/77)]
+
 ## [1.5.10] - 2026-02-18
 ### Changed
 - Bump minimum version for rack to 2.2.22 for various CVEs [[#69](https://github.com/ManageIQ/manageiq-style/pull/69)], [[#74](https://github.com/ManageIQ/manageiq-style/pull/74)]
@@ -74,7 +81,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.1] - 2020-06-19
 ## [1.0.0] - 2020-05-19
 
-[Unreleased]: https://github.com/ManageIQ/manageiq-style/compare/v1.5.10...HEAD
+[Unreleased]: https://github.com/ManageIQ/manageiq-style/compare/v1.6.0...HEAD
+[1.6.0]: https://github.com/ManageIQ/manageiq-style/compare/v1.5.10...v1.6.0
 [1.5.10]: https://github.com/ManageIQ/manageiq-style/compare/v1.5.9...v1.5.10
 [1.5.9]: https://github.com/ManageIQ/manageiq-style/compare/v1.5.8...v1.5.9
 [1.5.8]: https://github.com/ManageIQ/manageiq-style/compare/v1.5.7...v1.5.8

data/lib/manageiq/style/cli.rb

@@ -141,7 +141,7 @@ module ManageIQ
           group_index += 1
           group_end = group_index
           group_end += 1 until lines[group_end].strip == "end"
-          group_range = (group_index..group_end - 1)
+          group_range = (group_index...group_end)
 
           # Split lines into "gem" units including their preceding comments or blank lines
           gem_units = lines[group_range].slice_after { |l| l.match?(/^\s*gem/) }.to_a

data/lib/manageiq/style/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Style
-    VERSION = "1.5.10".freeze
+    VERSION = "1.6.0".freeze
   end
 end

data/manageiq-style.gemspec

@@ -16,30 +16,28 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "more_core_extensions"
-  spec.add_runtime_dependency "optimist"
-  spec.add_runtime_dependency "rubocop", "= 1.56.3"
-  spec.add_runtime_dependency "rubocop-ast", "~> 1.40.0"
-  spec.add_runtime_dependency "rubocop-performance"
-  spec.add_runtime_dependency "rubocop-rails"
-
-  spec.add_runtime_dependency "rexml", ">= 3.4.4"  # rubocop depends on rexml. Enforce a minimum for CVE-2025-58767
+  spec.add_dependency "more_core_extensions"
+  spec.add_dependency "optimist"
+  spec.add_dependency "rubocop", "~> 1.85"
+  spec.add_dependency "rubocop-performance"
+  spec.add_dependency "rubocop-rails"
 
   # rubocop-rails depends on rack. Enforce a minimum for various CVEs
   #
   # NOTE: Previously we locked down to exclude many specific versions, but due to
   # https://github.com/rubygems/rubygems.org/issues/5541 we can't release the gem.
   # For now, we just lock down to at least the minimum rack.
-  spec.add_runtime_dependency "rack", ">= 2.2.22", "< 4" # CVE-2026-25500 https://github.com/advisories/GHSA-whrj-4476-wvmp
+  spec.add_dependency "rack", ">= 2.2.22", "< 4" # CVE-2026-25500 https://github.com/advisories/GHSA-whrj-4476-wvmp
 
-  spec.add_development_dependency "rake",      "~> 12.0"
+  spec.add_development_dependency "rake",      "~> 13.3"
   spec.add_development_dependency "rspec",     "~> 3.0"
   spec.add_development_dependency "simplecov", ">= 0.21.2"
 end

data/styles/base.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-rails
   - rubocop-performance
 
@@ -8,7 +8,7 @@ AllCops:
     - spec/manageiq/**/*
     - vendor/**/*
   SuggestExtensions: false
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.3
 Gemspec/DevelopmentDependencies:
   EnforcedStyle: gemspec
 Gemspec/RequiredRubyVersion:
@@ -16,63 +16,31 @@ Gemspec/RequiredRubyVersion:
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
-Layout/DefEndAlignment:
-  AutoCorrect: true
-Layout/EndAlignment:
-  AutoCorrect: true
 Layout/ExtraSpacing:
-  AutoCorrect: true
   Exclude:
     - Gemfile
 Layout/LineLength:
   Enabled: false
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
 Layout/SpaceBeforeFirstArg:
   Enabled: false
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Enabled: false
-Metrics/BlockNesting:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/ModuleLength:
-  Enabled: false
-Metrics/ParameterLists:
-  Enabled: false
-Metrics/PerceivedComplexity:
+Metrics:
   Enabled: false
 Naming/MethodParameterName:
   AllowedNames:
-    - vm
     - dc
+    - vm
 Naming/RescuedExceptionsVariableName:
   Enabled: false
 Naming/VariableNumber:
   Enabled: false
-Performance/Casecmp:
-  Enabled: false
 Rails:
   Enabled: true
 Rails/FindEach:
   Enabled: false
 Rails/HttpStatus:
-  Enabled: true
   EnforcedStyle: numeric
-Rails/ReadWriteAttribute:
-  AutoCorrect: false
 Style/AccessModifierDeclarations:
   Enabled: false
 Style/ClassAndModuleChildren:
@@ -80,6 +48,7 @@ Style/ClassAndModuleChildren:
 Style/ClassCheck:
   EnforcedStyle: kind_of?
 Style/CollectionMethods:
+  # Enabled: true
   PreferredMethods:
     find: detect
     find_all: select
@@ -93,8 +62,6 @@ Style/EmptyMethod:
   Enabled: false
 Style/Encoding:
   Enabled: false
-Style/ExponentialNotation:
-  Enabled: true
 Style/FormatString:
   EnforcedStyle: percent
 Style/FormatStringToken:
@@ -103,16 +70,10 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Style/GuardClause:
   Enabled: false
-Style/HashEachMethods:
-  Enabled: true
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
     - db/schema.rb
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
 Style/IfUnlessModifier:
   Enabled: false
 Style/MethodCallWithArgsParentheses:
@@ -235,6 +196,9 @@ Style/MethodCallWithArgsParentheses:
     - banner
     - die
     - opt
+    - synopsis
+    - usage
+    - version
     # MIQ
     - add_trigger
     - alias_with_relationship_type
@@ -262,32 +226,22 @@ Style/NegatedIf:
   Enabled: false
 Style/NegatedIfElseCondition:
   Enabled: false
-Style/NumericLiterals:
-  AutoCorrect: false
 Style/NumericPredicate:
   Enabled: false
-Style/PerlBackrefs:
-  Enabled: false
 Style/ParallelAssignment:
   Enabled: false
+Style/PerlBackrefs:
+  Enabled: false
 Style/QuotedSymbols:
   Enabled: false # disabled because Style/StringLiterals is disabled
 Style/RedundantReturn:
   AllowMultipleReturnValues: true
 Style/RegexpLiteral:
   Enabled: false
-Style/RescueModifier:
-  AutoCorrect: false
 Style/RescueStandardError:
   EnforcedStyle: implicit
-Style/SignalException:
-  EnforcedStyle: only_raise
-Style/SingleLineBlockParams:
-  Enabled: false
 Style/SingleLineMethods:
   AllowIfMethodIsEmpty: false
-Style/SpecialGlobalVars:
-  AutoCorrect: false
 Style/StringLiterals:
   Enabled: false # Also see Style/QuotedSymbols
 Style/StringLiteralsInInterpolation:
@@ -300,8 +254,6 @@ Style/TrailingCommaInHashLiteral:
   Enabled: false
 Style/TrailingUnderscoreVariable:
   Enabled: false
-Style/TrivialAccessors:
-  AllowPredicates: true
 Style/WhileUntilModifier:
   Enabled: false
 Style/WordArray:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-style
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.6.0
 platform: ruby
 authors:
 - ManageIQ Authors
@@ -39,32 +39,18 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.56.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.56.3
-- !ruby/object:Gem::Dependency
-  name: rubocop-ast
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.40.0
+        version: '1.85'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.40.0
+        version: '1.85'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -93,20 +79,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -133,14 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +171,6 @@ files:
 - manageiq-style.gemspec
 - renovate.json
 - styles/base.yml
-- test.rb
 homepage: https://github.com/ManageIQ/manageiq-style
 licenses:
 - MIT
@@ -221,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.7
 specification_version: 4
 summary: Style and linting configuration for ManageIQ projects.
 test_files: []

data/test.rb

@@ -1,5 +0,0 @@
-begin
-  puts "Hi"
-ensure
-  puts "There"
-end