sevencop 0.11.1 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5145711881e4ff729c76af2973e3c7af5c4ad5d7a72318dc28ea4346b7530e0
-  data.tar.gz: 3bade2432dfd3a659d4c689c005cc36c0ecb16da14dd99d338a815876ec8951f
+  metadata.gz: adcb3382c32455ca63651bf5593974e773cf00dfd0b3d14955541c6ce219c6c7
+  data.tar.gz: d6f50b292bb6f56c0f6ec36fc4271c931af4c1c46cef9b8c14a2505cf984f8ed
 SHA512:
-  metadata.gz: 8011ea16ecaf3d1e8eb34156ca6b30f1f545d3d01406a4a1fa189b5cfb5bd74a4b0a6d177762c750023ac50c645e1ef8378028d44f4c710ea6744577fa7c5a64
-  data.tar.gz: '0392eb84b36bff0120d79e637d84fa3d893935d10c4dfd5dbd004bacdff75bf524137dc38976705e69aaa6c420fe4ad01160b89c36a49bc6c764d8cccae4079c'
+  metadata.gz: 552d6582fc4aa3baa550afd6d27477c822e4f098b470c0c038a36380c6ab74f9962a27e8f04be05cc60586be43376de1ec20a0a5b56587d71b24d3fa36e8e4cb
+  data.tar.gz: 05df622c8de515879b816077ba5fc40cd47858c1666390beac8d2ac29e86c1983921d5d8964b8b7de64106e789f3217032b6338a9988442207dbe5aeb62a8031

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.1)
+    sevencop (0.12.1)
       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,27 @@ Sevencop/BelongsToOptional:
 
 All cops are `Enabled: false` by default.
 
+### Sevencop/AutoloadOrdered
+
+Sort `autoload` in alphabetical order within their section.
+
+```ruby
+# bad
+autoload :B, 'b'
+autoload :A, 'a'
+
+# good
+autoload :A, 'a'
+autoload :B, 'b'
+
+# good
+autoload :B, 'b'
+autoload :D, 'd'
+
+autoload :A, 'a'
+autoload :C, 'a'
+```
+
 ### 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,87 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sevencop
+      # Sort `autoload` in alphabetical order within their section.
+      #
+      # @example
+      #   # bad
+      #   autoload :B, 'b'
+      #   autoload :A, 'a'
+      #
+      #   # good
+      #   autoload :A, 'a'
+      #   autoload :B, 'b'
+      #
+      #   # good
+      #   autoload :A, 'a'
+      #   autoload :D, 'd'
+      #
+      #   autoload :B, 'b'
+      #   autoload :C, 'c'
+      class AutoloadOrdered < Base
+        extend AutoCorrector
+
+        include RangeHelp
+
+        MSG = 'Sort `autoload` in alphabetical order within their section.'
+
+        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)
+            next unless in_same_section?(sibling, node)
+
+            node.first_argument.source < sibling.first_argument.source
+          end
+        end
+
+        # @param node1 [RuboCop::AST::SendNode]
+        # @param node2 [RuboCop::AST::SendNode]
+        # @return [Boolean]
+        def in_same_section?(node1, node2)
+          !node1.location.expression.with(
+            end_pos: node2.location.expression.end_pos
+          ).source.include?("\n\n")
+        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/sevencop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sevencop
-  VERSION = '0.11.1'
+  VERSION = '0.12.1'
 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.1
+  version: 0.12.1
 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