rspec-interactive 0.9.9 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c87a284feb4bf76bac68cda8cbe5703a66f04a856c8e2aed9e27d30b89e2654e
-  data.tar.gz: 9336d2bff3ba1973921f8d7ba6a36d88bc11d4acd1c2b2ee86d7c47cb58d0356
+  metadata.gz: d723a8386eb4ed50df0bde9d90efacb2a8d6472f06faefa711afca46bdd87ae5
+  data.tar.gz: 79c582d886cc31909d7f43c46ec5f9cfffdc8d8f3f9371e85d4e15d496c9cf43
 SHA512:
-  metadata.gz: 36afe559f97bc7cdee9e6833655f23e6092004b800e53beed28099afb8db6ce5511bc8177c9cc648ffc0a558bd221ca2ff13c5ff44e76132c20af99b30281fda
-  data.tar.gz: '097084b7f1fec026f08433a8d12d56997b83a8deb8852026fc04dc1f3e7ec5410433e0758b374724cb2b5450f7b5be4e4db2d9953241a7bbd703f610f032e6ef'
+  metadata.gz: d2bf91dd9111564260b331113842d0fc39991908f8e7707a91589ce6ddaee5ece21916f1aee89c70719cbb0da7854b668dca998f4caa17f488d6f8097e705d81
+  data.tar.gz: 3d24e2e9c3b7b17f87dd56252346b94e78da69abf023889d23b8e89258c8970ad239aebb91f6e507d0dd441a252636240147d70fcfb7a4a0fe93259be6a22fea

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-interactive (0.9.8)
-      listen
+    rspec-interactive (0.9.11)
       pry
       rspec-core
       rspec-teamcity (= 1.0.0)
@@ -14,9 +13,6 @@ GEM
     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)
     method_source (1.0.0)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -25,9 +21,6 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       spoon (~> 0.0)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

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/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Interactive
-    VERSION = "0.9.9"
+    VERSION = "0.9.12"
   end
 end

data/lib/rspec-interactive.rb

@@ -1,8 +1,9 @@
+require 'find'
 require 'json'
-require 'listen'
 require 'pry'
 require 'readline'
 require 'rspec/core'
+require 'set'
 require 'shellwords'
 require 'socket'
 require 'teamcity/spec/runner/formatter/teamcity/formatter'
@@ -47,7 +48,6 @@ module RSpec
       @history_file = history_file
       @updated_files = []
       @stty_save = %x`stty -g`.chomp
-      @file_change_mutex = Mutex.new
       @rspec_mutex = Mutex.new
       @output_stream = output_stream
       @input_stream = input_stream
@@ -60,12 +60,19 @@ module RSpec
       check_rails
       maybe_trap_interrupt
       configure_pry
+      configure_watched_files
 
       @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,14 +97,15 @@ 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 }
-          start_file_watcher
         end
+        finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        @startup_duration = (finish - start).round
       end
 
       Pry.start
-      @listener.stop if @listener
       @server_thread.exit if @server_thread
       @startup_thread.exit if @startup_thread
       0
@@ -132,18 +140,6 @@ module RSpec
       end
     end
 
-    def self.start_file_watcher
-      return if @configuration.watch_dirs.empty?
-
-      # Only polling seems to work in Docker.
-      @listener = Listen.to(*@configuration.watch_dirs, only: /\.rb$/, force_polling: true) do |modified, added|
-        @file_change_mutex.synchronize do
-          @updated_files.concat(added + modified)
-        end
-      end
-      @listener.start
-    end
-
     def self.configure_pry
       # Set up IO.
       Pry.config.input = Readline
@@ -158,18 +154,15 @@ module RSpec
     end
 
     def self.refresh(output: @output_stream)
-      @file_change_mutex.synchronize do
-        @updated_files.uniq.each do |filename|
-          output.puts "changed: #{filename}"
-          trace = TracePoint.new(:class) do |tp|
-            @configuration.on_class_load.call(tp.self)
-          end
-          trace.enable
-          load filename
-          trace.disable
-          output.puts
+      get_updated_files.each do |filename|
+        output.puts "changed: #{filename}"
+        trace = TracePoint.new(:class) do |tp|
+          @configuration.on_class_load.call(tp.self)
         end
-        @updated_files.clear
+        trace.enable
+        load filename
+        trace.disable
+        output.puts
       end
       @configuration.refresh.call
     end
@@ -304,13 +297,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
@@ -329,10 +332,35 @@ 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
+
+    def self.configure_watched_files
+      @watched_files = get_watched_files
+    end
+
+    def self.get_watched_files
+      return Set.new if @configuration.watch_dirs.empty?
+      entries = Find.find(*@configuration.watch_dirs).flat_map do |file|
+        if FileTest.file?(file)
+          [[file, File.mtime(file).to_i]]
+        else
+          []
+        end
+      end
+      entries.to_set
+    end
+
+    def self.get_updated_files
+      new_watched_files = get_watched_files
+      difference = new_watched_files - @watched_files
+      @watched_files = new_watched_files
+      difference.map(&:first)
+    end
   end
 end

data/rspec-interactive.gemspec

@@ -27,6 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rspec-core'
   spec.add_dependency 'rspec-teamcity', '1.0.0'
-  spec.add_dependency 'listen'
   spec.add_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.12
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -38,20 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement