solargraph-rspec 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24c1205ed3940572fa4426a348213279990036bd48d6f097dfec5be2e81fcac5
-  data.tar.gz: 26397bb59d638a2de7e64e30cc5687d5247feb23662c071a5eba85aadb71707b
+  metadata.gz: 8be3e0236b9ee7ad2bc78abe9764001fc4ec2432a381571e23dddc27923caacb
+  data.tar.gz: 217d891f9561406a322f037948f13a3197f39d980f8394e36fc86304b8bccde9
 SHA512:
-  metadata.gz: 96641c86e4c32dcafa422efe61825c768ae1a7620c67d3004c4d7b0f5b794f25baaee0c11abd77c7a6b1df2cf0bb5c9beaaf0d6893ba2cf593f23b9022ce1b22
-  data.tar.gz: e79b218d6df5102e1bb26d1b15deffc80cfb353f5b3f394492ea5c62001df507623828e3e7b50fafa74faf33c8d92587a31643fc696875d74264a585626a16c6
+  metadata.gz: 1c91744f1a8a2bb3a021f6cf008d627a292bf112c15b8215d7c9217d7bddf812b1f73b92a8d434d54755b10dd77b1f6b571c0b77ada0087b28e01e9f311e9c58
+  data.tar.gz: 3d9a7e4405f2ce232d31e7310a2af32c1f0e1d86cc8b48b461c899310b6bf9a8c9f43a1a0c661074fd670d1433827472161618a3ddb0cbfda551b8ab06953bac

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.3] - 2025-09-02
+
+### Fixed
+
+- Fix local variable bindings (#16)
+- Fix implicit subject generation for string descriptions (#17)
+
+### Changed
+
+- Loosen solargraph dependency version >0.52.0
+- Use solargraph's parser (#11)
+
 ## [0.5.2] - 2025-06-26
 
 ### Fixed

data/lib/solargraph/rspec/convention.rb

@@ -8,7 +8,6 @@ require_relative 'correctors/example_and_hook_blocks_binding_corrector'
 require_relative 'correctors/described_class_corrector'
 require_relative 'correctors/let_methods_corrector'
 require_relative 'correctors/subject_method_corrector'
-require_relative 'correctors/context_block_methods_corrector'
 require_relative 'correctors/dsl_methods_corrector'
 require_relative 'test_helpers'
 require_relative 'pin_factory'
@@ -52,7 +51,6 @@ module Solargraph
 
     # @type [Array<Class<Correctors::Base>>]
     CORRECTOR_CLASSES = [
-      Correctors::ContextBlockMethodsCorrector,
       Correctors::ContextBlockNamespaceCorrector,
       Correctors::DescribedClassCorrector,
       Correctors::DslMethodsCorrector,

data/lib/solargraph/rspec/correctors/base.rb

@@ -63,6 +63,16 @@ module Solargraph
             distance >= 0 ? distance : Float::INFINITY
           end
         end
+
+        # Overrides a pin's closure, and resets all the needed instance vars
+        # @param pin [Solargraph::Pin::Base]
+        # @param new_closure [Solargraph::Pin::Closure]
+        def override_closure(pin, new_closure)
+          pin.instance_variable_set('@closure', new_closure)
+          pin.reset_generated!
+
+          pin.remove_instance_variable(:@path) if pin.instance_variables.include? :@path
+        end
       end
     end
   end

data/lib/solargraph/rspec/correctors/context_block_namespace_corrector.rb

@@ -12,7 +12,6 @@ module Solargraph
           # @param location_range [Solargraph::Range]
           rspec_walker.on_each_context_block do |namespace_name, location_range|
             original_block_pin = source_map.locate_block_pin(location_range.start.line, location_range.start.column)
-            original_block_pin_index = source_map.pins.index(original_block_pin)
             location = PinFactory.build_location(location_range, source_map.filename)
 
             # Define a dynamic module for the example group block
@@ -26,17 +25,10 @@ module Solargraph
               location: location
             )
 
-            fixed_namespace_block_pin = Solargraph::Pin::Block.new(
-              closure: namespace_pin,
-              location: original_block_pin.location,
-              receiver: original_block_pin.receiver,
-              scope: original_block_pin.scope
-            )
-
-            source_map.pins[original_block_pin_index] = fixed_namespace_block_pin
+            override_closure(original_block_pin, namespace_pin)
 
             # Include DSL methods in the example group block
-            # TOOD: This does not work on solagraph! Class methods are not included from parent class.
+            # TODO: This does not work on solagraph! Class methods are not included from parent class.
             namespace_extend_pin = PinFactory.build_module_extend(
               namespace_pin,
               root_example_group_namespace_pin.name,

data/lib/solargraph/rspec/correctors/example_and_hook_blocks_binding_corrector.rb

@@ -43,15 +43,8 @@ module Solargraph
 
           original_block_pin = source_map.locate_block_pin(location_range.start.line,
                                                            location_range.start.column)
-          original_block_pin_index = source_map.pins.index(original_block_pin)
-          fixed_namespace_block_pin = Solargraph::Pin::Block.new(
-            closure: example_run_method(namespace_pin),
-            location: original_block_pin.location,
-            receiver: original_block_pin.receiver,
-            scope: original_block_pin.scope
-          )
 
-          source_map.pins[original_block_pin_index] = fixed_namespace_block_pin
+          override_closure(original_block_pin, example_run_method(namespace_pin))
         end
 
         # @param namespace_pin [Solargraph::Pin::Namespace]

data/lib/solargraph/rspec/correctors/let_methods_corrector.rb

@@ -23,7 +23,7 @@ module Solargraph
 
         # @param namespace [Pin::Namespace]
         # @param method_name [String]
-        # @param node [RubyVM::AbstractSyntaxTree::Node]
+        # @param node [::Parser::AST::Node, nil]
         # @param types [Array<String>, nil]
         # @return [Pin::Method, nil]
         def rspec_let_method(namespace, method_name, location_range, node = nil, types: nil)

data/lib/solargraph/rspec/correctors/subject_method_corrector.rb

@@ -24,7 +24,7 @@ module Solargraph
 
             namespace_pin = closest_namespace_pin(namespace_pins, described_class_pin.location.range.start.line)
 
-            if namespace_pin
+            if namespace_pin && described_class_pin.return_type.to_s != 'undefined'
               implicit_subject_pin = implicit_subject_method(described_class_pin, namespace_pin)
               add_pin(implicit_subject_pin)
               add_pins(one_liner_expectation_pins(implicit_subject_pin))

data/lib/solargraph/rspec/pin_factory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Credits: This file is a copy of the file from the solargraph-rspec gem
+# Credits: This file was originally copied and adapted from the log_bench gem.
 
 module Solargraph
   module Rspec
@@ -74,16 +74,10 @@ module Solargraph
         )
       end
 
-      # @param ast [RubyVM::AbstractSyntaxTree::Node]
-      # @see [RubyVM::AbstractSyntaxTree::NodeWrapper] - for why we need -1 for lineno
+      # @param ast [::Parser::AST::Node]
       # @return [Solargraph::Range]
       def self.build_location_range(ast)
-        Solargraph::Range.from_to(
-          ast.first_lineno - 1,
-          ast.first_column,
-          ast.last_lineno - 1,
-          ast.last_column
-        )
+        Solargraph::Parser.node_range(ast)
       end
 
       # @param location_range [Solargraph::Range]

data/lib/solargraph/rspec/spec_walker/fake_let_method.rb

@@ -9,30 +9,17 @@ module Solargraph
 
         class << self
           # Transforms let block to method ast node
-          # @param block_ast [RubyVM::AbstractSyntaxTree::Node]
-          # @param code [String] code
+          # @param block_ast [::Parser::AST::Node]
           # @return [::Parser::AST::Node, nil]
-          def transform_block(block_ast, code, method_name = nil)
+          def transform_block(block_ast, method_name = nil)
             method_name ||= NodeTypes.let_method_name(block_ast)
 
-            code_lines = code.split("\n")
-            # extract let definition block body code
-            first_line = code_lines[block_ast.first_lineno - 1]
-            last_line = code_lines[block_ast.last_lineno - 1]
-            code_lines[block_ast.first_lineno - 1] = first_line[(block_ast.first_column)..]
-            code_lines[block_ast.last_lineno - 1] = last_line[0..(block_ast.last_column)]
-            let_definition_code = code_lines[
-              (block_ast.first_lineno - 1)..(block_ast.last_lineno - 1)
-            ].join("\n")
-
-            let_definition_ast = Solargraph::Parser.parse(let_definition_code)
-            method_body = let_definition_ast.children[2]
             ::Parser::AST::Node.new( # transform let block to a method ast node
               :def,
               [
                 method_name.to_sym,
                 ::Parser::AST::Node.new(:args, []),
-                method_body
+                block_ast.children[2]
               ]
             )
           rescue SyntaxError => e

data/lib/solargraph/rspec/spec_walker/full_constant_name.rb

@@ -5,17 +5,24 @@ module Solargraph
     class SpecWalker
       class FullConstantName
         class << self
-          # @param ast [RubyVM::AbstractSyntaxTree::Node]
+          # @param ast [::Parser::AST::Node]
           # @return [String]
           def from_ast(ast)
-            raise 'Node is not a constant' unless NodeTypes.a_constant?(ast)
+            parts = []
 
-            if ast.type == :CONST
-              ast.children[0].to_s
-            elsif ast.type == :COLON2
-              name = ast.children[1].to_s
-              "#{from_ast(ast.children[0])}::#{name}"
+            until ast.nil?
+              if ast.is_a? ::Parser::AST::Node
+                break unless ast.type == :const
+
+                parts << ast.children[1]
+                ast = ast.children[0]
+              else
+                parts << ast
+                break
+              end
             end
+
+            parts.reverse.join('::')
           end
 
           def from_context_block_ast(block_ast)

data/lib/solargraph/rspec/spec_walker/node_types.rb

@@ -4,78 +4,71 @@ module Solargraph
   module Rspec
     class SpecWalker
       class NodeTypes
-        # @param ast [RubyVM::AbstractSyntaxTree::Node]
+        # @param ast [::Parser::AST::Node]
         # @return [Boolean]
         def self.a_block?(ast)
-          return false unless ast.is_a?(RubyVM::AbstractSyntaxTree::Node)
-
-          %i[ITER LAMBDA].include?(ast.type)
+          ast.is_a?(::Parser::AST::Node) && ast.type == :block
         end
 
-        # @param ast [RubyVM::AbstractSyntaxTree::Node]
+        # @param ast [::Parser::AST::Node]
         # @return [Boolean]
         def self.a_context_block?(block_ast)
           Solargraph::Rspec::CONTEXT_METHODS.include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [RubyVM::AbstractSyntaxTree::Node]
+        # @param ast [::Parser::AST::Node]
         # @return [Boolean]
         def self.a_subject_block?(block_ast)
           Solargraph::Rspec::SUBJECT_METHODS.include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [RubyVM::AbstractSyntaxTree::Node]
+        # @param ast [::Parser::AST::Node]
         # @param config [Config]
         # @return [Boolean]
         def self.a_example_block?(block_ast, config)
           config.example_methods.map(&:to_s).include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [RubyVM::AbstractSyntaxTree::Node]
+        # @param ast [::Parser::AST::Node]
         # @param config [Config]
         # @return [Boolean]
         def self.a_let_block?(block_ast, config)
           config.let_methods.map(&:to_s).include?(method_with_block_name(block_ast))
         end
 
-        # @param ast [RubyVM::AbstractSyntaxTree::Node]
+        # @param ast [::Parser::AST::Node]
         # @return [Boolean]
         def self.a_hook_block?(block_ast)
           Solargraph::Rspec::HOOK_METHODS.include?(method_with_block_name(block_ast))
         end
 
         def self.a_constant?(ast)
-          %i[CONST COLON2].include?(ast.type)
+          ast.type == :const
         end
 
-        # @param block_ast [RubyVM::AbstractSyntaxTree::Node]
-        # @return [String, nil]
+        # @param block_ast [::Parser::AST::Node]
+        # @return [String, nil] The name of the thing you are calling the block on
         def self.method_with_block_name(block_ast)
           return nil unless a_block?(block_ast)
+          return nil unless block_ast.children[0].type == :send
 
-          method_call = %i[CALL FCALL].include?(block_ast.children[0].type)
-          return nil unless method_call
-
-          block_ast.children[0].children.select { |child| child.is_a?(Symbol) }.first&.to_s
+          block_ast.children[0].children[1].to_s
         end
 
-        # @param block_ast [RubyVM::AbstractSyntaxTree::Node]
-        # @return [RubyVM::AbstractSyntaxTree::Node]
+        # @param block_ast [::Parser::AST::Node]
+        # @return [::Parser::AST::Node]
         def self.context_description_node(block_ast)
           return nil unless a_context_block?(block_ast)
 
-          case block_ast.children[0].type
-          when :CALL # RSpec.describe "something" do end
-            block_ast.children[0].children[2].children[0]
-          when :FCALL # describe "something" do end
-            block_ast.children[0].children[1].children[0]
-          end
+          block_ast.children[0].children[2]
         end
 
-        # @param block_ast [RubyVM::AbstractSyntaxTree::Node]
+        # @param block_ast [::Parser::AST::Node]
         # @return [String]
         def self.let_method_name(block_ast)
-          block_ast.children[0].children[1]&.children&.[](0)&.children&.[](0)&.to_s # rubocop:disable Style/SafeNavigationChainLength
+          return nil unless a_block?(block_ast)
+
+          block_ast.children[0].children[2]&.children&.[](0)&.to_s # rubocop:disable Style/SafeNavigationChainLength
         end
       end
     end

data/lib/solargraph/rspec/spec_walker/rspec_context_namespace.rb

@@ -5,13 +5,15 @@ module Solargraph
     class SpecWalker
       class RspecContextNamespace
         class << self
-          # @param block_ast [RubyVM::AbstractSyntaxTree::Node]
+          # @param block_ast [::Parser::AST::Node]
           # @return [String, nil]
           def from_block_ast(block_ast)
-            return unless block_ast.is_a?(RubyVM::AbstractSyntaxTree::Node)
+            return unless block_ast.is_a?(::Parser::AST::Node)
 
             ast = NodeTypes.context_description_node(block_ast)
-            if ast.type == :STR
+            return unless ast
+
+            if ast.type == :str
               string_to_const_name(ast)
             elsif NodeTypes.a_constant?(ast)
               FullConstantName.from_ast(ast).gsub('::', '')
@@ -27,7 +29,7 @@ module Solargraph
           # @param ast [Parser::AST::Node]
           # @return [String]
           def string_to_const_name(string_ast)
-            return unless string_ast.type == :STR
+            return unless string_ast.type == :str
 
             name = string_ast.children[0]
             return 'Anonymous'.dup if name.empty?

data/lib/solargraph/rspec/spec_walker.rb

@@ -14,8 +14,7 @@ module Solargraph
       def initialize(source_map:, config:)
         @source_map = source_map
         @config = config
-        # TODO: Implement SpecWalker with parser gem using default AST from `source_map.source.node`
-        @walker = Rspec::Walker.new(ruby_vm_node(source_map))
+        @walker = Rspec::Walker.new(source_map.source.node)
         @handlers = {
           on_described_class: [],
           on_let_method: [],
@@ -45,7 +44,7 @@ module Solargraph
       # @param block [Proc]
       # @yieldparam method_name [String]
       # @yieldparam location_range [Solargraph::Range]
-      # @yieldparam fake_method_ast [RubyVM::AbstractSyntaxTree::Node]
+      # @yieldparam fake_method_ast [::Parser::AST::Node]
       # @return [void]
       def on_let_method(&block)
         @handlers[:on_let_method] << block
@@ -54,7 +53,7 @@ module Solargraph
       # @param block [Proc]
       # @yieldparam method_name [String]
       # @yieldparam location_range [Solargraph::Range]
-      # @yieldparam fake_method_ast [RubyVM::AbstractSyntaxTree::Node]
+      # @yieldparam fake_method_ast [::Parser::AST::Node]
       # @return [void]
       def on_subject(&block)
         @handlers[:on_subject] << block
@@ -114,54 +113,54 @@ module Solargraph
           end
         end
 
-        walker.on :ITER do |block_ast|
+        walker.on :block do |block_ast|
           next unless NodeTypes.a_let_block?(block_ast, config)
 
           method_name = NodeTypes.let_method_name(block_ast)
           next unless method_name
 
-          fake_method_ast = FakeLetMethod.transform_block(block_ast, @source_map.source.code, method_name)
+          fake_method_ast = FakeLetMethod.transform_block(block_ast, method_name)
 
           @handlers[:on_let_method].each do |handler|
             handler.call(method_name, PinFactory.build_location_range(block_ast.children[0]), fake_method_ast)
           end
         end
 
-        walker.on :ITER do |block_ast|
+        walker.on :block do |block_ast|
           next unless NodeTypes.a_subject_block?(block_ast)
 
           method_name = NodeTypes.let_method_name(block_ast)
-          fake_method_ast = FakeLetMethod.transform_block(block_ast, @source_map.source.code, method_name || 'subject')
+          fake_method_ast = FakeLetMethod.transform_block(block_ast, method_name || 'subject')
 
           @handlers[:on_subject].each do |handler|
             handler.call(method_name, PinFactory.build_location_range(block_ast.children[0]), fake_method_ast)
           end
         end
 
-        walker.on :ITER do |block_ast|
+        walker.on :block do |block_ast|
           next unless NodeTypes.a_example_block?(block_ast, config)
 
           @handlers[:on_example_block].each do |handler|
             handler.call(PinFactory.build_location_range(block_ast))
           end
 
-          # @param blocks_in_examples [RubyVM::AbstractSyntaxTree::Node]
-          each_block(block_ast.children[1]) do |blocks_in_examples|
+          # @param blocks_in_examples [::Parser::AST::Node]
+          each_block(block_ast.children[2]) do |blocks_in_examples|
             @handlers[:on_blocks_in_examples].each do |handler|
               handler.call(PinFactory.build_location_range(blocks_in_examples))
             end
           end
         end
 
-        walker.on :ITER do |block_ast|
+        walker.on :block do |block_ast|
           next unless NodeTypes.a_hook_block?(block_ast)
 
           @handlers[:on_hook_block].each do |handler|
             handler.call(PinFactory.build_location_range(block_ast))
           end
 
-          # @param blocks_in_examples [RubyVM::AbstractSyntaxTree::Node]
-          each_block(block_ast.children[1]) do |blocks_in_examples|
+          # @param blocks_in_examples [::Parser::AST::Node]
+          each_block(block_ast.children[2]) do |blocks_in_examples|
             @handlers[:on_blocks_in_examples].each do |handler|
               handler.call(PinFactory.build_location_range(blocks_in_examples))
             end
@@ -178,11 +177,9 @@ module Solargraph
       # @param ast [Parser::AST::Node]
       # @param parent_result [Object]
       def each_block(ast, parent_result = nil, &block)
-        return unless ast.is_a?(RubyVM::AbstractSyntaxTree::Node)
+        return nil unless ast.is_a?(::Parser::AST::Node)
 
-        is_a_block = NodeTypes.a_block?(ast)
-
-        if is_a_block
+        if NodeTypes.a_block?(ast)
           result = block&.call(ast, parent_result)
           parent_result = result if result
         end
@@ -211,12 +208,6 @@ module Solargraph
           next parent_namespace
         end
       end
-
-      # @param source_map [SourceMap]
-      # @return [RubyVM::AbstractSyntaxTree::Node]
-      def ruby_vm_node(source_map)
-        RubyVM::AbstractSyntaxTree.parse(source_map.source.code)
-      end
     end
   end
 end

data/lib/solargraph/rspec/version.rb

@@ -2,6 +2,6 @@
 
 module Solargraph
   module Rspec
-    VERSION = '0.5.2'
+    VERSION = '0.5.4'
   end
 end

data/lib/solargraph/rspec/walker.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+#
+# Credits: This file was originally copied and adapted from the solargraph-rails gem
+
 module Solargraph
   module Rspec
     class Walker
@@ -17,7 +20,7 @@ module Solargraph
           @proc = Proc.new(&block)
         end
 
-        # @param node [RubyVM::AbstractSyntaxTree::Node]
+        # @param node [::Parser::AST::Node]
         # @return [void]
         def visit(node)
           return unless matches?(node)
@@ -33,15 +36,15 @@ module Solargraph
 
         private
 
-        # @param node [RubyVM::AbstractSyntaxTree::Node]
+        # @param node [::Parser::AST::Node]
         # @return [Boolean]
         def matches?(node)
           return false unless node.type == node_type
           return false unless node.children
           return true if @args.empty?
 
-          a_child_matches = node.children.first.is_a?(RubyVM::AbstractSyntaxTree::Node) && node.children.any? do |child|
-            child.is_a?(RubyVM::AbstractSyntaxTree::Node) &&
+          a_child_matches = node.children.first.is_a?(::Parser::AST::Node) && node.children.any? do |child|
+            child.is_a?(::Parser::AST::Node) &&
               match_children(child.children, @args[1..])
           end
 
@@ -50,12 +53,12 @@ module Solargraph
           match_children(node.children)
         end
 
-        # @param children [Array<RubyVM::AbstractSyntaxTree::Node>]
+        # @param children [Array<::Parser::AST::Node>]
         def match_children(children, args = @args)
           args.each_with_index.all? do |arg, i|
             if arg == :any
               true
-            elsif children[i].is_a?(RubyVM::AbstractSyntaxTree::Node) && arg.is_a?(Symbol)
+            elsif children[i].is_a?(::Parser::AST::Node) && arg.is_a?(Symbol)
               children[i].type == arg
             else
               children[i] == arg
@@ -66,7 +69,7 @@ module Solargraph
 
       attr_reader :ast, :comments
 
-      # @param ast [RubyVM::AbstractSyntaxTree::Node]
+      # @param ast [::Parser::AST::Node]
       # @param comments [Hash]
       def initialize(ast, comments = {})
         @comments = comments
@@ -74,6 +77,8 @@ module Solargraph
         @hooks = Hash.new { |h, k| h[k] = [] }
       end
 
+      # @yieldparam [::Parser::AST::Node]
+      # @yieldparam [Walker]
       def on(node_type, args = [], &block)
         @hooks[node_type] << Hook.new(node_type, args, &block)
       end
@@ -85,7 +90,7 @@ module Solargraph
       private
 
       def traverse(node)
-        return unless node.is_a?(RubyVM::AbstractSyntaxTree::Node)
+        return unless node.is_a?(::Parser::AST::Node)
 
         @hooks[node.type].each { |hook| hook.visit(node) }
 

data/release_gem.sh

@@ -0,0 +1,210 @@
+#!/usr/bin/env bash
+# Credits: This file was originally copied and adapted from the log_bench gem.
+# https://raw.githubusercontent.com/silva96/log_bench/refs/heads/main/release_gem.sh
+set -euo pipefail
+
+############################################
+# Config — tweak if your gem/repo differs
+############################################
+GEM_NAME="solargraph-rspec"
+LIB_DIR="lib/solargraph/rspec"
+DEFAULT_BRANCH="main"
+VERSION_FILE="${LIB_DIR}/version.rb"
+GEMSPEC_FILE="${GEM_NAME}.gemspec"
+TAG_PREFIX="v"
+
+# Bump mode: patch | minor | major (default patch)
+BUMP="${BUMP:-patch}"
+
+############################################
+# Arg parsing (optional)
+############################################
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --bump) BUMP="${2:-patch}"; shift 2 ;;
+    --bump=*) BUMP="${1#*=}"; shift 1 ;;
+    -h|--help)
+      cat <<EOF
+Usage: $0 [--bump patch|minor|major]
+Defaults to --bump patch (e.g., 0.2.6 -> 0.2.7).
+EOF
+      exit 0 ;;
+    *) echo "Unknown arg: $1" >&2; exit 1 ;;
+  esac
+done
+
+case "$BUMP" in
+  patch|minor|major) : ;;
+  *) echo "Invalid --bump: $BUMP (use patch|minor|major)"; exit 1 ;;
+esac
+
+############################################
+# Pretty logging
+############################################
+if command -v tput >/dev/null 2>&1 && [ -n "${TERM:-}" ]; then
+  BOLD=$(tput bold) || BOLD=""
+  RESET=$(tput sgr0) || RESET=""
+  GREEN=$(tput setaf 2) || GREEN=""
+  YELLOW=$(tput setaf 3) || YELLOW=""
+  RED=$(tput setaf 1) || RED=""
+  BLUE=$(tput setaf 4) || BLUE=""
+else
+  BOLD=""; RESET=""; GREEN=""; YELLOW=""; RED=""; BLUE=""
+fi
+
+log()     { printf "%b\n" "${BLUE}▸${RESET} $*"; }
+success() { printf "%b\n" "${GREEN}✔${RESET} $*"; }
+warn()    { printf "%b\n" "${YELLOW}⚠${RESET} $*"; }
+error()   { printf "%b\n" "${RED}✖${RESET} $*"; }
+die()     { error "$*"; exit 1; }
+
+############################################
+# Helpers
+############################################
+require_cmd() { command -v "$1" >/dev/null 2>&1 || die "Missing required command: $1"; }
+
+current_version() {
+  # Extract the first X.Y.Z from the VERSION file
+  grep -Eo '[0-9]+\.[0-9]+\.[0-9]+' "$VERSION_FILE" | head -n1
+}
+
+validate_semver() { [[ "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; }
+
+bump_version() {
+  local mode="$1" ver="$2"
+  IFS='.' read -r MA MI PA <<<"$ver"
+  case "$mode" in
+    patch) echo "${MA}.${MI}.$((PA+1))" ;;
+    minor) echo "${MA}.$((MI+1)).0" ;;
+    major) echo "$((MA+1)).0.0" ;;
+  esac
+}
+
+update_version_file() {
+  local new="$1"
+  # Robust sed (preserves indentation, quote style, optional .freeze)
+  sed -E "s/^([[:space:]]*)VERSION[[:space:]]*=[[:space:]]*(['\"])[0-9]+\.[0-9]+\.[0-9]+(['\"])(\.freeze)?/\1VERSION = \2${new}\3\4/" \
+    "$VERSION_FILE" > "${VERSION_FILE}.tmp"
+  mv "${VERSION_FILE}.tmp" "$VERSION_FILE"
+}
+
+ensure_clean_worktree() {
+  if [ -n "$(git status --porcelain)" ]; then
+    warn "Your working tree has uncommitted changes:"
+    git status --short
+    read -rp "$(printf '%b' "${YELLOW}Proceed anyway? [y/N] ${RESET}")" ans
+    [[ "${ans:-}" =~ ^[Yy]$ ]] || die "Aborted due to dirty working tree."
+  fi
+}
+
+############################################
+# Checks
+############################################
+require_cmd git
+require_cmd bundle
+require_cmd gem
+require_cmd sed
+
+if ! command -v gh >/dev/null 2>&1; then
+  warn "GitHub CLI (gh) not found. GitHub release creation will be skipped."
+  GH_AVAILABLE="false"
+else
+  GH_AVAILABLE="true"
+fi
+
+[ -f "$VERSION_FILE" ] || die "Version file not found: $VERSION_FILE"
+[ -f "$GEMSPEC_FILE" ] || die "Gemspec not found: $GEMSPEC_FILE"
+
+############################################
+# Start
+############################################
+log "${BOLD}Publishing ${GEM_NAME}${RESET}"
+ensure_clean_worktree
+
+log "Pulling latest from origin/${DEFAULT_BRANCH}…"
+git checkout "$DEFAULT_BRANCH" >/dev/null 2>&1 || true
+git pull origin "$DEFAULT_BRANCH"
+success "Up to date."
+
+CURR_VER="$(current_version)"
+[ -n "$CURR_VER" ] || die "Could not determine current version from $VERSION_FILE"
+
+log "Current version detected in ${VERSION_FILE}: ${BOLD}${CURR_VER}${RESET}"
+PROPOSED="$(bump_version "$BUMP" "$CURR_VER")"
+read -rp "$(printf '%b' "${BLUE}Proposed next ${BOLD}${BUMP}${RESET}${BLUE} version is ${BOLD}${PROPOSED}${RESET}${BLUE}. Press Enter to accept or type a different semver (X.Y.Z): ${RESET}")" NEW_VER
+NEW_VER="${NEW_VER:-$PROPOSED}"
+validate_semver "$NEW_VER" || die "Invalid semver: $NEW_VER"
+
+TAG="${TAG_PREFIX}${NEW_VER}"
+
+# Guard against existing tag
+if git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
+  die "Tag ${TAG} already exists."
+fi
+
+log "Updating version file to ${BOLD}${NEW_VER}${RESET}…"
+before_contents="$(cat "$VERSION_FILE")"
+update_version_file "$NEW_VER"
+after_contents="$(cat "$VERSION_FILE")"
+if [ "$before_contents" = "$after_contents" ]; then
+  AFTER_VER="$(current_version || true)"
+  if [ "$AFTER_VER" = "$NEW_VER" ]; then
+    warn "Version file already at ${NEW_VER}; nothing to change."
+  else
+    die "Failed to update ${VERSION_FILE}. Ensure it has a line like:
+  VERSION = \"${CURR_VER}\"
+(or with single quotes / optional .freeze)."
+  fi
+else
+  success "Updated ${VERSION_FILE}."
+fi
+
+log "Installing gems (bundle install)…"
+bundle install
+success "Dependencies installed."
+
+log "Committing version bump (including Gemfile.lock if changed)…"
+FILES_TO_COMMIT=()
+if ! git diff --quiet -- "$VERSION_FILE"; then
+  FILES_TO_COMMIT+=("$VERSION_FILE")
+fi
+if [ -f "Gemfile.lock" ] && ! git diff --quiet -- "Gemfile.lock"; then
+  FILES_TO_COMMIT+=("Gemfile.lock")
+fi
+
+if [ "${#FILES_TO_COMMIT[@]}" -gt 0 ]; then
+  git add "${FILES_TO_COMMIT[@]}"
+  git commit -m "Bump version to ${NEW_VER}"
+  success "Committed: ${FILES_TO_COMMIT[*]}"
+else
+  warn "No changes to commit (version file and Gemfile.lock unchanged)."
+fi
+
+log "Creating tag ${BOLD}${TAG}${RESET}…"
+git tag "${TAG}" -m "Release version ${NEW_VER}"
+success "Tag created."
+
+log "Pushing branch & tag to origin…"
+git push origin "$DEFAULT_BRANCH"
+git push origin "${TAG}"
+success "Pushed."
+
+if [ "$GH_AVAILABLE" = "true" ]; then
+  log "Creating GitHub release ${BOLD}${TAG}${RESET} with auto-generated notes…"
+  gh release create "${TAG}" --title "Release version ${NEW_VER}" --generate-notes || warn "Failed to create GitHub release via gh."
+  success "GitHub release created."
+else
+  warn "Skipping GitHub release creation (gh not installed)."
+fi
+
+log "Building gem…"
+gem build "$GEMSPEC_FILE"
+GEM_FILE="${GEM_NAME}-${NEW_VER}.gem"
+[ -f "$GEM_FILE" ] || die "Gem file not found after build: $GEM_FILE"
+success "Built ${GEM_FILE}."
+
+log "Pushing gem to RubyGems…"
+gem push "$GEM_FILE"
+success "Gem pushed to RubyGems."
+
+success "${BOLD}${GEM_NAME} ${NEW_VER}${RESET} has been published! 🎉"

data/solargraph-rspec.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'solargraph', '~> 0.52', '>= 0.52.0'
+  spec.add_dependency 'solargraph', '>= 0.52.0'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,21 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: solargraph-rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Lekë Mula
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.52.0
@@ -23,9 +20,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.52.0
@@ -54,7 +48,6 @@ files:
 - lib/solargraph/rspec/config.rb
 - lib/solargraph/rspec/convention.rb
 - lib/solargraph/rspec/correctors/base.rb
-- lib/solargraph/rspec/correctors/context_block_methods_corrector.rb
 - lib/solargraph/rspec/correctors/context_block_namespace_corrector.rb
 - lib/solargraph/rspec/correctors/described_class_corrector.rb
 - lib/solargraph/rspec/correctors/dsl_methods_corrector.rb
@@ -71,6 +64,7 @@ files:
 - lib/solargraph/rspec/version.rb
 - lib/solargraph/rspec/walker.rb
 - lib/solargraph_rspec.rb
+- release_gem.sh
 - sig/solargraph/rspec.rbs
 - solargraph-rspec.gemspec
 licenses:
@@ -92,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Solargraph plugin supporting RSpec code completion
 test_files: []

data/lib/solargraph/rspec/correctors/context_block_methods_corrector.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base'
-
-module Solargraph
-  module Rspec
-    module Correctors
-      # A corrector that corrects pure ruby method blocks namespace defined inside describe/context blocks.
-      class ContextBlockMethodsCorrector < Base
-        # @param source_map [Solargraph::SourceMap]
-        def correct(source_map)
-          rspec_walker.after_walk do
-            source_map.pins.each_with_index do |pin, index|
-              next unless pin.is_a?(Solargraph::Pin::Method)
-
-              namespace_pin = closest_namespace_pin(namespace_pins, pin.location.range.start.line)
-              next unless namespace_pin
-
-              source_map.pins[index] = Solargraph::Pin::Method.new(
-                visibility: pin.visibility,
-                parameters: pin.parameters,
-                closure: namespace_pin,
-                node: pin.node,
-                signatures: pin.signatures,
-                location: pin.location,
-                name: pin.name,
-                scope: pin.scope,
-                comments: pin.comments
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end