rspec-interactive 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58b63742b50c16f44d1cf19e2957e29ed07ef4a19c3ee91debed0624f519684a
-  data.tar.gz: 0217f523599d1ee0a104718bd3c2bd79aeaf9366d18a22f5abfdadb2ce1fc229
+  metadata.gz: bfaebc90c8fc0856566eb671fb122248778540ce78832af3a4c7b8cc3e8374a2
+  data.tar.gz: 476896ae26c3acf5fef26486ba7d3b5ee4caa2de220bb2c42b61f740989d6d92
 SHA512:
-  metadata.gz: 7d5dbf2e0ec74668264fee718f5e2edaa60f0bff510433f376ac8264a64afb61b2a3538e8604f3c8cc4e0c1e48b409bb4bccfaedb25e0b587145d7b9f4abbb11
-  data.tar.gz: 86bba6bf0ad9728ba06d9374a3efb7b74cb4736fb24f5a81799e7ed4d54c499c012153ca2e90096caf0ab3965098c38cccc28b2b9c0d031723e7cc698b0a4fcc
+  metadata.gz: 20746051789c2591c9e398e65e645b343c994b1cae438f5c509d107217298af9bbef9d0c12327f446ed47214a7800c3ed594acad929fc48873280f5aed380c36
+  data.tar.gz: e844ef291294500ca6702a876662f03f6c20ec261a4864eb43dacca7d8b17fd29b995ea567ccbb3c0d9170c204e24902679b0ca4e24aa4e3925c86026ba5eca3

data/Gemfile.lock

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

data/lib/rspec-interactive/client_output.rb

@@ -6,7 +6,15 @@ module RSpec
       end
 
       def print(str = "")
-        @client.print(str&.to_s || '')
+        @client.print(str.to_s)
+      end
+
+      def write(str = "")
+        @client.print(str.to_s)
+      end
+
+      def puts(str = "")
+        @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|
@@ -16,13 +24,13 @@ module RSpec
 
             stdout_thread = Thread.new do
               while line = stdout_read.gets do
-                output.print(line)
+                stdout.print(line)
               end
             end
 
             stderr_thread = Thread.new do
               while line = stderr_read.gets do
-                output.print(line)
+                stderr.print(line)
               end
             end
 
@@ -30,8 +38,8 @@ module RSpec
               yield
             ensure
               # TODO: should the threads be killed here?
-              STDOUT.reopen stdout
-              STDERR.reopen stderr
+              STDOUT.reopen old_stdout
+              STDERR.reopen old_stderr
             end
 
             stdout_thread.join

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.4"
+    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
@@ -58,27 +59,31 @@ module RSpec
       check_rails
       trap_interrupt
       configure_pry
-      load_rspec_configuration
 
-      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
 
@@ -113,20 +118,6 @@ module RSpec
       @listener.start
     end
 
-    def self.load_rspec_configuration
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      config_thread = Thread.start do
-        @config_cache.record_configuration { @configuration.configure_rspec.call }
-      end
-      unless config_thread.join(3)
-        @output_stream.puts "executing configure_rspec hook..."
-      end
-      config_thread.join
-
-      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @output_stream.puts "configure_rspec hook took #{(end_time - start_time).round} seconds" if end_time - start_time > 5
-    end
-
     def self.configure_pry
       # Prevent Pry from trapping too. It will break ctrl-c handling.
       Pry.config.should_trap_interrupts = false
@@ -161,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)
@@ -208,7 +209,7 @@ 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
@@ -258,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  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,6 +102,7 @@ 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