rspectre 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d88a2681d80d0f13e8cad1a0b5147c92d0ced19dede1657a74261cd4f9a8ae
-  data.tar.gz: 865b52f9b37fd3fa54b154dedb4196a4ce5bfcf20a0e8b8493e6bcd3611e8690
+  metadata.gz: 77d1fd05a8a9608c30ed29f93c408bf519507fe5e8560cb9a80542f13f2783fa
+  data.tar.gz: a2b683a3a2289c8f8b1e39fa09a0d3b55ca6e5d9337d922c8a0124b821d59242
 SHA512:
-  metadata.gz: cebc09f233bd5f6f2fd76c6f0741866472badae3a6a8f9c6012cfac379af4f2c4585827e0f73b0cd0e3b39848c0376dead07fad7bbd209666f10d8cc3242ed55
-  data.tar.gz: '09049b6500de8e538fa07a7e110e4671392e209b4345d1da8253c15901ce9af450cc54cfc330f19bcff1c5d05dd129df62ebcdc34c850d4daa92fa94e15056db'
+  metadata.gz: d8042b9d677bc5fbbd8ef98bac37f271a244622782391dda4926b0c63b5c5b21e36cdfa08e24e94b98a29079d5525180f5129e0534114fbe946538d1160ab679
+  data.tar.gz: 9e5bd54c5c3faedddaebb97a3265163ece4fece63d884ac22ba412dfe8c78de1e31cb097e83d3d0047ca10043908f74865e6c0c20b780c9e3fd0aa8f76cf546c

data/lib/rspectre/auto_corrector.rb

@@ -14,7 +14,7 @@ module RSpectre
     def correct
       File.write(
         filename,
-        rewrite(buffer, Parser::CurrentRuby.new.parse(buffer))
+        rewrite(buffer, SourceMap::Parser.parser_class.new.parse(buffer))
       )
     end
 

data/lib/rspectre/linter/unused_let.rb

@@ -5,8 +5,8 @@ module RSpectre
     class UnusedLet < self
       TAG = 'UnusedLet'
 
-      def example_group.let(name, &block)
-        super(name, &block)
+      def example_group.let(name, &)
+        super
 
         UnusedLet.register(:let, caller_locations) do |node|
           UnusedLet.prepend_behavior(self, name) { UnusedLet.record(node) }

data/lib/rspectre/linter/unused_shared_setup.rb

@@ -10,21 +10,21 @@ module RSpectre
         original_method = receiver.method(method)
 
         # Overwrite the class method using define_singleton_method
-        receiver.__send__(:define_singleton_method, method) do |name, *args, **kwargs, &block|
+        receiver.__send__(:define_singleton_method, method) do |name, *args, &block|
           # When we can locate the source of the node, tag it
           if (node = UnusedSharedSetup.register(method, caller_locations))
             # And call the original
-            original_method.(name, *args, **kwargs) do |*shared_args, **shared_kwargs|
+            original_method.(name, *args) do |*shared_args|
               # But record that it was used in a `before`
               before { UnusedSharedSetup.record(node) }
 
               # And then perform the original block in a `class_exec` like the original block was
               # supposed to be
-              class_exec(*shared_args, **shared_kwargs, &block)
+              RSpec::Support::WithKeywordsWhenNeeded.class_exec(self, *shared_args, &block)
             end
           else
             # If we couldn't locate the source, just delegate to the original method.
-            original_method.(name, *args, **kwargs, &block)
+            original_method.(name, *args, &block)
           end
         end
       end
@@ -46,39 +46,39 @@ module RSpectre
       # terms of the old method. I think we can probably do some kind of module inclusion to reduce
       # this duplication (which is effectively what happens here anyway, i think), but this works
       # for now.
-      def example_group.shared_examples(name, *args, **kwargs, &block)
+      def example_group.shared_examples(name, *args, &block)
         if (node = UnusedSharedSetup.register(:shared_examples, caller_locations))
-          super(name, *args, **kwargs) do |*shared_args, **shared_kwargs|
+          super do |*shared_args|
             before { UnusedSharedSetup.record(node) }
 
-            class_exec(*shared_args, **shared_kwargs, &block)
+            RSpec::Support::WithKeywordsWhenNeeded.class_exec(self, *shared_args, &block)
           end
         else
-          super(name, *args, **kwargs, &block)
+          super
         end
       end
 
-      def example_group.shared_examples_for(name, *args, **kwargs, &block)
+      def example_group.shared_examples_for(name, *args, &block)
         if (node = UnusedSharedSetup.register(:shared_examples_for, caller_locations))
-          super(name, *args, **kwargs) do |*shared_args, **shared_kwargs|
+          super do |*shared_args|
             before { UnusedSharedSetup.record(node) }
 
-            class_exec(*shared_args, **shared_kwargs, &block)
+            RSpec::Support::WithKeywordsWhenNeeded.class_exec(self, *shared_args, &block)
           end
         else
-          super(name, *args, **kwargs, &block)
+          super
         end
       end
 
-      def example_group.shared_context(name, *args, **kwargs, &block)
+      def example_group.shared_context(name, *args, &block)
         if (node = UnusedSharedSetup.register(:shared_context, caller_locations))
-          super(name, *args, **kwargs) do |*shared_args, **shared_kwargs|
+          super do |*shared_args|
             before { UnusedSharedSetup.record(node) }
 
-            class_exec(*shared_args, **shared_kwargs, &block)
+            RSpec::Support::WithKeywordsWhenNeeded.class_exec(self, *shared_args, &block)
           end
         else
-          super(name, *args, **kwargs, &block)
+          super
         end
       end
     end

data/lib/rspectre/linter/unused_subject.rb

@@ -5,8 +5,8 @@ module RSpectre
     class UnusedSubject < self
       TAG = 'UnusedSubject'
 
-      def example_group.subject(name = nil, &block)
-        super(*name, &block)
+      def example_group.subject(name = nil, &)
+        super(*name, &)
 
         UnusedSubject.register(:subject, caller_locations) do |node|
           UnusedSubject.prepend_behavior(self, :subject) { UnusedSubject.record(node) }

data/lib/rspectre/linter.rb

@@ -40,6 +40,8 @@ module RSpectre
     def self.prepend_behavior(scope, method_name)
       original_method = scope.instance_method(method_name)
 
+      # Removing the method first prevents method redefined warnings when $VERBOSE is true
+      scope.remove_method(method_name)
       scope.__send__(:define_method, method_name) do |*args, **kwargs, &block|
         yield
 

data/lib/rspectre/source_map/parser.rb

@@ -15,6 +15,14 @@ module RSpectre
         Null.new
       end
 
+      def self.parser_class
+        if RSpectre.ruby_version_supports_prism?
+          Prism::Translation::Parser
+        else
+          ::Parser::CurrentRuby
+        end
+      end
+
       private
 
       def walk(node, &block)
@@ -28,9 +36,8 @@ module RSpectre
       end
 
       def parsed_source
-        parser = ::Parser::CurrentRuby.new(PermissiveASTBuilder.new)
+        parser = self.class.parser_class.new(PermissiveASTBuilder.new)
         buffer = ::Parser::Source::Buffer.new(file, source: raw_source)
-
         parser.parse(buffer)
       end
 

data/lib/rspectre/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSpectre
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/rspectre.rb

@@ -6,8 +6,24 @@ require 'pathname'
 require 'set'
 require 'stringio'
 
-require 'parser/current'
 require 'rspec'
+module RSpectre
+  LIB_PATH = Pathname.new(File.expand_path('../lib', __dir__))
+
+  MINIMUM_RUBY_FOR_PRISM = Gem::Version.new('3.3')
+  private_constant(:MINIMUM_RUBY_FOR_PRISM)
+
+  def self.ruby_version_supports_prism?
+    Gem::Version.new(RUBY_VERSION) >= MINIMUM_RUBY_FOR_PRISM
+  end
+end
+
+if RSpectre.ruby_version_supports_prism?
+  require 'parser'
+  require 'prism'
+else
+  require 'parser/current'
+end
 
 require 'rspectre/keyword_struct'
 
@@ -28,5 +44,4 @@ require 'rspectre/linter/unused_shared_setup'
 
 module RSpectre
   TRACKER = Tracker.new
-  LIB_PATH = Pathname.new(File.expand_path('../lib', __dir__))
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rspectre
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Gollahon
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-13 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,72 +15,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2.1
+        version: 3.3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2.1
+        version: 3.3.7.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
+        version: '3.10'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.51.0
+        version: 1.71.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.51.0
+        version: 1.71.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
-description:
-email:
+        version: 3.4.0
 executables:
 - rspectre
 extensions: []
@@ -109,7 +106,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,15 +113,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A tool for linting RSpec test suites.
 test_files: []