rspec-interactive 0.9.7 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e7c3fad7abad85f3523490ddfcfd3d6091e042d99fd940c6a9a19991e7dc06
-  data.tar.gz: 02d25e506765d4f0c40b8b3e64ae751f6da34e06af9e845830bdc05071fc8112
+  metadata.gz: 1e00d8b9955bf056a3967733d54b89fdece90829b006b7d831de803670e33295
+  data.tar.gz: a5494e1160b97aa0b6c3e883e8457c5a6e6c2c54df1f26cd4d96c1ef15a4bbee
 SHA512:
-  metadata.gz: 89b49ff9d0e888b8304e0c70a2fded4dd780381750fed960af5f282246accc6ae6d52eb71c5402d2be31bfb9a827c64e04cffcb7f4935d12d97e3d632843a8bf
-  data.tar.gz: 36320560582c44d1459e0590aa469f56e70b5411d8c3c88a499ca9f46c5075163aa3778869f65bb5cfd85dc3fc7dd196fff65c87733b5b0057352353583215c6
+  metadata.gz: be9f403faf9fbfa42e38b0a07c70a4a338bc45cc6d9dc679e262653d3bc0a72d4ee1e15341b1693db3b51b0d2436da71b54525d22066fddd02d71a658c3ffb04
+  data.tar.gz: 0f9c77f7d09b008164bf802fa5507b46d6bb43de0d37e5b8aadc414751d919dc9347bf37262b65503e617259e9414a41d6c2e8fa082f77c8328790177b21fad0

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-interactive (0.9.6)
-      listen
+    rspec-interactive (0.9.9)
       pry
       rspec-core
       rspec-teamcity (= 1.0.0)
@@ -12,11 +11,7 @@ GEM
   specs:
     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)
     method_source (1.0.0)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -25,9 +20,6 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       spoon (~> 0.0)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

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/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.7"
+    VERSION = "0.9.10"
   end
 end

data/lib/rspec-interactive.rb

@@ -1,5 +1,5 @@
+require 'find'
 require 'json'
-require 'listen'
 require 'pry'
 require 'readline'
 require 'rspec/core'
@@ -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
@@ -46,8 +47,7 @@ module RSpec
       @history_file = history_file
       @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
@@ -59,28 +59,45 @@ module RSpec
       check_rails
       maybe_trap_interrupt
       configure_pry
+      configure_watched_files
 
       @startup_thread = Thread.start do
-        @config_cache.record_configuration { @configuration.configure_rspec.call }
-        start_file_watcher
-
+        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 }
+        end
       end
 
       Pry.start
-      @listener.stop if @listener
       @server_thread.exit if @server_thread
+      @startup_thread.exit if @startup_thread
       0
     end
 
@@ -113,18 +130,6 @@ module RSpec
       end
     end
 
-    def self.start_file_watcher
-      return if @configuration.watch_dirs.empty?
-
-      # Only polling seems to work in Docker.
-      @listener = Listen.to(*@configuration.watch_dirs, only: /\.rb$/, force_polling: true) do |modified, added|
-        @file_change_mutex.synchronize do
-          @updated_files.concat(added + modified)
-        end
-      end
-      @listener.start
-    end
-
     def self.configure_pry
       # Set up IO.
       Pry.config.input = Readline
@@ -138,19 +143,16 @@ module RSpec
       Pry.config.history_file = @history_file
     end
 
-    def self.refresh
-      @file_change_mutex.synchronize do
-        @updated_files.uniq.each do |filename|
-          @output_stream.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
+    def self.refresh(output: @output_stream)
+      get_updated_files.each do |filename|
+        output.puts "changed: #{filename}"
+        trace = TracePoint.new(:class) do |tp|
+          @configuration.on_class_load.call(tp.self)
         end
-        @updated_files.clear
+        trace.enable
+        load filename
+        trace.disable
+        output.puts
       end
       @configuration.refresh.call
     end
@@ -177,51 +179,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.
-      @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)
+      @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)
+
+        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|
-           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
 
@@ -237,14 +248,17 @@ module RSpec
           RSpec.configuration.formatter = Spec::Runner::Formatter::TeamcityFormatter
 
           # Run.
-          @runner.run
+          runner.run
+        rescue Errno::EPIPE, IOError
+          # Don't care.
         ensure
-          @runner = nil
           ENV['DISABLE_PRY'] = disable_pry
+          runner = nil
 
           # Reset
           RSpec.clear_examples
           RSpec.reset
+
           @config_cache.replay_configuration
         end
       end
@@ -259,23 +273,72 @@ module RSpec
     end
 
     def self.eval(line, options, &block)
-      if line.nil? || Thread.current.thread_variable_get('holding_lock')
+      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
-          end
-          yield
-        ensure
-          Thread.current.thread_variable_set('holding_lock', false)
+        @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
+
+    def self.configure_watched_files
+      @watched_files = get_watched_files
+    end
+
+    def self.get_watched_files
+      return Set.new if @configuration.watch_dirs.empty?
+      entries = Find.find(*@configuration.watch_dirs).flat_map do |file|
+        if FileTest.file?(file)
+          [[file, File.mtime(file).to_i]]
+        else
+          []
         end
       end
+      entries.to_set
+    end
+
+    def self.get_updated_files
+      new_watched_files = get_watched_files
+      difference = new_watched_files - @watched_files
+      @watched_files = new_watched_files
+      difference.map(&:first)
     end
   end
 end

data/rspec-interactive.gemspec

@@ -27,6 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rspec-core'
   spec.add_dependency 'rspec-teamcity', '1.0.0'
-  spec.add_dependency 'listen'
   spec.add_dependency 'pry'
 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.10
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -38,20 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +89,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