rspec-interactive 0.9.0 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 987faf5573f9ae7554f4983ee350beaf7ad9ef832544cea3b6f92114cf554788
-  data.tar.gz: 29e0c2b195497e1d2af2f7e8565ee64ae6039870f3bb685dc86e750c11342a71
+  metadata.gz: ca3d9ea9bc7a43930a9d3400a30b1c9d0bb06cc6691b70340966c8543b830646
+  data.tar.gz: 6f22c4c95eb720509cabb7cd3edd18277b1b68f96bdca32ab7f55ff6197c3e11
 SHA512:
-  metadata.gz: 2f3e0573bd9280ca150292045134b5eea34243661733aa68dda3ca03c086fc0275ecfecd919aaf022e5aeb943ca4523170e39e6d47c60f8ef59fc5b925fc60b4
-  data.tar.gz: 618437758587eb88be800508ef487960c1c760143e81594e89c3e80280a2eada7e3904e323c960b6dce2b40ec93eba6638e3dbda311d57144a95d6fef719a1d9
+  metadata.gz: f39caa7d3669358769a1aa5f8c901bfbfafbef2d9e5854e14a3331f87bfb5065cf42c3609dcb5d84940371811ae35b6168ed46effa99da032e9d4dae8e0a85d0
+  data.tar.gz: 426d3c1feaec48508dfc48712914c40e278641c669a789b9902fa8a307c3ac349ed4cb580b008be8527d664cde94865d5e33b127a21192bf872f91261f3a93bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-interactive (0.8.1)
+    rspec-interactive (0.9.2)
       listen
       pry
       rspec-core
@@ -12,15 +12,15 @@ GEM
   specs:
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    ffi (1.15.3)
-    listen (3.5.1)
+    ffi (1.15.5)
+    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)
       method_source (~> 1.0)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rspec (3.9.0)

data/bin/rspec-interactive

@@ -4,20 +4,20 @@ require 'optparse'
 require 'rspec-interactive'
 
 @options = {
-  server: false,
-  port:   RSpec::Interactive::DEFAULT_PORT
+  server: true,
+  server_port: RSpec::Interactive::DEFAULT_PORT
 }
 
 parser = OptionParser.new do |opts|
   opts.banner = "Starts an interactive RSpec shell.\n\n"\
-    "Usage: bundle exec rspec-interactive [--config config-file] [--server [--port <port>]]"
+    "Usage: bundle exec rspec-interactive [--config config-file] [--no-server] [--port <port>]"
 
   opts.on("-c", "--config <config-file>", String, "Optional. Path to the RSpec Interactive config file.") do |config_file|
     @options[:config_file] = config_file
   end
 
-  opts.on("-s", "--server", "Optional. Enable server used by IDEs.") do
-    @options[:server] = true
+  opts.on("--no-server", "Optional. Disable server.") do
+    @options[:server] = false
   end
 
   opts.on("-p", "--port <port>", Integer, "Optional. Server port. Defaults to #{RSpec::Interactive::DEFAULT_PORT}.") do |port|
@@ -26,4 +26,4 @@ parser = OptionParser.new do |opts|
 
 end.parse!
 
-RSpec::Interactive.start(config_file: @options[:config_file], server: @options[:server], port: @options[:port])
+RSpec::Interactive.start(config_file: @options[:config_file], server: @options[:server], port: @options[:server_port])

data/examples/config.rb

@@ -0,0 +1,7 @@
+RSpec::Interactive.configure do |config|
+  config.watch_dirs += ['lib']
+
+  config.configure_rspec do
+    RSpec.configuration.formatter = :documentation
+  end
+end

data/lib/rspec-interactive/client_output.rb

@@ -0,0 +1,17 @@
+module RSpec
+  module Interactive
+    class ClientOutput
+      def initialize(client)
+        @client = client
+      end
+
+      def print(str = "")
+        @client.print(str&.to_s || '')
+      end
+
+      def string
+        @output
+      end
+    end
+  end
+end

data/lib/rspec-interactive/pry.rb

@@ -0,0 +1,12 @@
+require 'pry'
+
+class Pry
+  alias_method :old_eval, :eval
+
+  def eval(line, options = {})
+    RSpec::Interactive.eval do
+      old_eval(line, options)
+    end
+  end
+end
+

data/lib/rspec-interactive/rspec_core_example.rb

@@ -0,0 +1,15 @@
+require 'rspec/core'
+
+module RSpec
+  module Core
+    class Example
+      alias_method :old_run, :run
+
+      def run(example_group_instance, reporter)
+        execution_result.started_at = RSpec::Core::Time.now
+        old_run(example_group_instance, reporter)
+      end
+    end
+  end
+end
+

data/lib/rspec-interactive/stdio.rb

@@ -0,0 +1,44 @@
+module RSpec
+  module Interactive
+    class Stdio
+      def self.capture(output)
+        raise ArgumentError, 'missing block' unless block_given?
+
+        stdout, stderr = STDOUT.dup, STDERR.dup
+
+        IO.pipe do |stdout_read, stdout_write|
+          IO.pipe do |stderr_read, stderr_write|
+            STDOUT.reopen(stdout_write)
+            STDERR.reopen(stderr_write)
+
+            stdout_write.close
+            stderr_write.close
+
+            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
+
+            stdout_thread.join
+            stderr_thread.join
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-interactive/version.rb

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

data/lib/rspec-interactive.rb

@@ -7,13 +7,17 @@ require 'shellwords'
 require 'socket'
 require 'teamcity/spec/runner/formatter/teamcity/formatter'
 
+require 'rspec-interactive/client_output'
 require 'rspec-interactive/config'
 require 'rspec-interactive/input_completer'
+require 'rspec-interactive/pry'
 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/rubo_cop_command'
 require 'rspec-interactive/runner'
+require 'rspec-interactive/stdio'
 
 module RSpec
   module Interactive
@@ -42,7 +46,7 @@ module RSpec
       @updated_files = []
       @stty_save = %x`stty -g`.chomp
       @file_change_mutex = Mutex.new
-      @rspec_mutex = Mutex.new
+      @command_mutex = Mutex.new
       @output_stream = output_stream
       @input_stream = input_stream
       @error_stream = error_stream
@@ -55,12 +59,19 @@ module RSpec
       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
 
       if server
+        @output_stream.puts "Listening on port #{port}."
         server_thread = Thread.start do
-          server = TCPServer.new 5678
+          server = TCPServer.new port
 
           while client = server.accept
             request = client.gets
@@ -161,58 +172,67 @@ module RSpec
     end
 
     def self.rspec(args)
-      @rspec_mutex.synchronize do
-
-        @runner = RSpec::Interactive::Runner.new(parse_args(args))
+      @runner = RSpec::Interactive::Runner.new(parse_args(args))
 
-        refresh
+      refresh
 
-        # Stop saving history in case a new Pry session is started for debugging.
-        Pry.config.history_save = false
+      # Stop saving history in case a new Pry session is started for debugging.
+      Pry.config.history_save = false
 
-        # RSpec::Interactive-specific RSpec configuration
-        configure_rspec
+      # RSpec::Interactive-specific RSpec configuration
+      configure_rspec
 
-        # Run.
-        exit_code = @runner.run
-        @runner = nil
+      # Run.
+      exit_code = @runner.run
+      @runner = nil
 
-        # Reenable history
-        Pry.config.history_save = true
+      # Reenable history
+      Pry.config.history_save = true
 
-        # Reset
-        RSpec.clear_examples
-        RSpec.reset
-        @config_cache.replay_configuration
-      ensure
-        @runner = nil
-      end
+      # Reset
+      RSpec.clear_examples
+      RSpec.reset
+      @config_cache.replay_configuration
+    ensure
+      @runner = nil
     end
 
     def self.rspec_for_server(client, args)
-      @rspec_mutex.synchronize do
-        # Set the client so that logs are written to the client rathe than STDOUT.
-        Spec::Runner::Formatter::TeamcityFormatter.client = client
-
-        @runner = RSpec::Interactive::Runner.new(parse_args(args))
-
-        refresh
-
-        # Stop saving history in case a new Pry session is started for debugging.
-        Pry.config.history_save = false
-
-        # RSpec::Interactive-specific RSpec configuration
-        configure_rspec
-        RSpec.configuration.formatter = Spec::Runner::Formatter::TeamcityFormatter
-
-        # Run.
-        exit_code = @runner.run
-
-        # Reset
-        Spec::Runner::Formatter::TeamcityFormatter.client = nil
-        RSpec.clear_examples
-        RSpec.reset
-        @config_cache.replay_configuration
+      @command_mutex.synchronize do
+        # Prevent the debugger from being used. The server isn't interactive.
+        disable_pry = ENV['DISABLE_PRY']
+        ENV['DISABLE_PRY'] = 'true'
+
+        output = ClientOutput.new(client)
+        Stdio.capture(ClientOutput.new(client)) do
+          @runner = RSpec::Interactive::Runner.new(parse_args(args))
+
+          refresh
+
+          # RSpec::Interactive-specific RSpec configuration
+          configure_rspec
+
+          # 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
+          # the loader.
+          RSpec.configuration.instance_variable_set(
+            :@formatter_loader,
+            RSpec::Core::Formatters::Loader.new(RSpec::Core::Reporter.new(RSpec.configuration)))
+
+          # Always use the teamcity formatter, even though RubyMine always specifies it.
+          # This make manual testing of rspec-interactive easier.
+          RSpec.configuration.formatter = Spec::Runner::Formatter::TeamcityFormatter
+
+          # Run.
+          exit_code = @runner.run
+
+          # Reset
+          RSpec.clear_examples
+          RSpec.reset
+          @config_cache.replay_configuration
+        end
+      ensure
+        ENV['DISABLE_PRY'] = disable_pry
       end
     end
 
@@ -224,5 +244,17 @@ module RSpec
       end
     end
 
+    def self.eval(&block)
+      if Thread.current.thread_variable_get('holding_lock')
+        yield
+      else
+        @command_mutex.synchronize do
+          Thread.current.thread_variable_set('holding_lock', true)
+          yield
+        ensure
+          Thread.current.thread_variable_set('holding_lock', false)
+        end
+      end
+    end
   end
 end

data/lib/teamcity/spec/runner/formatter/teamcity/formatter.rb

@@ -4,14 +4,6 @@ module Spec
   module Runner
     module Formatter
       class TeamcityFormatter
-        class << self
-          attr_accessor :client
-        end
-
-        def log(msg)
-          TeamcityFormatter.client.puts(msg)
-          msg
-        end
       end
     end
   end

data/rspec-interactive.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   end
   spec.bindir        = 'bin'
   spec.executables   << 'rspec-interactive'
-  spec.executables   << 'rspec-interactive-run'
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'rspec-core'

data/runner/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+ruby '3.0.0'
+
+source "https://rubygems.org"

data/runner/Gemfile.lock

@@ -0,0 +1,14 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+
+PLATFORMS
+  x86_64-darwin-20
+
+DEPENDENCIES
+
+RUBY VERSION
+   ruby 3.0.0p0
+
+BUNDLED WITH
+   2.3.6

data/{bin → runner}/rspec-interactive-run

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-require 'rspec-interactive'
 require 'shellwords'
 require 'socket'
 
 @options = {
   host: 'localhost',
-  port:   RSpec::Interactive::DEFAULT_PORT
+  port: 5678
 }
 
 parser = OptionParser.new do |opts|
@@ -18,15 +17,15 @@ parser = OptionParser.new do |opts|
     @options[:host] = host
   end
 
-  opts.on("-p", "--port <port>", Integer, "Optional. Server port. Defaults to #{RSpec::Interactive::DEFAULT_PORT}.") do |port|
+  opts.on("-p", "--port <port>", Integer, "Optional. Server port. Defaults to 5678.") do |port|
     @options[:port] = port
   end
 
 end.parse
 
 server = TCPSocket.open(@options[:host], @options[:port])
-server.puts ARGV.map{|arg| Shellwords.escape arg}.join(' ')
+server.puts ARGV.map{ |arg| Shellwords.escape arg }.join(' ')
 while response = server.gets do
-  puts "response: #{response}"
+  puts response
 end
 server.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.3
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -71,7 +71,6 @@ email:
 - nicholasdower@gmail.com
 executables:
 - rspec-interactive
-- rspec-interactive-run
 extensions: []
 extra_rdoc_files: []
 files:
@@ -83,25 +82,32 @@ files:
 - Rakefile
 - bin/console
 - bin/rspec-interactive
-- bin/rspec-interactive-run
 - bin/setup
 - bin/test
+- examples/config.rb
 - examples/debugged_spec.rb
 - examples/failing_spec.rb
 - examples/other_passing_spec.rb
 - examples/passing_spec.rb
 - examples/spec_with_syntax_error.rb
 - lib/rspec-interactive.rb
+- lib/rspec-interactive/client_output.rb
 - lib/rspec-interactive/config.rb
 - lib/rspec-interactive/input_completer.rb
+- lib/rspec-interactive/pry.rb
 - lib/rspec-interactive/refresh_command.rb
 - lib/rspec-interactive/rspec_command.rb
 - lib/rspec-interactive/rspec_config_cache.rb
+- lib/rspec-interactive/rspec_core_example.rb
 - lib/rspec-interactive/rubo_cop_command.rb
 - lib/rspec-interactive/runner.rb
+- lib/rspec-interactive/stdio.rb
 - lib/rspec-interactive/version.rb
 - lib/teamcity/spec/runner/formatter/teamcity/formatter.rb
 - rspec-interactive.gemspec
+- runner/Gemfile
+- runner/Gemfile.lock
+- runner/rspec-interactive-run
 - scripts/release.sh
 - scripts/run-with-local-dep.sh
 - tests/debugged_spec_test.rb