rspec-interactive 0.9.5 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfaebc90c8fc0856566eb671fb122248778540ce78832af3a4c7b8cc3e8374a2
-  data.tar.gz: 476896ae26c3acf5fef26486ba7d3b5ee4caa2de220bb2c42b61f740989d6d92
+  metadata.gz: 895c315e10777f7d94c8efdf005129bb532463b31d764af1ddd079692b3e0e62
+  data.tar.gz: 264d523cfc32ffab312ef3d9323611c05f00d851d755d5cf53735680eac0ce4a
 SHA512:
-  metadata.gz: 20746051789c2591c9e398e65e645b343c994b1cae438f5c509d107217298af9bbef9d0c12327f446ed47214a7800c3ed594acad929fc48873280f5aed380c36
-  data.tar.gz: e844ef291294500ca6702a876662f03f6c20ec261a4864eb43dacca7d8b17fd29b995ea567ccbb3c0d9170c204e24902679b0ca4e24aa4e3925c86026ba5eca3
+  metadata.gz: 47ca24fe9e49e7ea070c62b3786d72232cb52eabc2faac4777b913099c515a4cb9a0eaeb2515ab204637c344824461fcfdc6e3a460082ca1384bf57d2e04e773
+  data.tar.gz: f7d35eb450b116bb275eac5eaf729d37af936464e18ce9015d3bea953b6204517212299c923eb9e114182b120df3ad3868112be716bd9bd20d6de2c2c8c6326d

data/.gitignore

@@ -2,3 +2,5 @@ rspec-interactive-*.gem
 .rspec_interactive_history
 .rspec_interactive_config
 .idea
+vendor
+.bundle

data/Gemfile

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-ruby '3.0.0'
-
 source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-interactive (0.9.4)
+    rspec-interactive (0.9.7)
       listen
       pry
       rspec-core
@@ -13,6 +13,7 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.4.4)
     ffi (1.15.5)
+    ffi (1.15.5-java)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -20,6 +21,10 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    pry (0.14.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      spoon (~> 0.0)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -38,16 +43,16 @@ GEM
     rspec-support (3.9.4)
     rspec-teamcity (1.0.0)
       rspec (>= 2.99, >= 2.14.2, < 4)
+    spoon (0.0.6)
+      ffi
 
 PLATFORMS
+  universal-java-11
   x86_64-darwin-20
 
 DEPENDENCIES
   rspec-expectations
   rspec-interactive!
 
-RUBY VERSION
-   ruby 3.0.0p0
-
 BUNDLED WITH
    2.2.17

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/version.rb

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

data/lib/rspec-interactive.rb

@@ -57,16 +57,10 @@ module RSpec
       load config_file if config_file
 
       check_rails
-      trap_interrupt
+      maybe_trap_interrupt
       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
-
         if server
           @server_thread = Thread.start do
             server = TCPServer.new port
@@ -79,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
 
@@ -95,7 +93,17 @@ module RSpec
       end
     end
 
-    def self.trap_interrupt
+    def self.maybe_trap_interrupt
+      return unless RbConfig::CONFIG['ruby_install_name'] == 'jruby'
+
+      # When on JRuby, Pry traps interrupts and raises an Interrupt exception.
+      # Unfortunately, raising Interrupt is not enough when RSpec is running since it
+      # will only cause the current example to fail. We want to kill RSpec entirely
+      # if it is running so here we disable Pry's handling and rewrite it to include
+      # special handling for RSpec.
+
+      Pry.config.should_trap_interrupts = false
+
       trap('INT') do
         if @runner
           # We are on a different thread. There is a race here. Ignore nil.
@@ -119,9 +127,6 @@ module RSpec
     end
 
     def self.configure_pry
-      # Prevent Pry from trapping too. It will break ctrl-c handling.
-      Pry.config.should_trap_interrupts = false
-
       # Set up IO.
       Pry.config.input = Readline
       Pry.config.output = @output_stream
@@ -173,51 +178,63 @@ 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.
-      exit_code = @runner.run
-      @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
-    ensure
-      @runner = nil
+          # 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.
         disable_pry = ENV['DISABLE_PRY']
-        ENV['DISABLE_PRY'] = 'true'
-
         output = ClientOutput.new(client)
-        Stdio.capture(stdout: output, stderr: output) do
+
+        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)
+
+          # Prevent the debugger from being used. The server isn't interactive.
+          ENV['DISABLE_PRY'] = 'true'
+
           @runner = RSpec::Interactive::Runner.new(parse_args(args))
 
           refresh
 
           # 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
 
@@ -233,15 +250,20 @@ module RSpec
           RSpec.configuration.formatter = Spec::Runner::Formatter::TeamcityFormatter
 
           # Run.
-          exit_code = @runner.run
+          @runner.run
+        rescue Errno::EPIPE => e
+          # Don't care.
+        ensure
+          ENV['DISABLE_PRY'] = disable_pry
+          @runner = nil
 
           # Reset
           RSpec.clear_examples
           RSpec.reset
+
+          await_startup(output: output)
           @config_cache.replay_configuration
         end
-      ensure
-        ENV['DISABLE_PRY'] = disable_pry
       end
     end
 
@@ -253,27 +275,27 @@ module RSpec
       end
     end
 
-    def self.eval(&block)
-      if 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
-            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)
+    def self.eval(line, options, &block)
+      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.5
+  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