rspec-interactive 0.9.6 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 448fb430c0970d2d6f3dc12a3a1b6577dde234516d0d7f3fdccc735be784919b
-  data.tar.gz: 650d41f575295fb43d1c97930ae49e4a7fe34aac1d4cb1ca2a7d3fe6a1cb25c6
+  metadata.gz: c87a284feb4bf76bac68cda8cbe5703a66f04a856c8e2aed9e27d30b89e2654e
+  data.tar.gz: 9336d2bff3ba1973921f8d7ba6a36d88bc11d4acd1c2b2ee86d7c47cb58d0356
 SHA512:
-  metadata.gz: d5a4b51199209d0d248e1fc26a2d7e3cb4abf993eb2a61775162eda5107a2a97529bdd58867cb1e870a9c10f9da7c3ef60ce0ccd4ad484f6f900f9c2b0708a6f
-  data.tar.gz: f57523af399e9ca55303101479fbc0940c60095a0ffe93a2092255954fe5be3003bfc82c41c7a416df72a12d72fd4aae0d578b5d7f6da85c1385a9f620950227
+  metadata.gz: 36afe559f97bc7cdee9e6833655f23e6092004b800e53beed28099afb8db6ce5511bc8177c9cc648ffc0a558bd221ca2ff13c5ff44e76132c20af99b30281fda
+  data.tar.gz: '097084b7f1fec026f08433a8d12d56997b83a8deb8852026fc04dc1f3e7ec5410433e0758b374724cb2b5450f7b5be4e4db2d9953241a7bbd703f610f032e6ef'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-interactive (0.9.5)
+    rspec-interactive (0.9.8)
       listen
       pry
       rspec-core

data/lib/rspec-interactive/client_output.rb

@@ -17,6 +17,13 @@ module RSpec
         @client.print(str.to_s + "\n")
       end
 
+      def flush
+      end
+
+      def closed?
+        @client.closed?
+      end
+
       def string
         @output
       end

data/lib/rspec-interactive/pry.rb

@@ -4,7 +4,7 @@ class Pry
   alias_method :old_eval, :eval
 
   def eval(line, options = {})
-    RSpec::Interactive.eval do
+    RSpec::Interactive.eval(line, options) do
       old_eval(line, options)
     end
   end

data/lib/rspec-interactive/stdio.rb

@@ -1,52 +1,13 @@
 module RSpec
   module Interactive
     class Stdio
-      def self.capture2(stdout:, stderr:)
+      def self.capture(stdout:, stderr:)
         old_stdout, old_stderr = $stdout, $stderr
         $stdout, $stderr = stdout, stderr
         yield
       ensure
         $stdout, $stderr = old_stdout, old_stderr
       end
-
-      def self.capture(stdout:, stderr:)
-        raise ArgumentError, 'missing block' unless block_given?
-
-        old_stdout, old_stderr = STDOUT.dup, STDERR.dup
-
-        IO.pipe do |stdout_read, stdout_write|
-          IO.pipe do |stderr_read, stderr_write|
-            STDOUT.reopen(stdout_write)
-            STDERR.reopen(stderr_write)
-
-            stdout_write.close
-            stderr_write.close
-
-            stdout_thread = Thread.new do
-              while line = stdout_read.gets do
-                stdout.print(line)
-              end
-            end
-
-            stderr_thread = Thread.new do
-              while line = stderr_read.gets do
-                stderr.print(line)
-              end
-            end
-
-            begin
-              yield
-            ensure
-              # TODO: should the threads be killed here?
-              STDOUT.reopen old_stdout
-              STDERR.reopen old_stderr
-            end
-
-            stdout_thread.join
-            stderr_thread.join
-          end
-        end
-      end
     end
   end
 end

data/lib/rspec-interactive/string_output.rb

@@ -18,6 +18,13 @@ module RSpec
       def print(str = "")
         @string += str.to_s
       end
+
+      def flush
+      end
+
+      def closed?
+        @client.closed?
+      end
     end
   end
 end

data/lib/rspec-interactive/threaded_output.rb

@@ -0,0 +1,33 @@
+module RSpec
+  module Interactive
+    class ThreadedOutput
+      attr_reader :string
+
+      def initialize(thread_map:, default:)
+        @thread_map = thread_map
+        @default = default
+        @string = ''
+      end
+
+      def write(name, str = "")
+        (@thread_map[Thread.current] || @default).write(name, str)
+      end
+
+      def puts(str = "")
+        (@thread_map[Thread.current] || @default).puts(str)
+      end
+
+      def print(str = "")
+        (@thread_map[Thread.current] || @default).puts(str)
+      end
+
+      def flush
+        (@thread_map[Thread.current] || @default).flush
+      end
+
+      def closed?
+        (@thread_map[Thread.current] || @default).closed?
+      end
+    end
+  end
+end

data/lib/rspec-interactive/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Interactive
-    VERSION = "0.9.6"
+    VERSION = "0.9.9"
   end
 end

data/lib/rspec-interactive.rb

@@ -19,6 +19,7 @@ require 'rspec-interactive/rubo_cop_command'
 require 'rspec-interactive/runner'
 require 'rspec-interactive/stdio'
 require 'rspec-interactive/string_output'
+require 'rspec-interactive/threaded_output'
 
 module RSpec
   module Interactive
@@ -47,7 +48,7 @@ module RSpec
       @updated_files = []
       @stty_save = %x`stty -g`.chomp
       @file_change_mutex = Mutex.new
-      @command_mutex = Mutex.new
+      @rspec_mutex = Mutex.new
       @output_stream = output_stream
       @input_stream = input_stream
       @error_stream = error_stream
@@ -61,29 +62,44 @@ module RSpec
       configure_pry
 
       @startup_thread = Thread.start do
-        @startup_output = StringOutput.new
-        Stdio.capture2(stdout: @startup_output, stderr: @startup_output) do
-          @config_cache.record_configuration { @configuration.configure_rspec.call }
-          start_file_watcher
-        end
-
+        Thread.current.report_on_exception = false
         if server
           @server_thread = Thread.start do
             server = TCPServer.new port
 
-            while client = server.accept
-              request = client.gets
-              args = Shellwords.split(request)
-              rspec_for_server(client, args)
-              client.close
+            while true
+              break unless client = server.accept
+              begin
+                request = client.gets
+                args = Shellwords.split(request)
+                rspec_for_server(client, args)
+              rescue StandardError => e
+                # It would be nice to log to the client here but it might be
+                # disconnected or disconnect before we successfully write. Any
+                # error here is unexpected so just log to the console.
+                @output_stream.puts
+                @output_stream.puts 'error handling client request'
+                log_exception(@output_stream, e)
+              ensure
+                client.close
+              end
             end
           end
         end
+
+        @startup_output = StringOutput.new
+        output = ThreadedOutput.new(thread_map: { Thread.current => @startup_output }, default: @output_stream)
+
+        Stdio.capture(stdout: output, stderr: output) do
+          @config_cache.record_configuration { @configuration.configure_rspec.call }
+          start_file_watcher
+        end
       end
 
       Pry.start
       @listener.stop if @listener
       @server_thread.exit if @server_thread
+      @startup_thread.exit if @startup_thread
       0
     end
 
@@ -141,17 +157,17 @@ module RSpec
       Pry.config.history_file = @history_file
     end
 
-    def self.refresh
+    def self.refresh(output: @output_stream)
       @file_change_mutex.synchronize do
         @updated_files.uniq.each do |filename|
-          @output_stream.puts "changed: #{filename}"
+          output.puts "changed: #{filename}"
           trace = TracePoint.new(:class) do |tp|
             @configuration.on_class_load.call(tp.self)
           end
           trace.enable
           load filename
           trace.disable
-          @output_stream.puts
+          output.puts
         end
         @updated_files.clear
       end
@@ -180,50 +196,60 @@ module RSpec
     end
 
     def self.rspec(args)
-      @runner = RSpec::Interactive::Runner.new(parse_args(args))
+      @rspec_mutex.synchronize do
+        begin
+          @runner = RSpec::Interactive::Runner.new(parse_args(args))
 
-      refresh
+          refresh
 
-      # Stop saving history in case a new Pry session is started for debugging.
-      Pry.config.history_save = false
+          # Stop saving history in case a new Pry session is started for debugging.
+          Pry.config.history_save = false
 
-      # RSpec::Interactive-specific RSpec configuration
-      RSpec.configure do |config|
-       config.error_stream = @error_stream
-       config.output_stream = @output_stream
-       config.start_time = RSpec::Core::Time.now
-      end
+          # RSpec::Interactive-specific RSpec configuration
+          RSpec.configure do |config|
+           config.error_stream = @error_stream
+           config.output_stream = @output_stream
+           config.start_time = RSpec::Core::Time.now
+          end
 
-      # Run.
-      exit_code = @runner.run
-    ensure
-      @runner = nil
+          # Run.
+          @runner.run
+        ensure
+          @runner = nil
 
-      # Reenable history
-      Pry.config.history_save = true
+          # Reenable history
+          Pry.config.history_save = true
 
-      # Reset
-      RSpec.clear_examples
-      RSpec.reset
-      @config_cache.replay_configuration
+          # Reset
+          RSpec.clear_examples
+          RSpec.reset
+          @config_cache.replay_configuration
+        end
+      end
     end
 
     def self.rspec_for_server(client, args)
-      @command_mutex.synchronize do
-        # Prevent the debugger from being used. The server isn't interactive.
+      @rspec_mutex.synchronize do
         disable_pry = ENV['DISABLE_PRY']
-        ENV['DISABLE_PRY'] = 'true'
-
         output = ClientOutput.new(client)
+
+        ENV['TEAMCITY_RAKE_RUNNER_DEBUG_OUTPUT_CAPTURER_ENABLED'] = 'false'
+        Rake::TeamCity::RunnerCommon.class_variable_set(:@@original_stdout, output)
+
+        return unless await_startup(output: output)
+
         Stdio.capture(stdout: output, stderr: output) do
-          @runner = RSpec::Interactive::Runner.new(parse_args(args))
+          # Prevent the debugger from being used. The server isn't interactive.
+          ENV['DISABLE_PRY'] = 'true'
 
-          refresh
+          runner = RSpec::Interactive::Runner.new(parse_args(args))
+
+          refresh(output: output)
 
           # RSpec::Interactive-specific RSpec configuration
           RSpec.configure do |config|
-           config.error_stream = @error_stream
-           config.output_stream = @output_stream
+           config.error_stream = output
+           config.output_stream = output
            config.start_time = RSpec::Core::Time.now
           end
 
@@ -239,15 +265,19 @@ module RSpec
           RSpec.configuration.formatter = Spec::Runner::Formatter::TeamcityFormatter
 
           # Run.
-          exit_code = @runner.run
+          runner.run
+        rescue Errno::EPIPE, IOError
+          # Don't care.
+        ensure
+          ENV['DISABLE_PRY'] = disable_pry
+          runner = nil
 
           # Reset
           RSpec.clear_examples
           RSpec.reset
+
           @config_cache.replay_configuration
         end
-      ensure
-        ENV['DISABLE_PRY'] = disable_pry
       end
     end
 
@@ -259,28 +289,50 @@ module RSpec
       end
     end
 
-    def self.eval(&block)
-      if Thread.current.thread_variable_get('holding_lock')
+    def self.eval(line, options, &block)
+      return yield if line.nil? # EOF
+      return yield if line.empty? # blank line
+
+      if await_startup
         yield
       else
-        @command_mutex.synchronize do
-          Thread.current.thread_variable_set('holding_lock', true)
-          if @startup_thread
-            if @startup_thread.alive?
-              @output_stream.puts 'waiting for configure_rspec...'
-            end
-            @startup_thread.join
-            @startup_thread = nil
-            unless @startup_output.string.empty?
-              @output_stream.puts(@startup_output.string)
-            end
-            @startup_output = nil
-          end
-          yield
-        ensure
-          Thread.current.thread_variable_set('holding_lock', false)
-        end
+        @output_stream.puts
+        true
+      end
+    end
+
+    def self.await_startup(output: @output_stream)
+      return true unless @startup_thread
+
+      if @startup_thread.alive?
+        output.puts 'waiting for configure_rspec...'
       end
+
+      begin
+        @startup_thread.join
+        @startup_thread = nil
+        print_startup_output(output: output)
+        true
+      rescue Interrupt
+        false
+      rescue StandardError => e
+        print_startup_output(output: output)
+        output.puts 'configure_rspec failed'
+        log_exception(output, e)
+        false
+      end
+    end
+
+    def self.log_exception(output, e)
+      output.puts "#{e.backtrace[0]}: #{e.message} (#{e.class})"
+      e.backtrace[1..-1].each { |b| output.puts "\t#{b}" }
+    end
+
+    def self.print_startup_output(output: @output_stream)
+      return if @startup_output.nil? || @startup_output.string.empty?
+
+      output.puts(@startup_output.string)
+      @startup_output = nil
     end
   end
 end

data/runner/rspec-interactive-run

@@ -24,8 +24,12 @@ parser = OptionParser.new do |opts|
 end.parse
 
 server = TCPSocket.open(@options[:host], @options[:port])
-server.puts ARGV.map{ |arg| Shellwords.escape arg }.join(' ')
-while response = server.gets do
-  puts response
+begin
+  server.puts ARGV.map{ |arg| Shellwords.escape arg }.join(' ')
+  server.close_write
+  while response = server.gets do
+    puts response
+  end
+ensure
+  server.close
 end
-server.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.9
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -103,6 +103,7 @@ files:
 - lib/rspec-interactive/runner.rb
 - lib/rspec-interactive/stdio.rb
 - lib/rspec-interactive/string_output.rb
+- lib/rspec-interactive/threaded_output.rb
 - lib/rspec-interactive/version.rb
 - lib/teamcity/spec/runner/formatter/teamcity/formatter.rb
 - rspec-interactive.gemspec