Centralize rspec command resolution (#61)

Author: st0012

lib/ruby_lsp/ruby_lsp_rspec/addon.rb

@@ -14,9 +14,6 @@ module RSpec
     class Addon < ::RubyLsp::Addon
       extend T::Sig
 
-      sig { returns(T.nilable(String)) }
-      attr_reader :rspec_command
-
       sig { returns(T::Boolean) }
       attr_reader :debug
 
@@ -32,7 +29,7 @@ def activate(global_state, message_queue)
         @index = T.let(global_state.index, T.nilable(RubyIndexer::Index))
 
         settings = global_state.settings_for_addon(name)
-        @rspec_command = T.let(settings&.dig(:rspecCommand), T.nilable(String))
+        @rspec_command = rspec_command(settings)
         @debug = settings&.dig(:debug) || false
       end
 
@@ -55,7 +52,7 @@ def version
       def create_code_lens_listener(response_builder, uri, dispatcher)
         return unless uri.to_standardized_path&.end_with?("_test.rb") || uri.to_standardized_path&.end_with?("_spec.rb")
 
-        CodeLens.new(response_builder, uri, dispatcher, rspec_command: rspec_command, debug: debug)
+        CodeLens.new(response_builder, uri, dispatcher, T.must(@rspec_command), debug: debug)
       end
 
       sig do
@@ -89,6 +86,24 @@ def create_definition_listener(response_builder, uri, node_context, dispatcher)
       def name
         "Ruby LSP RSpec"
       end
+
+      sig { params(settings: T.nilable(T::Hash[Symbol, T.untyped])).returns(String) }
+      def rspec_command(settings)
+        @rspec_command ||= settings&.dig(:rspecCommand) || begin
+          cmd = if File.exist?(File.join(Dir.pwd, "bin", "rspec"))
+            "bin/rspec"
+          else
+            "rspec"
+          end
+
+          begin
+            Bundler.with_original_env { Bundler.default_lockfile }
+            "bundle exec #{cmd}"
+          rescue Bundler::GemfileNotFound
+            cmd
+          end
+        end
+      end
     end
   end
 end

lib/ruby_lsp/ruby_lsp_rspec/code_lens.rb

@@ -13,37 +13,21 @@ class CodeLens
           response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens],
           uri: URI::Generic,
           dispatcher: Prism::Dispatcher,
-          rspec_command: T.nilable(String),
+          rspec_command: String,
           debug: T::Boolean,
         ).void
       end
-      def initialize(response_builder, uri, dispatcher, rspec_command: nil, debug: false)
+      def initialize(response_builder, uri, dispatcher, rspec_command, debug: false)
         @response_builder = response_builder
         # Listener is only initialized if uri.to_standardized_path is valid
         @path = T.let(T.must(uri.to_standardized_path), String)
         @group_id = T.let(1, Integer)
         @group_id_stack = T.let([], T::Array[Integer])
+        @rspec_command = rspec_command
         @anonymous_example_count = T.let(0, Integer)
         dispatcher.register(self, :on_call_node_enter, :on_call_node_leave)
 
         @debug = debug
-        @base_command = T.let(
-          # The user-configured command takes precedence over inferred command default
-          rspec_command || begin
-            cmd = if File.exist?(File.join(Dir.pwd, "bin", "rspec"))
-              "bin/rspec"
-            else
-              "rspec"
-            end
-
-            if File.exist?("Gemfile.lock")
-              "bundle exec #{cmd}"
-            else
-              cmd
-            end
-          end,
-          String,
-        )
       end
 
       sig { params(node: Prism::CallNode).void }
@@ -111,7 +95,7 @@ def generate_name(node)
       sig { params(node: Prism::Node, name: String, kind: Symbol).void }
       def add_test_code_lens(node, name:, kind:)
         line_number = node.location.start_line
-        command = "#{@base_command} #{@path}:#{line_number}"
+        command = "#{@rspec_command} #{@path}:#{line_number}"
 
         log_message("Full command: `#{command}`") if @debug