sevencop 0.45.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6397930dce89363902d194be1a0b259969d18fcf1224068130f9959178c77ff8
-  data.tar.gz: 51efafab1bd74a671469f4aca611d47892a9cefd3d862ce9795e444b57bbffca
+  metadata.gz: 4f3da941ce26e523263ae349b642de04f08c6fafb25c65ee87a1552700336a59
+  data.tar.gz: 57c17da50da92c2fc735ea23b1acaf216885069afc651a14386a288ce93f400c
 SHA512:
-  metadata.gz: 255171a35cbf105447f400f82e8ecce903a478a9b9dd3fff3e270ad9ee4b78a72c7f66502bfbae9c3d02d717a6787cc40d97a1f608c587563566b6d96f613a2d
-  data.tar.gz: 5a985d8e7ffd6fe1442f1f8992987618878bacbde3ea36137cb68d36340f66149d94653cd14e3bfe6640dc877eafbef34874514b59271d8ce58df7adfaf69dc4
+  metadata.gz: c5b76d4613a1d575720c9aa07cc3253608ef19cd0cf9e7c25fedebbb8355d0af46a2701b3282147b4058646b4ef9123f7c39b34eb217a53cadd93a6947556fea
+  data.tar.gz: 139c3d03d5ed0441d78564bbe21e7037273bab082e72c47c530e631869f4654fbc070b31a6d82a194c76f98a27ac5c8db5170993a584bec0f4a0f87656c7e4f0

data/.rubocop.yml

@@ -50,6 +50,9 @@ RSpec/SpecFilePathFormat:
 Sevencop/AutoloadOrdered:
   Enabled: true
 
+Sevencop/BundlerGemGroupOrdered:
+  Enabled: true
+
 Sevencop/HashElementOrdered:
   Enabled: true
 

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    sevencop (0.45.0)
+    sevencop (0.46.0)
       activesupport
       rubocop
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -21,17 +22,18 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
-    minitest (5.25.1)
+    logger (1.6.2)
+    minitest (5.25.2)
     parallel (1.26.3)
     parser (3.3.5.0)
       ast (~> 2.4.1)
@@ -73,7 +75,7 @@ GEM
     rubocop-rspec (3.0.4)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
+    securerandom (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)

data/README.md

@@ -29,6 +29,7 @@ Note that all cops are `Enabled: false` by default.
 ## Cops
 
 - [Sevencop/AutoloadOrdered](lib/rubocop/cop/sevencop/autoload_ordered.rb)
+- [Sevencop/BundlerGemGroupOrdered](lib/rubocop/cop/sevencop/bundler_gem_group_ordered.rb)
 - [Sevencop/HashElementOrdered](lib/rubocop/cop/sevencop/hash_element_ordered.rb)
 - [Sevencop/MapMethodChain](lib/rubocop/cop/sevencop/map_method_chain.rb)
 - [Sevencop/MethodDefinitionArgumentsMultiline](lib/rubocop/cop/sevencop/method_definition_arguments_multiline.rb)

data/config/default.yml

@@ -4,6 +4,16 @@ Sevencop/AutoloadOrdered:
   Enabled: false
   Safe: false
 
+Sevencop/BundlerGemGroupOrdered:
+  Description: |
+    Sort `group` in alphabetical order.
+  Enabled: false
+  Safe: false
+  Include:
+    - '**/*.gemfile'
+    - '**/Gemfile'
+    - '**/gems.rb'
+
 Sevencop/HashElementOrdered:
   Description: |
     Sort Hash elements by key.

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

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sevencop
+      # Sort `group` in alphabetical order.
+      #
+      # Note that the sort key is computed from the sorted and concatenated `group` arguments.
+      # For example, the sort key for `group :test, :development` is `development-test`.
+      #
+      # @example
+      #   # bad
+      #   group :test do
+      #     gem 'rspec'
+      #   end
+      #
+      #   group :development do
+      #     gem 'better_errors'
+      #   end
+      #
+      #   # good
+      #   group :development do
+      #     gem 'better_errors'
+      #   end
+      #
+      #   group :test do
+      #     gem 'rspec'
+      #   end
+      class BundlerGemGroupOrdered < Base
+        extend AutoCorrector
+
+        include RangeHelp
+
+        include ::Sevencop::CopConcerns::Ordered
+
+        MSG = 'Sort `group` in alphabetical order.'
+
+        RESTRICT_ON_SEND = %i[
+          group
+        ].freeze
+
+        # @param [RuboCop::AST::SendNode] node
+        # @return [void]
+        def on_send(node)
+          block_node = node.block_node
+          return unless block_node
+
+          previous_older_sibling = find_previous_older_sibling(block_node)
+          return unless previous_older_sibling
+
+          add_offense(block_node) do |corrector|
+            corrector.swap(
+              range_with_comments_and_lines(previous_older_sibling),
+              range_with_comments_and_lines(block_node)
+            )
+          end
+        end
+
+        private
+
+        # @param [RuboCop::AST::BlockNode] node
+        # @return [String, nil]
+        def calculate_sort_key(node)
+          return unless node.send_node.arguments.all? { |argument| argument.respond_to?(:value) }
+
+          node.send_node.arguments.map(&:value).sort.join('-')
+        end
+
+        # @param [RuboCop::AST::BlockNode] node
+        # @return [RuboCop::AST::BlockNode, nil]
+        def find_previous_older_sibling(node)
+          node.left_siblings.grep(::RuboCop::AST::Node).reverse.find do |sibling|
+            break unless sibling.block_type?
+            break unless sibling.method?(:group)
+
+            current_sort_key = calculate_sort_key(node)
+            sibling_sort_key = calculate_sort_key(sibling)
+            break unless current_sort_key
+            break unless sibling_sort_key
+
+            calculate_sort_key(node) < calculate_sort_key(sibling)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sevencop/version.rb

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

data/lib/sevencop.rb

@@ -5,6 +5,7 @@ require_relative 'sevencop/rubocop_extension'
 require_relative 'sevencop/version'
 
 require_relative 'rubocop/cop/sevencop/autoload_ordered'
+require_relative 'rubocop/cop/sevencop/bundler_gem_group_ordered'
 require_relative 'rubocop/cop/sevencop/hash_element_ordered'
 require_relative 'rubocop/cop/sevencop/map_method_chain'
 require_relative 'rubocop/cop/sevencop/method_definition_arguments_multiline'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.46.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,6 +57,7 @@ files:
 - config/default.yml
 - data/reserved_words_mysql.txt
 - lib/rubocop/cop/sevencop/autoload_ordered.rb
+- lib/rubocop/cop/sevencop/bundler_gem_group_ordered.rb
 - lib/rubocop/cop/sevencop/hash_element_ordered.rb
 - lib/rubocop/cop/sevencop/map_method_chain.rb
 - lib/rubocop/cop/sevencop/method_definition_arguments_multiline.rb