rspec-interactive 0.9.10 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e00d8b9955bf056a3967733d54b89fdece90829b006b7d831de803670e33295
-  data.tar.gz: a5494e1160b97aa0b6c3e883e8457c5a6e6c2c54df1f26cd4d96c1ef15a4bbee
+  metadata.gz: 463e635fc01d274aaaa0857835637651842862761bda52cf9f91e3474754f2e3
+  data.tar.gz: 996b14c18d7c8d26446e6c0bac18b0c566952c78d2cba365346a716021fa9a95
 SHA512:
-  metadata.gz: be9f403faf9fbfa42e38b0a07c70a4a338bc45cc6d9dc679e262653d3bc0a72d4ee1e15341b1693db3b51b0d2436da71b54525d22066fddd02d71a658c3ffb04
-  data.tar.gz: 0f9c77f7d09b008164bf802fa5507b46d6bb43de0d37e5b8aadc414751d919dc9347bf37262b65503e617259e9414a41d6c2e8fa082f77c8328790177b21fad0
+  metadata.gz: 7c0ebae7aca82565ee027992003259a7abd4f1f0f049be0a1e8c31d382459f72eb9b3ea9b7000d8eddbe4236f47e036e442897e0a78558ee548946bb8de1cdd8
+  data.tar.gz: a1cae8c47176dd0f315335bbf8f63885653ae5f6e248aab2d885d9a38d6ee90124a5091dbfefa468b20c8307beeec7b4cc0f58202a2f0a5a473f2928cb5a9b63

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-interactive (0.9.9)
+    rspec-interactive (0.9.12)
       pry
       rspec-core
       rspec-teamcity (= 1.0.0)
@@ -11,6 +11,7 @@ GEM
   specs:
     coderay (1.1.3)
     diff-lcs (1.4.4)
+    ffi (1.15.5)
     ffi (1.15.5-java)
     method_source (1.0.0)
     pry (0.14.1)

data/bin/rspec-interactive

@@ -5,7 +5,7 @@ require 'rspec-interactive'
 
 @options = {
   server: true,
-  server_port: RSpec::Interactive::DEFAULT_PORT
+  port: RSpec::Interactive::DEFAULT_PORT
 }
 
 parser = OptionParser.new do |opts|
@@ -26,4 +26,4 @@ parser = OptionParser.new do |opts|
 
 end.parse!
 
-RSpec::Interactive.start(config_file: @options[:config_file], server: @options[:server], port: @options[:server_port])
+RSpec::Interactive.start(config_file: @options[:config_file], server: @options[:server], port: @options[:port])

data/lib/rspec-interactive/rspec_core_parser.rb

@@ -0,0 +1,22 @@
+require 'rspec/core/option_parser'
+
+# RSpec::Core::Parser calls abort on parse error. This kills the process.
+# Here we replace abort so that it will raise instead.
+
+# In some cases abort is called in response to an exception. If we simply raise,
+# the original exception will be logged as the cause. This will lead to duplicate
+# messaging. Here we define our own exception so that we can ensure no cause is
+# logged.
+class ParseError < StandardError
+  def cause
+    nil
+  end
+end
+
+module RSpec::Core
+  class Parser
+    def abort(msg)
+      raise ParseError.new(msg)
+    end
+  end
+end

data/lib/rspec-interactive/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Interactive
-    VERSION = "0.9.10"
+    VERSION = "0.9.13"
   end
 end

data/lib/rspec-interactive.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'pry'
 require 'readline'
 require 'rspec/core'
+require 'set'
 require 'shellwords'
 require 'socket'
 require 'teamcity/spec/runner/formatter/teamcity/formatter'
@@ -15,6 +16,7 @@ require 'rspec-interactive/refresh_command'
 require 'rspec-interactive/rspec_command'
 require 'rspec-interactive/rspec_config_cache'
 require 'rspec-interactive/rspec_core_example'
+require 'rspec-interactive/rspec_core_parser'
 require 'rspec-interactive/rubo_cop_command'
 require 'rspec-interactive/runner'
 require 'rspec-interactive/stdio'
@@ -63,9 +65,15 @@ module RSpec
 
       @startup_thread = Thread.start do
         Thread.current.report_on_exception = false
+
         if server
           @server_thread = Thread.start do
-            server = TCPServer.new port
+            begin
+              server = TCPServer.new port
+            rescue StandardError => e
+              log_exception(@output_stream, e)
+              exit 1
+            end
 
             while true
               break unless client = server.accept
@@ -90,9 +98,12 @@ module RSpec
         @startup_output = StringOutput.new
         output = ThreadedOutput.new(thread_map: { Thread.current => @startup_output }, default: @output_stream)
 
+        start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         Stdio.capture(stdout: output, stderr: output) do
           @config_cache.record_configuration { @configuration.configure_rspec.call }
         end
+        finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        @startup_duration = (finish - start).round
       end
 
       Pry.start
@@ -287,13 +298,23 @@ module RSpec
     def self.await_startup(output: @output_stream)
       return true unless @startup_thread
 
+      waited = false
       if @startup_thread.alive?
         output.puts 'waiting for configure_rspec...'
+        waited = true
       end
 
       begin
         @startup_thread.join
         @startup_thread = nil
+        if waited
+          if @startup_duration == 1
+            output.puts("configure_rspec took 1 second")
+          else
+            output.puts("configure_rspec took #{@startup_duration} seconds")
+          end
+        end
+
         print_startup_output(output: output)
         true
       rescue Interrupt
@@ -312,9 +333,11 @@ module RSpec
     end
 
     def self.print_startup_output(output: @output_stream)
-      return if @startup_output.nil? || @startup_output.string.empty?
+      return if @startup_output.nil?
 
-      output.puts(@startup_output.string)
+      unless @startup_output.string.empty?
+        output.puts(@startup_output.string)
+      end
       @startup_output = nil
     end
 

data/tests/parse_error_test.rb

@@ -0,0 +1,17 @@
+require_relative 'support/test_helper'
+
+Test.test "parse error" do
+  await_prompt
+  input "rspec --foo"
+  await_prompt
+  input "exit"
+  await_termination
+  expect_equal "output", output.gsub(/^from .*lib\/rspec-interactive/, 'from [...]'), <<~EOF
+    [1] pry(main)> rspec --foo
+    ParseError: invalid option: --foo
+
+    Please use --help for a listing of valid options
+    from [...]/rspec_core_parser.rb:19:in `abort'
+    [1] pry(main)> exit
+  EOF
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.13
 platform: ruby
 authors:
 - Nick Dower
@@ -85,6 +85,7 @@ files:
 - lib/rspec-interactive/rspec_command.rb
 - lib/rspec-interactive/rspec_config_cache.rb
 - lib/rspec-interactive/rspec_core_example.rb
+- lib/rspec-interactive/rspec_core_parser.rb
 - lib/rspec-interactive/rubo_cop_command.rb
 - lib/rspec-interactive/runner.rb
 - lib/rspec-interactive/stdio.rb
@@ -105,6 +106,7 @@ files:
 - tests/failing_spec_test.rb
 - tests/glob_test.rb
 - tests/line_number_test.rb
+- tests/parse_error_test.rb
 - tests/passing_spec_test.rb
 - tests/rerun_failed_specs_test.rb
 - tests/spec_with_syntax_error_test.rb