rubocop-chromebrew 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d431011e66045f1bd16d7c3e92ddb7f3a9b8008ba59ee9e784c7d768e24f39
-  data.tar.gz: 7cc26b424245fb3d123443ffed2e1180255b0795d59e5d7c418df1b6d5364679
+  metadata.gz: '0607503886d47cd386967c421e1cbd48cf548b603bef64f6cfd1ebafbd65f9b0'
+  data.tar.gz: ecce859a1eca8fb82bbf17b2735be68e4bcfbfd2344cedb11dd9607fca03b583
 SHA512:
-  metadata.gz: 24d466bd63143724e77fc4530bb070c16de17f2f703f24420ce458b84023b9d02dc168d77e4fea127a30e70c1edbca7538cacd313c7ad23e2eb0bf67d693cab1
-  data.tar.gz: 890d6b1d53b9034f0ad4b7eee71231f97a5d956c9d8f930ca84c8d75a9ba357e7de8580c9e19436db31b19c45deb5d88e48e0bc665346e21e14ff10ca8046f31
+  metadata.gz: 4ceb68e04f6bc65d767507eb2b0a17b3990af3d0407724426762ab55dbe0f74d88ab6bdce89f40ceb6d23aa7b98bc6b09491603334957f6edd8e7adcaf0c6e97
+  data.tar.gz: 57839de0cfff500323a8d5237d344edd1f6c50e2b487e642d4870ea57ff4f14eafc0aaaf22805d24103fea8dfb9d12e781467ce803491609d75df8a830bab88c

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.0.3 (2025-02-10)
+
+### New features
+
+* Add Chromebrew/OrderedCompatibility cop ([@zopolis4][])
+
+### Changes
+
+* Limit Chromebrew/CompatibilityAll offense reporting to the offensive compatibility value rather than the whole node ([@zopolis4][])
+
 ## 0.0.2 (2025-02-02)
 
 ### Bug fixes

data/config/default.yml

@@ -5,3 +5,8 @@ Chromebrew/CompatibilityAll:
   Description: "This cop checks for compatibility values that can be replaced by 'all'."
   Enabled: true
   VersionAdded: '0.0.1'
+
+Chromebrew/OrderedCompatibility:
+  Description: 'This cop checks for compatibility values that are not in alphabetical order.'
+  Enabled: true
+  VersionAdded: '0.0.3'

data/lib/rubocop/cop/chromebrew/compatibility_all.rb

@@ -28,9 +28,9 @@ module RuboCop
           # Check if the compatibility value includes all four architectures.
           return unless architectures.all? { |arch| value.include?(arch) }
 
-          # If requested, replace the offending line with compatibility 'all'.
-          add_offense(node) do |corrector|
-            corrector.replace(node, "compatibility 'all'")
+          # If requested, replace the offending compatibility value with 'all'.
+          add_offense(node.children.last) do |corrector|
+            corrector.replace(node.children.last, "'all'")
           end
         end
       end

data/lib/rubocop/cop/chromebrew/ordered_compatibility.rb

@@ -0,0 +1,39 @@
+module RuboCop
+  module Cop
+    module Chromebrew
+      # Compatibility values should be in alphabetic order.
+      #
+      # @example
+      #   # bad
+      #   compatibility 'x86_64 aarch64 armv7l'
+      #
+      #   # good
+      #   compatibility 'aarch64 armv7l x86_64'
+      #
+      class OrderedCompatibility < Base
+        extend AutoCorrector
+        MSG = 'Compatibility values should be in alphabetical order.'
+
+        def_node_matcher :compatibility?, <<~PATTERN
+          (send nil? :compatibility
+            (str $_))
+        PATTERN
+
+        def on_send(node)
+          # Check that we're operating on the compatibility property.
+          value = compatibility?(node)
+          return unless value
+
+          sorted_value = value.split.sort.join(' ')
+
+          return if sorted_value == value
+
+          # If requested, replace the offending compatibility value with the sorted version.
+          add_offense(node.children.last) do |corrector|
+            corrector.replace(node.children.last, "'#{sorted_value}'")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chromebrew_cops.rb

@@ -1 +1,2 @@
 require_relative 'chromebrew/compatibility_all'
+require_relative 'chromebrew/ordered_compatibility'

data/rubocop-chromebrew.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |spec|
   spec.name     = 'rubocop-chromebrew'
   spec.summary  = 'A RuboCop extension for Chromebrew-specific practices.'
-  spec.version  = '0.0.2'
+  spec.version  = '0.0.3'
   spec.license  = 'GPL-3.0-or-later'
   spec.author   = 'Zopolis4'
   spec.email    = 'creatorsmithmdt@gmail.com'
-  spec.homepage = 'https://github.com/Zopolis4/rubocop-chromebrew'
+  spec.homepage = 'https://github.com/chromebrew/rubocop-chromebrew'
 
   spec.files         = `git ls-files`.split("\n")
   spec.require_paths = ['lib']

data/spec/rubocop/cop/chromebrew/compatibility_all_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe RuboCop::Cop::Chromebrew::CompatibilityAll, :config do
   it 'registers an offense when all four architectures are listed' do
     expect_offense(<<~'RUBY')
       compatibility 'aarch64 armv7l i686 x86_64'
-      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Compatibility properties which match all architectures should be replaced with 'all'
+                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Compatibility properties which match all architectures should be replaced with 'all'
     RUBY
 
     expect_correction(<<~'RUBY')
@@ -13,7 +13,7 @@ RSpec.describe RuboCop::Cop::Chromebrew::CompatibilityAll, :config do
   it 'registers an offense when all four architectures are listed with commas' do
     expect_offense(<<~'RUBY')
       compatibility 'aarch64, armv7l, i686, x86_64'
-      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Compatibility properties which match all architectures should be replaced with 'all'
+                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Compatibility properties which match all architectures should be replaced with 'all'
     RUBY
 
     expect_correction(<<~'RUBY')
@@ -24,7 +24,7 @@ RSpec.describe RuboCop::Cop::Chromebrew::CompatibilityAll, :config do
   it 'registers an offense when all four architectures are listed in a different order' do
     expect_offense(<<~'RUBY')
       compatibility 'i686 armv7l x86_64 aarch64'
-      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Compatibility properties which match all architectures should be replaced with 'all'
+                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Compatibility properties which match all architectures should be replaced with 'all'
     RUBY
 
     expect_correction(<<~'RUBY')

data/spec/rubocop/cop/chromebrew/ordered_compatibility_spec.rb

@@ -0,0 +1,41 @@
+RSpec.describe RuboCop::Cop::Chromebrew::OrderedCompatibility, :config do
+  it 'registers an offense when compatibiltiy is not in alphabetical order with three elements' do
+    expect_offense(<<~'RUBY')
+      compatibility 'x86_64 aarch64 armv7l'
+                    ^^^^^^^^^^^^^^^^^^^^^^^ Compatibility values should be in alphabetical order.
+    RUBY
+
+    expect_correction(<<~'RUBY')
+      compatibility 'aarch64 armv7l x86_64'
+    RUBY
+  end
+
+  it 'registers an offense when compatibiltiy is not in alphabetical order with two elements' do
+    expect_offense(<<~'RUBY')
+      compatibility 'x86_64 i686'
+                    ^^^^^^^^^^^^^ Compatibility values should be in alphabetical order.
+    RUBY
+
+    expect_correction(<<~'RUBY')
+      compatibility 'i686 x86_64'
+    RUBY
+  end
+
+  it 'does not register an offense when compatibility is in alphabetical order' do
+    expect_no_offenses(<<~'RUBY')
+      compatibility 'aarch64 armv7l x86_64'
+    RUBY
+  end
+
+  it 'does not register an offense when compatibility is a single architecture' do
+    expect_no_offenses(<<~'RUBY')
+      compatibility 'x86_64'
+    RUBY
+  end
+
+  it 'does not register an offense when compatibility is all' do
+    expect_no_offenses(<<~'RUBY')
+      compatibility 'all'
+    RUBY
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-chromebrew
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Zopolis4
 bindir: bin
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -39,11 +39,13 @@ files:
 - lib/rubocop/chromebrew.rb
 - lib/rubocop/chromebrew/inject.rb
 - lib/rubocop/cop/chromebrew/compatibility_all.rb
+- lib/rubocop/cop/chromebrew/ordered_compatibility.rb
 - lib/rubocop/cop/chromebrew_cops.rb
 - rubocop-chromebrew.gemspec
 - spec/rubocop/cop/chromebrew/compatibility_all_spec.rb
+- spec/rubocop/cop/chromebrew/ordered_compatibility_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/Zopolis4/rubocop-chromebrew
+homepage: https://github.com/chromebrew/rubocop-chromebrew
 licenses:
 - GPL-3.0-or-later
 metadata: {}
@@ -61,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A RuboCop extension for Chromebrew-specific practices.
 test_files: []