rubocop-require_tools 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aad89fc31b6e29a59acf207c01b17ce9c9100a5997f01852eb2e1eae34bbb6a
-  data.tar.gz: d2c82a9d7073595006896f8a5a7ba753ea1157c7bfc8380c39011e36f01975b3
+  metadata.gz: 92a502fba8cea8224ca73240fca61774a3a3c7dd9a572ba902da7cd5cdce804a
+  data.tar.gz: 7dcd0456375b56dfeaff84693ee49988e0b59efcb228622fbab249704645b99c
 SHA512:
-  metadata.gz: 8c0164d3c342f46b145a37c6a6a05754467291ac42cbf515559c3202cf13a397b1bcb80c39eeaf7470d00dd0f00acecd6370ded22a04e948380174f07191369a
-  data.tar.gz: 6f1c2a65941b56a6f9a757c66988996331370b5ccdef249a52de7ed466c9ebf9f7cc8b567aed5d86ff01d528caee221100dbbeb4a79b7334b8e7c3272bc8a9b3
+  metadata.gz: abcd24dd207443eeba31b9a7ab62444dea88c2df9bf619980136622570bc1eaa6aa935f5aa0cf1a220519f6fa105e21ced27f6510dd78521ce2edfad020444b5
+  data.tar.gz: 1c5570d3ff8bc845f313d9825a4d6b63f03b1fdfccd3b6cca0ee7a16b7cb9cea4a4f4882c2f65a7841348841f377c93c0fc76cd8ae4a42bd169770ea68f7effa

data/Gemfile.lock

@@ -1,57 +1,107 @@
 PATH
   remote: .
   specs:
-    rubocop-require_tools (0.1.0)
-      rubocop (~> 0.49)
+    rubocop-require_tools (0.2.0)
+      rubocop (>= 0.49.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    method_source (0.9.0)
-    parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    ast (2.4.3)
+    coderay (1.1.3)
+    diff-lcs (1.6.2)
+    io-console (0.8.2)
+    json (2.19.5)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    method_source (1.1.0)
+    parallel (2.1.0)
+    parser (3.3.11.1)
+      ast (~> 2.4.1)
+      racc
+    prism (1.9.0)
+    pry (0.16.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      reline (>= 0.6.0)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.52.1)
-      parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.86.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    unicode-display_width (1.3.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
+  arm64-darwin-25
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 4.0)
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop-require_tools!
 
+CHECKSUMS
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
+  json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
+  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
+  parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
+  parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  pry (0.16.0) sha256=d76c69065698ed1f85e717bd33d7942c38a50868f6b0673c636192b3d1b6054e
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
+  reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  rubocop (1.86.2) sha256=bb2e97f635eda42c448f2588f4a6ff78f221b8bdfdf65b1e9b07fbd57521b45d
+  rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
+  rubocop-require_tools (0.2.0)
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
+  unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
+
 BUNDLED WITH
-   1.16.0
+  4.0.10

data/README.md

@@ -17,7 +17,7 @@ And then execute:
 Then, require this extension in your project's `.rubocop.yml`:
 
 ```YAML
-require: rubocop-require_tools
+require: rubocop/require_tools
 ```
 
 ## Development
@@ -36,4 +36,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the rubocop-require_tools project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/rubocop-require_tools/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the rubocop-require_tools project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/milch/rubocop-require_tools/blob/master/CODE_OF_CONDUCT.md).

data/lib/rubocop/cop/require/missing_require_statement.rb

@@ -63,6 +63,19 @@ module RuboCop
           end
         end
 
+        def add_offense(node, location: nil, message:)
+          # Work around breaking API changes between rubocop 0.49.1 and later (...)
+          signature_old = %i[node loc message severity]
+          param_info = RuboCop::Cop::Cop.instance_method(:add_offense).parameters
+          if param_info.map(&:last) == signature_old
+            super(node, location || :expression, message)
+          elsif location
+            super(node, location: location, message: message)
+          else
+            super(node, message: message)
+          end
+        end
+
         def_node_matcher :extract_inner_const, <<-PATTERN
           (const $!nil? _)
         PATTERN
@@ -103,7 +116,17 @@ module RuboCop
           const_assign_name = extract_const_assignment(node)
           return unless const_assign_name
 
-          self.timeline << { event: :const_assign, name: const_assign_name }
+          # When the assigned value is itself a constant reference, the assignment is an
+          # alias (e.g. `Foo = Bar::Baz`). Track the target so member access through the
+          # alias (`Foo::QUX`) can be resolved to the real constant later.
+          value_node = node.children[2]
+          alias_target = nil
+          if value_node.kind_of?(RuboCop::AST::Node) && value_node.type == :const
+            consts = find_consts(value_node)
+            alias_target = consts.join('::') if consts
+          end
+
+          self.timeline << { event: :const_assign, name: const_assign_name, alias_target: alias_target }
 
           { skip: node.children }
         end
@@ -183,7 +206,7 @@ module RuboCop
               when :const_undef
                 state.undefine_const(const_name: event[:name])
               when :const_assign
-                state.const_assigned(const_name: event[:name])
+                state.const_assigned(const_name: event[:name], alias_target: event[:alias_target])
 
                 previous_errors = err_indices.map { |e| timeline[e] }
                 outdated = outdated_errors(previous_errors, state)

data/lib/rubocop/helper/state.rb

@@ -4,10 +4,12 @@ module RuboCop
     class State
       attr_accessor :defined_constants
       attr_accessor :const_stack
+      attr_accessor :aliases
 
       def initialize
         self.defined_constants = []
         self.const_stack = []
+        self.aliases = {}
       end
 
       def require(file: nil)
@@ -29,19 +31,12 @@ module RuboCop
       def access_const(const_name: nil, local_only: false)
         name = const_name.to_s.sub(/^:*/, '').sub(/:*$/, '') # Strip leading/trailing ::
 
-        # If const_stack is ["A", "B", "C"] all of A, A::B, A::B::C are valid lookup combinations
-        prefixes = self.const_stack.reduce([]) { |a, c| a << [a.last, c].compact.join('::') }
+        result = resolve_const(name, local_only: local_only)
 
-        # I use const_get here because in testing const_get and const_defined? have yielded different results
-        unless local_only
-          result = Object.const_get(name) rescue nil                                                   # Defined elsewhere, top-level
-          result ||= self.defined_constants.find { |c| Object.const_get("#{c}::#{name}") rescue nil }  # Defined elsewhere, nested
-        end
-
-        result ||= self.defined_constants.find { |c| name == c }                                       # Defined in this file, other module/class
-        prefixes.each do |prefix|
-          result ||= self.defined_constants.find { |c| [name, "#{prefix}::#{name}"].include? c }       # Defined in this file, other module/class
-          result ||= prefix == name                                                                    # Defined in this file, in current module/class
+        # If the name (or its leading segment) is an alias, resolve the alias target and
+        # retry. e.g. with `Foo = Bar::Baz`, accessing `Foo::QUX` resolves `Bar::Baz::QUX`.
+        if !result && (aliased = expand_alias(name))
+          result = resolve_const(aliased, local_only: local_only)
         end
 
         return result
@@ -63,10 +58,50 @@ module RuboCop
         self.const_stack.pop
       end
 
-      def const_assigned(const_name: nil)
+      def const_assigned(const_name: nil, alias_target: nil)
         full_name = (self.const_stack + [const_name]).join('::')
         self.defined_constants << full_name
         self.defined_constants.uniq!
+
+        return unless alias_target
+
+        # Register the alias under both the fully-qualified name and the bare name so it can
+        # be resolved whether referenced from inside or outside its enclosing namespace.
+        self.aliases[full_name] = alias_target
+        self.aliases[const_name.to_s] = alias_target
+      end
+
+      private
+
+      def resolve_const(name, local_only: false)
+        # If const_stack is ["A", "B", "C"] all of A, A::B, A::B::C are valid lookup combinations
+        prefixes = self.const_stack.reduce([]) { |a, c| a << [a.last, c].compact.join('::') }
+
+        # I use const_get here because in testing const_get and const_defined? have yielded different results
+        unless local_only
+          result = Object.const_get(name) rescue nil                                                   # Defined elsewhere, top-level
+          result ||= self.defined_constants.find { |c| Object.const_get("#{c}::#{name}") rescue nil }  # Defined elsewhere, nested
+        end
+
+        result ||= self.defined_constants.find { |c| name == c }                                       # Defined in this file, other module/class
+        prefixes.each do |prefix|
+          result ||= self.defined_constants.find { |c| [name, "#{prefix}::#{name}"].include? c }       # Defined in this file, other module/class
+          result ||= prefix == name                                                                    # Defined in this file, in current module/class
+        end
+
+        return result
+      end
+
+      # If `name`'s longest leading segment is a known alias, return `name` with that segment
+      # replaced by the alias target (e.g. "Foo::QUX" => "Bar::Baz::QUX"). Returns nil otherwise.
+      def expand_alias(name)
+        segments = name.split('::')
+        segments.length.downto(1) do |i|
+          prefix = segments[0...i].join('::')
+          next unless self.aliases.key?(prefix)
+          return ([self.aliases[prefix]] + segments[i..-1]).join('::')
+        end
+        nil
       end
     end
   end

data/lib/rubocop/require_tools/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module RequireTools
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/rubocop-require_tools.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'pry'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 4.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-require_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Manu Wallner
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -44,28 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +110,6 @@ homepage: https://github.com/milch/rubocop-require_tools
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -126,9 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Checks require statements in your code
 test_files: []