rspec-interactive 0.9.3 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca3d9ea9bc7a43930a9d3400a30b1c9d0bb06cc6691b70340966c8543b830646
-  data.tar.gz: 6f22c4c95eb720509cabb7cd3edd18277b1b68f96bdca32ab7f55ff6197c3e11
+  metadata.gz: 448fb430c0970d2d6f3dc12a3a1b6577dde234516d0d7f3fdccc735be784919b
+  data.tar.gz: 650d41f575295fb43d1c97930ae49e4a7fe34aac1d4cb1ca2a7d3fe6a1cb25c6
 SHA512:
-  metadata.gz: f39caa7d3669358769a1aa5f8c901bfbfafbef2d9e5854e14a3331f87bfb5065cf42c3609dcb5d84940371811ae35b6168ed46effa99da032e9d4dae8e0a85d0
-  data.tar.gz: 426d3c1feaec48508dfc48712914c40e278641c669a789b9902fa8a307c3ac349ed4cb580b008be8527d664cde94865d5e33b127a21192bf872f91261f3a93bc
+  metadata.gz: d5a4b51199209d0d248e1fc26a2d7e3cb4abf993eb2a61775162eda5107a2a97529bdd58867cb1e870a9c10f9da7c3ef60ce0ccd4ad484f6f900f9c2b0708a6f
+  data.tar.gz: f57523af399e9ca55303101479fbc0940c60095a0ffe93a2092255954fe5be3003bfc82c41c7a416df72a12d72fd4aae0d578b5d7f6da85c1385a9f620950227

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.2)
+    rspec-interactive (0.9.5)
       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

@@ -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.3"
+    VERSION = "0.9.6"
   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,35 +57,33 @@ module RSpec
       load config_file if config_file
 
       check_rails
-      trap_interrupt
+      maybe_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
 
@@ -96,15 +95,17 @@ 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
-      end
-    end
+    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
 
-    def self.trap_interrupt
       trap('INT') do
         if @runner
           # We are on a different thread. There is a race here. Ignore nil.
@@ -128,9 +129,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
@@ -161,14 +159,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)
@@ -180,10 +188,15 @@ 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
+    ensure
       @runner = nil
 
       # Reenable history
@@ -193,8 +206,6 @@ module RSpec
       RSpec.clear_examples
       RSpec.reset
       @config_cache.replay_configuration
-    ensure
-      @runner = nil
     end
 
     def self.rspec_for_server(client, args)
@@ -204,13 +215,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
@@ -250,6 +265,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.3
+  version: 0.9.6
 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