rspec-interactive 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 448fb430c0970d2d6f3dc12a3a1b6577dde234516d0d7f3fdccc735be784919b
-  data.tar.gz: 650d41f575295fb43d1c97930ae49e4a7fe34aac1d4cb1ca2a7d3fe6a1cb25c6
+  metadata.gz: 19e7c3fad7abad85f3523490ddfcfd3d6091e042d99fd940c6a9a19991e7dc06
+  data.tar.gz: 02d25e506765d4f0c40b8b3e64ae751f6da34e06af9e845830bdc05071fc8112
 SHA512:
-  metadata.gz: d5a4b51199209d0d248e1fc26a2d7e3cb4abf993eb2a61775162eda5107a2a97529bdd58867cb1e870a9c10f9da7c3ef60ce0ccd4ad484f6f900f9c2b0708a6f
-  data.tar.gz: f57523af399e9ca55303101479fbc0940c60095a0ffe93a2092255954fe5be3003bfc82c41c7a416df72a12d72fd4aae0d578b5d7f6da85c1385a9f620950227
+  metadata.gz: 89b49ff9d0e888b8304e0c70a2fded4dd780381750fed960af5f282246accc6ae6d52eb71c5402d2be31bfb9a827c64e04cffcb7f4935d12d97e3d632843a8bf
+  data.tar.gz: 36320560582c44d1459e0590aa469f56e70b5411d8c3c88a499ca9f46c5075163aa3778869f65bb5cfd85dc3fc7dd196fff65c87733b5b0057352353583215c6

data/Gemfile.lock

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

data/lib/rspec-interactive/pry.rb

@@ -4,7 +4,7 @@ class Pry
   alias_method :old_eval, :eval
 
   def eval(line, options = {})
-    RSpec::Interactive.eval do
+    RSpec::Interactive.eval(line, options) do
       old_eval(line, options)
     end
   end

data/lib/rspec-interactive/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Interactive
-    VERSION = "0.9.6"
+    VERSION = "0.9.7"
   end
 end

data/lib/rspec-interactive.rb

@@ -61,11 +61,8 @@ module RSpec
       configure_pry
 
       @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
+        @config_cache.record_configuration { @configuration.configure_rspec.call }
+        start_file_watcher
 
         if server
           @server_thread = Thread.start do
@@ -195,7 +192,7 @@ module RSpec
       end
 
       # Run.
-      exit_code = @runner.run
+      @runner.run
     ensure
       @runner = nil
 
@@ -210,12 +207,13 @@ module RSpec
 
     def self.rspec_for_server(client, args)
       @command_mutex.synchronize do
-        # Prevent the debugger from being used. The server isn't interactive.
+        output = ClientOutput.new(client)
         disable_pry = ENV['DISABLE_PRY']
-        ENV['DISABLE_PRY'] = 'true'
 
-        output = ClientOutput.new(client)
         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))
 
           refresh
@@ -239,15 +237,16 @@ module RSpec
           RSpec.configuration.formatter = Spec::Runner::Formatter::TeamcityFormatter
 
           # Run.
-          exit_code = @runner.run
+          @runner.run
+        ensure
+          @runner = nil
+          ENV['DISABLE_PRY'] = disable_pry
 
           # Reset
           RSpec.clear_examples
           RSpec.reset
           @config_cache.replay_configuration
         end
-      ensure
-        ENV['DISABLE_PRY'] = disable_pry
       end
     end
 
@@ -259,8 +258,8 @@ module RSpec
       end
     end
 
-    def self.eval(&block)
-      if Thread.current.thread_variable_get('holding_lock')
+    def self.eval(line, options, &block)
+      if line.nil? || Thread.current.thread_variable_get('holding_lock')
         yield
       else
         @command_mutex.synchronize do
@@ -271,10 +270,6 @@ module 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Nick Dower