rspec-interactive 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 895c315e10777f7d94c8efdf005129bb532463b31d764af1ddd079692b3e0e62
-  data.tar.gz: 264d523cfc32ffab312ef3d9323611c05f00d851d755d5cf53735680eac0ce4a
+  metadata.gz: c87a284feb4bf76bac68cda8cbe5703a66f04a856c8e2aed9e27d30b89e2654e
+  data.tar.gz: 9336d2bff3ba1973921f8d7ba6a36d88bc11d4acd1c2b2ee86d7c47cb58d0356
 SHA512:
-  metadata.gz: 47ca24fe9e49e7ea070c62b3786d72232cb52eabc2faac4777b913099c515a4cb9a0eaeb2515ab204637c344824461fcfdc6e3a460082ca1384bf57d2e04e773
-  data.tar.gz: f7d35eb450b116bb275eac5eaf729d37af936464e18ce9015d3bea953b6204517212299c923eb9e114182b120df3ad3868112be716bd9bd20d6de2c2c8c6326d
+  metadata.gz: 36afe559f97bc7cdee9e6833655f23e6092004b800e53beed28099afb8db6ce5511bc8177c9cc648ffc0a558bd221ca2ff13c5ff44e76132c20af99b30281fda
+  data.tar.gz: '097084b7f1fec026f08433a8d12d56997b83a8deb8852026fc04dc1f3e7ec5410433e0758b374724cb2b5450f7b5be4e4db2d9953241a7bbd703f610f032e6ef'

data/Gemfile.lock

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

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.8"
+    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,21 +62,38 @@ module RSpec
       configure_pry
 
       @startup_thread = Thread.start do
+        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
 
-        @config_cache.record_configuration { @configuration.configure_rspec.call }
-        start_file_watcher
+        @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
@@ -139,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
@@ -178,7 +196,7 @@ module RSpec
     end
 
     def self.rspec(args)
-      @command_mutex.synchronize do
+      @rspec_mutex.synchronize do
         begin
           @runner = RSpec::Interactive::Runner.new(parse_args(args))
 
@@ -211,25 +229,22 @@ module RSpec
     end
 
     def self.rspec_for_server(client, args)
-      @command_mutex.synchronize do
+      @rspec_mutex.synchronize do
         disable_pry = ENV['DISABLE_PRY']
         output = ClientOutput.new(client)
 
         ENV['TEAMCITY_RAKE_RUNNER_DEBUG_OUTPUT_CAPTURER_ENABLED'] = 'false'
         Rake::TeamCity::RunnerCommon.class_variable_set(:@@original_stdout, output)
 
-        Stdio.capture(
-          stdout: output,
-          stderr: output) do
-
-          await_startup(output: output)
+        return unless await_startup(output: output)
 
+        Stdio.capture(stdout: output, stderr: output) do
           # Prevent the debugger from being used. The server isn't interactive.
           ENV['DISABLE_PRY'] = 'true'
 
-          @runner = RSpec::Interactive::Runner.new(parse_args(args))
+          runner = RSpec::Interactive::Runner.new(parse_args(args))
 
-          refresh
+          refresh(output: output)
 
           # RSpec::Interactive-specific RSpec configuration
           RSpec.configure do |config|
@@ -250,18 +265,17 @@ module RSpec
           RSpec.configuration.formatter = Spec::Runner::Formatter::TeamcityFormatter
 
           # Run.
-          @runner.run
-        rescue Errno::EPIPE => e
+          runner.run
+        rescue Errno::EPIPE, IOError
           # Don't care.
         ensure
           ENV['DISABLE_PRY'] = disable_pry
-          @runner = nil
+          runner = nil
 
           # Reset
           RSpec.clear_examples
           RSpec.reset
 
-          await_startup(output: output)
           @config_cache.replay_configuration
         end
       end
@@ -279,24 +293,46 @@ module RSpec
       return yield if line.nil? # EOF
       return yield if line.empty? # blank line
 
-      begin
-        await_startup
-      rescue Interrupt
+      if await_startup
+        yield
+      else
         @output_stream.puts
-        return true
+        true
       end
-
-      yield
     end
 
     def self.await_startup(output: @output_stream)
-      if @startup_thread
-        if @startup_thread.alive?
-          output.puts 'waiting for configure_rspec...'
-        end
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Nick Dower
@@ -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