ruboclean 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1cfe738ba362d670fed8004290f7f8953620c6aeada68b505603f8d858e5cf6
-  data.tar.gz: 24d77678bd60fc6e71418ad9f8ab44d30353a162d3c0a86588eb7ee8948b15ad
+  metadata.gz: 8356a24c5eef21d90f98b6a9d70e05c39eecca00bdad3cc44cf487f7f13d4d3f
+  data.tar.gz: 547493df65b231feec2b0e110beaca285a4c708726a60f25ce42da25c04297de
 SHA512:
-  metadata.gz: fc1a89179e6c16677bb6188e6f2a90c48797bf80157dd1ab1d6833e9f4b9ed78b3877e890433c982dfd08013db56123c55aafa9e01aec36f454428b45299b751
-  data.tar.gz: 58ba7d50f237c17fa81253961603649ce5d6ddb8165d697770dbc2090ec2f13d3de8dc5d1f34fa2ed1e0eb464602335e8f52d7afd771245f68be2f9d4e80fc31
+  metadata.gz: 2a322034ef76aef728838a67c0400b6a869614765367347582b99a6a0e9d76ceb1c04ac7f93217d35702eb18b9c111958b059ee39716a8f5d2535f00a6e05e0b
+  data.tar.gz: 2b9895e2eba1124a33fd0808f2622a22e848cfe87ebede24cda7f17dfc7490e233db040342de84343d69f1dd57d430b8feaf5e9aa87d8961c8c3662624d3e583

data/.github/workflows/ci.yml

@@ -1,33 +1,29 @@
 env:
-  RUBY_VERSION: 2.7
   CC_TEST_REPORTER_BINARY_URL: https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
   CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
 
 name: Continuous Integration
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'  # Set a branch to deploy
+  pull_request:
 
 jobs:
   test:
-    name: Run bin/test
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: ['2.7', '3.0', '3.1', head]
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ env.RUBY_VERSION }}
-
-      # install gems
-      - name: Cache Ruby gems
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
       # prepare CC test reporter
       - name: Download CC test reporter binary

data/.rubocop.yml

@@ -1,107 +1,332 @@
 ---
 
+require:
+- rubocop-minitest
+- rubocop-rake
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: true
+
+Gemspec/RequireMFA:
+  Enabled: true
+
 Layout/BeginEndAlignment:
   Enabled: true
 
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
 
+Layout/LineContinuationLeadingSpace:
+  Enabled: true
+
+Layout/LineContinuationSpacing:
+  Enabled: true
+
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: true
+
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+
+Lint/AmbiguousAssignment:
+  Enabled: true
+
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: true
+
+Lint/AmbiguousRange:
+  Enabled: true
+
 Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: true
 
 Lint/ConstantDefinitionInBlock:
   Enabled: true
 
+Lint/ConstantOverwrittenInRescue:
+  Enabled: true
+
+Lint/DeprecatedConstants:
+  Enabled: true
+
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true
 
+Lint/DuplicateBranch:
+  Enabled: true
+
 Lint/DuplicateElsifCondition:
   Enabled: true
 
+Lint/DuplicateMagicComment:
+  Enabled: true
+
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+
 Lint/DuplicateRequire:
   Enabled: true
 
 Lint/DuplicateRescueException:
   Enabled: true
 
+Lint/EmptyBlock:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: true
+
 Lint/EmptyConditionalBody:
   Enabled: true
 
 Lint/EmptyFile:
   Enabled: true
 
+Lint/EmptyInPattern:
+  Enabled: true
+
 Lint/FloatComparison:
   Enabled: true
 
 Lint/IdentityComparison:
   Enabled: true
 
+Lint/IncompatibleIoSelectWithFiberScheduler:
+  Enabled: true
+
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+
 Lint/MissingSuper:
   Enabled: true
 
 Lint/MixedRegexpCaptureTypes:
   Enabled: true
 
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+
+Lint/NonAtomicFileOperation:
+  Enabled: true
+
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
 Lint/OutOfRangeRegexpRef:
   Enabled: true
 
 Lint/RaiseException:
   Enabled: true
 
+Lint/RedundantDirGlobSort:
+  Enabled: true
+
+Lint/RefinementImportMethods:
+  Enabled: true
+
+Lint/RequireRangeParentheses:
+  Enabled: true
+
+Lint/RequireRelativeSelfPath:
+  Enabled: true
+
 Lint/SelfAssignment:
   Enabled: true
 
 Lint/StructNewOverride:
   Enabled: true
 
+Lint/SymbolConversion:
+  Enabled: true
+
+Lint/ToEnumArguments:
+  Enabled: true
+
 Lint/TopLevelReturnWithArgument:
   Enabled: true
 
 Lint/TrailingCommaInAttributeDeclaration:
   Enabled: true
 
+Lint/TripleQuotes:
+  Enabled: true
+
+Lint/UnexpectedBlockArity:
+  Enabled: true
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+
 Lint/UnreachableLoop:
   Enabled: true
 
 Lint/UselessMethodDefinition:
   Enabled: true
 
+Lint/UselessRuby2Keywords:
+  Enabled: true
+
 Lint/UselessTimes:
   Enabled: true
 
+Minitest/AssertInDelta:
+  Enabled: true
+
+Minitest/AssertKindOf:
+  Enabled: true
+
+Minitest/AssertOutput:
+  Enabled: true
+
+Minitest/AssertPathExists:
+  Enabled: true
+
+Minitest/AssertPredicate:
+  Enabled: true
+
+Minitest/AssertRaisesCompoundBody:
+  Enabled: true
+
+Minitest/AssertRaisesWithRegexpArgument:
+  Enabled: true
+
+Minitest/AssertSilent:
+  Enabled: true
+
+Minitest/AssertWithExpectedArgument:
+  Enabled: true
+
+Minitest/AssertionInLifecycleHook:
+  Enabled: true
+
+Minitest/DuplicateTestRun:
+  Enabled: true
+
+Minitest/EmptyLineBeforeAssertionMethods:
+  Enabled: true
+
+Minitest/LiteralAsActualArgument:
+  Enabled: true
+
+Minitest/MultipleAssertions:
+  Enabled: true
+  Max: 5
+
+Minitest/RefuteInDelta:
+  Enabled: true
+
+Minitest/RefuteKindOf:
+  Enabled: true
+
+Minitest/RefutePathExists:
+  Enabled: true
+
+Minitest/RefutePredicate:
+  Enabled: true
+
+Minitest/SkipEnsure:
+  Enabled: true
+
+Minitest/SkipWithoutReason:
+  Enabled: true
+
+Minitest/TestMethodName:
+  Enabled: true
+
+Minitest/UnreachableAssertion:
+  Enabled: true
+
+Minitest/UnspecifiedException:
+  Enabled: true
+
+Naming/BlockForwarding:
+  Enabled: true
+
+Security/CompoundHash:
+  Enabled: true
+
+Security/IoMethods:
+  Enabled: true
+
 Style/AccessorGrouping:
   Enabled: true
 
+Style/ArgumentsForwarding:
+  Enabled: true
+
 Style/ArrayCoercion:
   Enabled: true
 
+Style/ArrayIntersect:
+  Enabled: true
+
 Style/BisectedAttrAccessor:
   Enabled: true
 
 Style/CaseLikeIf:
   Enabled: true
 
+Style/CollectionCompact:
+  Enabled: true
+
 Style/CombinableLoops:
   Enabled: true
 
+Style/ConcatArrayLiterals:
+  Enabled: true
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+
+Style/EmptyHeredoc:
+  Enabled: true
+
+Style/EndlessMethod:
+  Enabled: true
+
+Style/EnvHome:
+  Enabled: true
+
 Style/ExplicitBlockArgument:
   Enabled: true
 
 Style/ExponentialNotation:
   Enabled: true
 
+Style/FetchEnvVar:
+  Enabled: true
+
+Style/FileRead:
+  Enabled: true
+
+Style/FileWrite:
+  Enabled: true
+
 Style/GlobalStdStream:
   Enabled: true
 
 Style/HashAsLastArrayItem:
   Enabled: true
 
+Style/HashConversion:
+  Enabled: true
+
 Style/HashEachMethods:
   Enabled: true
 
+Style/HashExcept:
+  Enabled: true
+
 Style/HashLikeCase:
   Enabled: true
 
@@ -111,21 +336,87 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+
+Style/InPatternThen:
+  Enabled: true
+
 Style/KeywordParametersOrder:
   Enabled: true
 
+Style/MagicCommentFormat:
+  Enabled: true
+
+Style/MapCompactWithConditionalBlock:
+  Enabled: true
+
+Style/MapToHash:
+  Enabled: true
+
+Style/MapToSet:
+  Enabled: true
+
+Style/MinMaxComparison:
+  Enabled: true
+
+Style/MultilineInPatternThen:
+  Enabled: true
+
+Style/NegatedIfElseCondition:
+  Enabled: true
+
+Style/NestedFileDirname:
+  Enabled: true
+
+Style/NilLambda:
+  Enabled: true
+
+Style/NumberedParameters:
+  Enabled: true
+
+Style/NumberedParametersLimit:
+  Enabled: true
+
+Style/ObjectThen:
+  Enabled: true
+
+Style/OpenStructUse:
+  Enabled: true
+
+Style/OperatorMethodCall:
+  Enabled: true
+
 Style/OptionalBooleanParameter:
   Enabled: true
 
+Style/QuotedSymbols:
+  Enabled: true
+
+Style/RedundantArgument:
+  Enabled: true
+
 Style/RedundantAssignment:
   Enabled: true
 
+Style/RedundantConstantBase:
+  Enabled: true
+
+Style/RedundantDoubleSplatHashBraces:
+  Enabled: true
+
+Style/RedundantEach:
+  Enabled: true
+
 Style/RedundantFetchBlock:
   Enabled: true
 
 Style/RedundantFileExtensionInRequire:
   Enabled: true
 
+Style/RedundantInitialize:
+  Enabled: true
+
 Style/RedundantRegexpCharacterClass:
   Enabled: true
 
@@ -135,6 +426,15 @@ Style/RedundantRegexpEscape:
 Style/RedundantSelfAssignment:
   Enabled: true
 
+Style/RedundantSelfAssignmentBranch:
+  Enabled: true
+
+Style/RedundantStringEscape:
+  Enabled: true
+
+Style/SelectByRegexp:
+  Enabled: true
+
 Style/SingleArgumentDig:
   Enabled: true
 
@@ -144,5 +444,14 @@ Style/SlicingWithRange:
 Style/SoleNestedConditional:
   Enabled: true
 
+Style/StringChars:
+  Enabled: true
+
 Style/StringConcatenation:
   Enabled: true
+
+Style/SwapValues:
+  Enabled: true
+
+Style/YodaExpression:
+  Enabled: true

data/Gemfile

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :development do
-  gem 'minitest'
-  gem 'rake'
-  gem 'rubocop'
-  gem 'simplecov', '< 0.18'
+  gem "minitest"
+  gem "rake"
+  gem "rubocop"
+  gem "rubocop-minitest", require: false
+  gem "rubocop-rake", require: false
+  gem "simplecov", "< 0.18"
 end

data/Gemfile.lock

@@ -1,40 +1,45 @@
 PATH
   remote: .
   specs:
-    ruboclean (0.1.0)
+    ruboclean (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    docile (1.3.2)
-    json (2.3.1)
-    minitest (5.14.2)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    ast (2.4.2)
+    docile (1.4.0)
+    json (2.6.3)
+    minitest (5.17.0)
+    parallel (1.22.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.1)
-    rexml (3.2.4)
-    rubocop (0.92.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rubocop (1.42.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.5.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-minitest (0.25.1)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.4.1)
 
 PLATFORMS
   ruby
@@ -44,7 +49,9 @@ DEPENDENCIES
   rake
   ruboclean!
   rubocop
+  rubocop-minitest
+  rubocop-rake
   simplecov (< 0.18)
 
 BUNDLED WITH
-   2.1.4
+   2.4.2

data/Rakefile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task default: :test

data/bin/console

@@ -2,8 +2,8 @@
 
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'ruboclean'
+require "bundler/setup"
+require "ruboclean"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -12,5 +12,5 @@ require 'ruboclean'
 # require 'pry'
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/bin/ruboclean

@@ -2,10 +2,10 @@
 
 # frozen_string_literal: true
 
-require 'ruboclean'
+require "ruboclean"
 
 path = ARGV[0] || Dir.pwd
 
 print "Using path '#{path}' ... "
 Ruboclean.run(path)
-puts 'done.'
+puts "done."

data/bin/test

@@ -2,13 +2,13 @@
 
 # frozen_string_literal: true
 
-require 'fileutils'
+require "fileutils"
 
 # Runs all tests and linters
 class BinTest
   include FileUtils
 
-  APP_ROOT = File.expand_path('..', __dir__)
+  APP_ROOT = File.expand_path("..", __dir__)
 
   def system!(*args)
     system(*args) || abort("\n== Command #{args} failed ==")
@@ -17,10 +17,10 @@ class BinTest
   def run
     chdir APP_ROOT do
       puts "\n== Run tests =="
-      system! 'bundle exec rake test'
+      system! "bundle exec rake test"
 
       puts "\n== Run rubocop =="
-      system! 'bundle exec rubocop -p'
+      system! "bundle exec rubocop -p"
     end
   end
 end

data/lib/ruboclean/grouper.rb

@@ -14,7 +14,7 @@ module Ruboclean
       @config_hash.each_with_object(empty_groups) do |item, result|
         key, value = item
         target_group = find_target_group(key)
-        result[target_group].merge! Hash[key, value]
+        result[target_group].merge!({ key => value })
       end
     end
 
@@ -26,7 +26,7 @@ module Ruboclean
 
     def find_target_group(key)
       return :base if key.start_with?(/[a-z]/)
-      return :cops if key.include?('/')
+      return :cops if key.include?("/")
 
       :namespaces
     end

data/lib/ruboclean/orderer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ruboclean/grouper'
+require "ruboclean/grouper"
 
 module Ruboclean
   # Orders the items within the groups alphabetically

data/lib/ruboclean/rubocop_configuration_path.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require 'pathname'
-require 'yaml'
+require "pathname"
+require "yaml"
 
 module Ruboclean
   # Interface for reading and writing the `.rubocop.yml` file
   class RubocopConfigurationPath
+    PERMITTED_CLASSED = [Regexp].freeze
+
     # Thrown if given path is invalid
     class InvalidPathError < StandardError
       def initialize(path)
@@ -17,7 +19,7 @@ module Ruboclean
       input_path = Pathname.new(path)
 
       @rubocop_configuration_path = if input_path.directory?
-                                      input_path.join('.rubocop.yml')
+                                      input_path.join(".rubocop.yml")
                                     else
                                       input_path
                                     end
@@ -41,7 +43,7 @@ module Ruboclean
     end
 
     def load_yaml
-      YAML.safe_load(@rubocop_configuration_path.read)
+      YAML.safe_load(@rubocop_configuration_path.read, permitted_classes: PERMITTED_CLASSED)
     end
   end
 end

data/lib/ruboclean/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruboclean
-  VERSION = '0.2.0'
+  VERSION = "0.3.0"
 end

data/lib/ruboclean.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'ruboclean/version'
-require 'ruboclean/rubocop_configuration'
-require 'ruboclean/rubocop_configuration_path'
-require 'ruboclean/orderer'
+require "ruboclean/version"
+require "ruboclean/rubocop_configuration"
+require "ruboclean/rubocop_configuration_path"
+require "ruboclean/orderer"
 
 # Ruboclean entry point
 module Ruboclean

data/ruboclean.gemspec

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require_relative 'lib/ruboclean/version'
+require_relative "lib/ruboclean/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'ruboclean'
+  spec.name          = "ruboclean"
   spec.version       = Ruboclean::VERSION
-  spec.authors       = ['lxxxvi']
-  spec.email         = ['lxxxvi@users.noreply.github.com']
+  spec.authors       = ["lxxxvi"]
+  spec.email         = ["lxxxvi@users.noreply.github.com"]
 
-  spec.summary       = 'Cleans and orders settings in .rubocop.yml'
-  spec.description   = 'Cleans and orders settings in .rubocop.yml'
-  spec.homepage      = 'https://github.com/lxxxvi/ruboclean'
-  spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  spec.summary       = "Cleans and orders settings in .rubocop.yml"
+  spec.description   = "Cleans and orders settings in .rubocop.yml"
+  spec.homepage      = "https://github.com/lxxxvi/ruboclean"
+  spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/lxxxvi/ruboclean'
-  spec.metadata['changelog_uri'] = 'https://github.com/lxxxvi/ruboclean/blob/master/CHANGELOG.md'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/lxxxvi/ruboclean"
+  spec.metadata["changelog_uri"] = "https://github.com/lxxxvi/ruboclean/blob/master/CHANGELOG.md"
 
   # 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.
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  spec.executables << 'ruboclean'
-  spec.require_paths = ['lib']
+  spec.executables << "ruboclean"
+  spec.require_paths = ["lib"]
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboclean
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - lxxxvi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies: []
 description: Cleans and orders settings in .rubocop.yml
 email:
@@ -45,6 +45,7 @@ metadata:
   homepage_uri: https://github.com/lxxxvi/ruboclean
   source_code_uri: https://github.com/lxxxvi/ruboclean
   changelog_uri: https://github.com/lxxxvi/ruboclean/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -60,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Cleans and orders settings in .rubocop.yml