rspec-interactive 0.9.2 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f3d7cb90e4271d19e1eb1a835a9c759084d12baf1f7404bedc521d8ff54047
-  data.tar.gz: 98688109728bbaa18e0b64339987fc0d2320331095ad09f2761d2162254ad868
+  metadata.gz: bfaebc90c8fc0856566eb671fb122248778540ce78832af3a4c7b8cc3e8374a2
+  data.tar.gz: 476896ae26c3acf5fef26486ba7d3b5ee4caa2de220bb2c42b61f740989d6d92
 SHA512:
-  metadata.gz: f0fbe89b3308f29db1302f28b265c0374a6b5c586b32b5c2bee2351d035faaf82c5f5d0362bb95158966d5ea9354de404dc126efd7b899d1bb9d2f8bee40edde
-  data.tar.gz: a8bbeaf1ca9e8f51b975cde6bf51be7cc5c6a57b1266bc4ee527c1e1ffcf995b9ac8c78ac77fe1a8ca79b937c4c31d712c9d58119ca4283854da8a6c4f78ccc9
+  metadata.gz: 20746051789c2591c9e398e65e645b343c994b1cae438f5c509d107217298af9bbef9d0c12327f446ed47214a7800c3ed594acad929fc48873280f5aed380c36
+  data.tar.gz: e844ef291294500ca6702a876662f03f6c20ec261a4864eb43dacca7d8b17fd29b995ea567ccbb3c0d9170c204e24902679b0ca4e24aa4e3925c86026ba5eca3

data/Gemfile.lock

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

data/lib/rspec-interactive/client_output.rb

@@ -5,8 +5,16 @@ module RSpec
         @client = client
       end
 
+      def print(str = "")
+        @client.print(str.to_s)
+      end
+
+      def write(str = "")
+        @client.print(str.to_s)
+      end
+
       def puts(str = "")
-        @client.puts(str&.to_s || '')
+        @client.print(str.to_s + "\n")
       end
 
       def string

data/lib/rspec-interactive/stdio.rb

@@ -1,10 +1,18 @@
 module RSpec
   module Interactive
     class Stdio
-      def self.capture(output)
+      def self.capture2(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?
 
-        stdout, stderr = STDOUT.dup, STDERR.dup
+        old_stdout, old_stderr = STDOUT.dup, STDERR.dup
 
         IO.pipe do |stdout_read, stdout_write|
           IO.pipe do |stderr_read, stderr_write|
@@ -14,23 +22,28 @@ module RSpec
             stdout_write.close
             stderr_write.close
 
-            thread = Thread.new do
-              until stdout_read.eof? && stderr_read.eof? do
-                line = stdout_read.gets
-                output.puts line if line
-                line = stderr_read.gets
-                output.puts if line
+            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
-              STDOUT.reopen stdout
-              STDERR.reopen stderr
+              # TODO: should the threads be killed here?
+              STDOUT.reopen old_stdout
+              STDERR.reopen old_stderr
             end
 
-            thread.join
+            stdout_thread.join
+            stderr_thread.join
           end
         end
       end

data/lib/rspec-interactive/string_output.rb

@@ -0,0 +1,23 @@
+module RSpec
+  module Interactive
+    class StringOutput
+      attr_reader :string
+
+      def initialize
+        @string = ''
+      end
+
+      def write(name, str = "")
+        @string += str.to_s
+      end
+
+      def puts(str = "")
+        @string += str.to_s + "\n"
+      end
+
+      def print(str = "")
+        @string += str.to_s
+      end
+    end
+  end
+end

data/lib/rspec-interactive/version.rb

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

data/lib/rspec-interactive.rb

@@ -18,6 +18,7 @@ require 'rspec-interactive/rspec_core_example'
 require 'rspec-interactive/rubo_cop_command'
 require 'rspec-interactive/runner'
 require 'rspec-interactive/stdio'
+require 'rspec-interactive/string_output'
 
 module RSpec
   module Interactive
@@ -56,34 +57,33 @@ module RSpec
       load config_file if config_file
 
       check_rails
+      trap_interrupt
       configure_pry
 
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @config_cache.record_configuration { @configuration.configure_rspec.call }
-      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      if end_time - start_time > 5
-        @output_stream.puts "Configuring RSpec took #{(end_time - start_time).round} seconds."
-      end
-
-      start_file_watcher
+      @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
-        @output_stream.puts "Listening on port #{port}."
-        server_thread = Thread.start do
-          server = TCPServer.new port
+        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 client = server.accept
+              request = client.gets
+              args = Shellwords.split(request)
+              rspec_for_server(client, args)
+              client.close
+            end
           end
         end
       end
 
       Pry.start
       @listener.stop if @listener
-      server_thread.exit if server_thread
+      @server_thread.exit if @server_thread
       0
     end
 
@@ -95,11 +95,14 @@ module RSpec
       end
     end
 
-    def self.configure_rspec(error_stream: @error_stream, output_stream: @output_stream)
-      RSpec.configure do |config|
-       config.error_stream = error_stream
-       config.output_stream = output_stream
-       config.start_time = RSpec::Core::Time.now
+    def self.trap_interrupt
+      trap('INT') do
+        if @runner
+          # We are on a different thread. There is a race here. Ignore nil.
+          @runner&.quit
+        else
+          raise Interrupt
+        end
       end
     end
 
@@ -116,6 +119,9 @@ 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
@@ -146,14 +152,24 @@ module RSpec
     end
 
     def self.parse_args(args)
-      args.flat_map do |arg|
-        if arg.match(/[\*\?\[]/)
-          glob = Dir.glob(arg)
-          glob.empty? ? [arg] : glob
+      i = 0
+      parsed_args = []
+      until i == args.length
+        case args[i]
+        when /[\*\?\[]/
+          glob = Dir.glob(args[i])
+          parsed_args.concat(glob.empty? ? args[i] : glob)
+        when '--pattern'
+          # RubyMine passes --pattern when running all specs in a dir.
+          # We don't want to expand this since it is used as a glob by RSpec.
+          parsed_args.concat(args[i..(i + 1)])
+          i += 1
         else
-          [arg]
+          parsed_args << args[i]
         end
+        i += 1
       end
+      parsed_args
     end
 
     def self.rspec(args)
@@ -165,7 +181,11 @@ module RSpec
       Pry.config.history_save = false
 
       # RSpec::Interactive-specific RSpec configuration
-      configure_rspec
+      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
@@ -178,9 +198,6 @@ module RSpec
       RSpec.clear_examples
       RSpec.reset
       @config_cache.replay_configuration
-    rescue Interrupt => e
-      @runner&.quit
-      raise e
     ensure
       @runner = nil
     end
@@ -192,13 +209,17 @@ module RSpec
         ENV['DISABLE_PRY'] = 'true'
 
         output = ClientOutput.new(client)
-        Stdio.capture(ClientOutput.new(client)) do
+        Stdio.capture(stdout: output, stderr: output) do
           @runner = RSpec::Interactive::Runner.new(parse_args(args))
 
           refresh
 
           # RSpec::Interactive-specific RSpec configuration
-          configure_rspec
+          RSpec.configure do |config|
+           config.error_stream = @error_stream
+           config.output_stream = @output_stream
+           config.start_time = RSpec::Core::Time.now
+          end
 
           # RubyMine specifies --format. That causes a formatter to be added. It does not override
           # the existing formatter (if one is set by default). Clear any formatters but resetting
@@ -238,6 +259,17 @@ module RSpec
       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)

data/runner/README.md

@@ -0,0 +1,3 @@
+# RSpec Interactive Runner
+
+Use this directory as the working directory in RubyMine run configurations.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.5
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -102,11 +102,13 @@ files:
 - lib/rspec-interactive/rubo_cop_command.rb
 - lib/rspec-interactive/runner.rb
 - lib/rspec-interactive/stdio.rb
+- lib/rspec-interactive/string_output.rb
 - lib/rspec-interactive/version.rb
 - lib/teamcity/spec/runner/formatter/teamcity/formatter.rb
 - rspec-interactive.gemspec
 - runner/Gemfile
 - runner/Gemfile.lock
+- runner/README.md
 - runner/rspec-interactive-run
 - scripts/release.sh
 - scripts/run-with-local-dep.sh