rspec-interactive 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e7c3fad7abad85f3523490ddfcfd3d6091e042d99fd940c6a9a19991e7dc06
-  data.tar.gz: 02d25e506765d4f0c40b8b3e64ae751f6da34e06af9e845830bdc05071fc8112
+  metadata.gz: 895c315e10777f7d94c8efdf005129bb532463b31d764af1ddd079692b3e0e62
+  data.tar.gz: 264d523cfc32ffab312ef3d9323611c05f00d851d755d5cf53735680eac0ce4a
 SHA512:
-  metadata.gz: 89b49ff9d0e888b8304e0c70a2fded4dd780381750fed960af5f282246accc6ae6d52eb71c5402d2be31bfb9a827c64e04cffcb7f4935d12d97e3d632843a8bf
-  data.tar.gz: 36320560582c44d1459e0590aa469f56e70b5411d8c3c88a499ca9f46c5075163aa3778869f65bb5cfd85dc3fc7dd196fff65c87733b5b0057352353583215c6
+  metadata.gz: 47ca24fe9e49e7ea070c62b3786d72232cb52eabc2faac4777b913099c515a4cb9a0eaeb2515ab204637c344824461fcfdc6e3a460082ca1384bf57d2e04e773
+  data.tar.gz: f7d35eb450b116bb275eac5eaf729d37af936464e18ce9015d3bea953b6204517212299c923eb9e114182b120df3ad3868112be716bd9bd20d6de2c2c8c6326d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-interactive (0.9.6)
+    rspec-interactive (0.9.7)
       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/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/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Interactive
-    VERSION = "0.9.7"
+    VERSION = "0.9.8"
   end
 end

data/lib/rspec-interactive.rb

@@ -61,9 +61,6 @@ module RSpec
       configure_pry
 
       @startup_thread = Thread.start do
-        @config_cache.record_configuration { @configuration.configure_rspec.call }
-        start_file_watcher
-
         if server
           @server_thread = Thread.start do
             server = TCPServer.new port
@@ -76,11 +73,15 @@ module RSpec
             end
           end
         end
+
+        @config_cache.record_configuration { @configuration.configure_rspec.call }
+        start_file_watcher
       end
 
       Pry.start
       @listener.stop if @listener
       @server_thread.exit if @server_thread
+      @startup_thread.exit if @startup_thread
       0
     end
 
@@ -177,40 +178,52 @@ module RSpec
     end
 
     def self.rspec(args)
-      @runner = RSpec::Interactive::Runner.new(parse_args(args))
+      @command_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.
-      @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
-        output = ClientOutput.new(client)
         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)
 
-        Stdio.capture(stdout: output, stderr: output) do
           # Prevent the debugger from being used. The server isn't interactive.
           ENV['DISABLE_PRY'] = 'true'
 
@@ -220,8 +233,8 @@ module RSpec
 
           # 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
 
@@ -238,13 +251,17 @@ module RSpec
 
           # Run.
           @runner.run
+        rescue Errno::EPIPE => e
+          # Don't care.
         ensure
-          @runner = nil
           ENV['DISABLE_PRY'] = disable_pry
+          @runner = nil
 
           # Reset
           RSpec.clear_examples
           RSpec.reset
+
+          await_startup(output: output)
           @config_cache.replay_configuration
         end
       end
@@ -259,22 +276,26 @@ module RSpec
     end
 
     def self.eval(line, options, &block)
-      if line.nil? || Thread.current.thread_variable_get('holding_lock')
-        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
-          end
-          yield
-        ensure
-          Thread.current.thread_variable_set('holding_lock', false)
+      return yield if line.nil? # EOF
+      return yield if line.empty? # blank line
+
+      begin
+        await_startup
+      rescue Interrupt
+        @output_stream.puts
+        return 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
+        @startup_thread.join
+        @startup_thread = 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.7
+  version: 0.9.8
 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