sevencop 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0977a1a38e5da28e989cde731824234e1a8aaa2f926cf416d31c4acbe9fb4a3d'
-  data.tar.gz: 3bbf77f3ad02d92ed82ca989908deb42cbced1e8ff7b9cd830a8a3b4b46c40e2
+  metadata.gz: 2fc5d0adbf2ac9b5c3aa8ac43e1e375f82efa0906710ca38bd41c145c3a2bb41
+  data.tar.gz: fd8b73bcc7ea73410c6634a3dbd5fcb3b38f3af26570482b22a2d05b2f42f6b3
 SHA512:
-  metadata.gz: 327acfe1f5b8d48ec9d11f369e32287b13972efdbe69c7e85f7f7a0ea7dfb520c5ac6d1be803e0b727bff6de6e231096d35c5b6a8e516aa0b3dfd98f1aec0eac
-  data.tar.gz: 6eb86ca1c5caa944ad099e556dcbc5d881b8c8be7c63e1d4bd6cccbc14d5fdfadfd4808e03c8461726f5f9e1ba97e0dcc247f0c34874eb8dc01152f6243ad14f
+  metadata.gz: 9024936b3ef659bae3242f40c793e72249edde9d6838f65edf570039077aad0abebe18ad8e2be52dad270ef4322bce2b841ffc33d42323a151b55b97d86cdc5a
+  data.tar.gz: 19450fde029f352c3bba68362bb8a0db0c2ec01ceb319702565083768d281613b9bd123b34345f1096350a6bd3eab7efdb89079cd0f63526406f8d6b0b404b9c

data/.rubocop.yml

@@ -1,5 +1,8 @@
 require:
   - rubocop/cop/internal_affairs
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
   NewCops: enable
@@ -9,5 +12,18 @@ AllCops:
 Metrics:
   Enabled: false
 
+RSpec:
+  Language:
+    Expectations:
+      - expect_correction
+      - expect_no_offenses
+      - expect_offense
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false

data/Gemfile

@@ -5,6 +5,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in sevencop.gemspec
 gemspec
 
-gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.0'
-gem 'rubocop', '~> 1.21'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-performance'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sevencop (0.11.0)
+    sevencop (0.12.0)
       rubocop
 
 GEM
@@ -11,7 +11,7 @@ GEM
     diff-lcs (1.5.0)
     json (2.6.2)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -23,35 +23,45 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.31.2)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
+    rubocop-performance (1.15.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.13.1)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rake
+  rspec
+  rubocop
+  rubocop-performance
+  rubocop-rake
+  rubocop-rspec
   sevencop!
 
 BUNDLED WITH

data/README.md

@@ -47,6 +47,20 @@ Sevencop/BelongsToOptional:
 
 All cops are `Enabled: false` by default.
 
+### Sevencop/AutoloadOrdered
+
+Sort `autoload` in alphabetical order.
+
+```ruby
+# bad
+autoload :B, 'b'
+autoload :A, 'a'
+
+# good
+autoload :A, 'a'
+autoload :B, 'b'
+```
+
 ### Sevencop/BelongsToOptional
 
 Force `belongs_to` with `optional: true` option.

data/config/default.yml

@@ -1,3 +1,9 @@
+Sevencop/AutoloadOrdered:
+  Description: |
+    Sort `autoload` in alphabetical order.
+  Enabled: false
+  VersionAdded: '0.12.0'
+
 Sevencop/BelongsToOptional:
   Description: |
     Force `belongs_to` with `optional: true` option.

data/lib/rubocop/cop/sevencop/autoload_ordered.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sevencop
+      # Sort `autoload` in alphabetical order.
+      #
+      # @example
+      #   # bad
+      #   autoload :B, 'b'
+      #   autoload :A, 'a'
+      #
+      #   # good
+      #   autoload :A, 'a'
+      #   autoload :B, 'b'
+      class AutoloadOrdered < Base
+        extend AutoCorrector
+
+        include RangeHelp
+
+        MSG = 'Sort `autoload` in alphabetical order.'
+
+        RESTRICT_ON_SEND = %i[
+          autoload
+        ].freeze
+
+        # @param node [RuboCop::AST::SendNode]
+        def on_send(node)
+          previous_older_autoload = find_previous_older_autoload(node)
+          return unless previous_older_autoload
+
+          add_offense(node) do |corrector|
+            swap(
+              range_by_whole_lines(
+                previous_older_autoload.location.expression,
+                include_final_newline: true
+              ),
+              range_by_whole_lines(
+                node.location.expression,
+                include_final_newline: true
+              ),
+              corrector: corrector
+            )
+          end
+        end
+
+        private
+
+        # @param node [RuboCop::AST::SendNode]
+        # @return [RuboCop::AST::SendNode]
+        def find_previous_older_autoload(node)
+          node.left_siblings.find do |sibling|
+            next unless sibling.send_type?
+            next unless sibling.method?(:autoload)
+
+            node.first_argument.source < sibling.first_argument.source
+          end
+        end
+
+        # @param range1 [Paresr::Source::Range]
+        # @param range2 [Paresr::Source::Range]
+        # @param corrector [RuboCop::AST::Corrector]
+        def swap(range1, range2, corrector:)
+          corrector.insert_before(range1, range2.source)
+          corrector.remove(range2)
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/sevencop/factory_bot_create_list.rb

@@ -49,6 +49,7 @@ module RuboCop
             )
           end
         end
+        alias on_numblock on_block
 
         private
 

data/lib/rubocop/cop/sevencop/method_definition_multiline_arguments.rb

@@ -26,7 +26,8 @@ module RuboCop
 
         # @param node [RuboCop::AST::ArgsNode]
         def on_args(node)
-          return if method_args?(node) && multilined?(node)
+          return unless method_args?(node)
+          return if multilined?(node)
 
           add_offense(node) do |corrector|
             autocorrect(corrector, node)

data/lib/sevencop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sevencop
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/lib/sevencop.rb

@@ -3,6 +3,7 @@
 require_relative 'sevencop/rubocop_extension'
 require_relative 'sevencop/version'
 
+require_relative 'rubocop/cop/sevencop/autoload_ordered'
 require_relative 'rubocop/cop/sevencop/belongs_to_optional'
 require_relative 'rubocop/cop/sevencop/factory_bot_create_list'
 require_relative 'rubocop/cop/sevencop/hash_literal_order'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -41,6 +41,7 @@ files:
 - README.md
 - Rakefile
 - config/default.yml
+- lib/rubocop/cop/sevencop/autoload_ordered.rb
 - lib/rubocop/cop/sevencop/belongs_to_optional.rb
 - lib/rubocop/cop/sevencop/factory_bot_create_list.rb
 - lib/rubocop/cop/sevencop/hash_literal_order.rb