rspec-interactive 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f3d7cb90e4271d19e1eb1a835a9c759084d12baf1f7404bedc521d8ff54047
-  data.tar.gz: 98688109728bbaa18e0b64339987fc0d2320331095ad09f2761d2162254ad868
+  metadata.gz: ca3d9ea9bc7a43930a9d3400a30b1c9d0bb06cc6691b70340966c8543b830646
+  data.tar.gz: 6f22c4c95eb720509cabb7cd3edd18277b1b68f96bdca32ab7f55ff6197c3e11
 SHA512:
-  metadata.gz: f0fbe89b3308f29db1302f28b265c0374a6b5c586b32b5c2bee2351d035faaf82c5f5d0362bb95158966d5ea9354de404dc126efd7b899d1bb9d2f8bee40edde
-  data.tar.gz: a8bbeaf1ca9e8f51b975cde6bf51be7cc5c6a57b1266bc4ee527c1e1ffcf995b9ac8c78ac77fe1a8ca79b937c4c31d712c9d58119ca4283854da8a6c4f78ccc9
+  metadata.gz: f39caa7d3669358769a1aa5f8c901bfbfafbef2d9e5854e14a3331f87bfb5065cf42c3609dcb5d84940371811ae35b6168ed46effa99da032e9d4dae8e0a85d0
+  data.tar.gz: 426d3c1feaec48508dfc48712914c40e278641c669a789b9902fa8a307c3ac349ed4cb580b008be8527d664cde94865d5e33b127a21192bf872f91261f3a93bc

data/Gemfile.lock

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

data/lib/rspec-interactive/client_output.rb

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

data/lib/rspec-interactive/stdio.rb

@@ -14,23 +14,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
+                output.print(line)
+              end
+            end
+
+            stderr_thread = Thread.new do
+              while line = stderr_read.gets do
+                output.print(line)
               end
             end
 
             begin
               yield
             ensure
+              # TODO: should the threads be killed here?
               STDOUT.reopen stdout
               STDERR.reopen stderr
             end
 
-            thread.join
+            stdout_thread.join
+            stderr_thread.join
           end
         end
       end

data/lib/rspec-interactive/version.rb

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

data/lib/rspec-interactive.rb

@@ -56,6 +56,7 @@ module RSpec
       load config_file if config_file
 
       check_rails
+      trap_interrupt
       configure_pry
 
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -103,6 +104,17 @@ module RSpec
       end
     end
 
+    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
+
     def self.start_file_watcher
       return if @configuration.watch_dirs.empty?
 
@@ -116,6 +128,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
@@ -178,9 +193,6 @@ module RSpec
       RSpec.clear_examples
       RSpec.reset
       @config_cache.replay_configuration
-    rescue Interrupt => e
-      @runner&.quit
-      raise e
     ensure
       @runner = nil
     end

metadata

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