rspec-interactive 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3ff2b23a6cf52444bf173292d0e161006bbcf764f153f31ea9052d0f0c0f912
-  data.tar.gz: ddb6567801ceb90ff76054d554d3d63ecc951a92584395d809f691c10520555f
+  metadata.gz: 44ae79866c1c58455a4c3002cd84f80b5a81ee65ff2256edee608179e8f0b4e1
+  data.tar.gz: 189c67764a53a77ce517fbfe23f33a4a17fd368ce369a7ceb9bf423ce2cca3b1
 SHA512:
-  metadata.gz: 2aa35c7ed2108213d90e97d9b8d30208f28993ab2e8111127024dec1ddf7404226a00a5e7c2a99dd47a026efc18f043558e8db3d87373e3c486bf4de8fac32a8
-  data.tar.gz: 35147d8a59a432d163dfd309db75c92100c781e5e1d6fa925df431ec70cc849b6886f1bd0cac9bb27e53ee9b6094b7332012520f69b29ed30e8178af5dbe6125
+  metadata.gz: 5e8c797fc2481ce1380d4f4056883b39479d6519be4f40af235979fd63dd23040eb7b62e1e80234156b805dead002837afb09ca4fb569f30c134cc97a6f5c6e3
+  data.tar.gz: a49843eff84cb74c5a3de6da1758de16a947b9ce16e741253354d69b4082c871184ce7e8dd346cb51576e2484e44ca3950d5079d581cc211915d3f600e7b01fd

data/.gitignore

@@ -1,4 +1,3 @@
 rspec-interactive-*.gem
 .rspec_interactive_history
 .rspec_interactive_config
-.rspec_interactive_results

data/Gemfile.lock

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

data/README.md

@@ -35,7 +35,6 @@ Update `.gitignore`
 
 ```shell
 echo '.rspec_interactive_history' >> .gitignore
-echo '.rspec_interactive_results' >> .gitignore
 ```
 
 ## Usage

data/lib/rspec-interactive.rb

@@ -12,23 +12,24 @@ require 'rspec-interactive/rspec_command'
 module RSpec
   module Interactive
 
-    HISTORY_FILE = '.rspec_interactive_history'.freeze
-    CONFIG_FILE = '.rspec_interactive_config'.freeze
+    DEFAULT_HISTORY_FILE = '.rspec_interactive_history'.freeze
+    DEFAULT_CONFIG_FILE = '.rspec_interactive_config'.freeze
 
     class <<self
       attr_accessor :readline, :input_stream, :output_stream, :error_stream
-      attr_accessor :config, :stty_save, :mutex, :config_cache, :runner, :results, :result, :updated_files
+      attr_accessor :config, :mutex, :config_cache, :runner, :results, :result, :updated_files
     end
 
-    def self.start(args, input_stream: STDIN, output_stream: STDOUT, error_stream: STDERR)
+    def self.start(args, config_file: DEFAULT_CONFIG_FILE, history_file: DEFAULT_HISTORY_FILE, input_stream: STDIN, output_stream: STDOUT, error_stream: STDERR)
       if args.size > 1
         @error_stream.puts "expected 0 or 1 argument, got: #{args.join(', ')}"
-        exit!(1)
+        return 1
       end
 
+      @config_file = config_file
+      @history_file = history_file
       @updated_files = []
       @results = []
-      @config = get_config(args[0])
       @stty_save = %x`stty -g`.chomp
       @mutex = Mutex.new
       @output_stream = output_stream
@@ -36,6 +37,9 @@ module RSpec
       @error_stream = error_stream
       @config_cache = RSpec::Interactive::ConfigCache.new
 
+      @config = get_config(args[0])
+      return 1 unless @config
+
       load_rspec_config
       check_rails
       start_file_watcher
@@ -43,6 +47,7 @@ module RSpec
       configure_pry
 
       Pry.start
+      0
     end
 
     def self.check_rails
@@ -74,15 +79,21 @@ module RSpec
     end
 
     def self.get_config(name = nil)
-      unless File.exists? CONFIG_FILE
-        @error_stream.puts "warning: #{CONFIG_FILE} not found, using default config"
+      unless @config_file && File.exists?(@config_file)
+        @error_stream.puts "warning: config file not found, using default config" if @config_file
         return {}
       end
 
-      configs = JSON.parse(File.read(CONFIG_FILE))["configs"] || []
+      begin
+        configs = JSON.parse(File.read(@config_file))["configs"] || []
+      rescue JSON::ParserError => e
+        @error_stream.puts "failed to parse config file"
+        return nil
+      end
+
       if configs.empty?
-        @error_stream.puts "no configs found in: #{CONFIG_FILE}"
-        exit!(1)
+        @error_stream.puts "no configs found in config file"
+        return nil
       end
 
       # If a specific config was specified, use it.
@@ -90,7 +101,7 @@ module RSpec
         config = configs.find { |e| e["name"] == name }
         return config if config
         @error_stream.puts "invalid config: #{name}"
-        exit!(1)
+        return nil
       end
 
       # If there is only one, use it.
@@ -151,7 +162,7 @@ module RSpec
       # Use custom completer to get file completion.
       Pry.config.completer = RSpec::Interactive::InputCompleter
 
-      Pry.config.history_file = HISTORY_FILE
+      Pry.config.history_file = @history_file
     end
   end
 end

data/lib/rspec-interactive/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Interactive
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/tests/debugged_spec_test.rb

@@ -29,7 +29,10 @@ Test.test "debugged spec" do
     Finished in 0 seconds (files took 0 seconds to load)
     1 example, 0 failures
 
-    => <RSpec::Interactive::Result @success=true, @group_results=[...]>
     [2] pry(main)> exit
   EOF
+
+  expect_history <<~EOF
+    rspec examples/debugged_spec.rb
+  EOF
 end

data/tests/failing_spec_test.rb

@@ -36,9 +36,6 @@ Test.test "failing spec" do
 
     rspec ./examples/failing_spec.rb:4 # example spec fails
 
-    Rerun failures by executing the previous command with --only-failures or --next-failure.
-
-    => <RSpec::Interactive::Result @success=false, @group_results=[...]>
     [2] pry(main)> exit
   EOF
 end

data/tests/invalid_config_test.rb

@@ -0,0 +1,26 @@
+require_relative 'support/test_helper'
+
+config = Tempfile.new('config')
+config.write '{'
+config.rewind
+
+Test.test "invalid config", config_path: config.path do
+  await_termination
+  expect_error_output <<~EOF
+    failed to parse config file
+  EOF
+  expect_result 1
+end
+config.close
+
+config = Tempfile.new('config')
+config.write '{}'
+config.rewind
+
+Test.test "empty config", config_path: config.path do
+  await_termination
+  expect_error_output <<~EOF
+    no configs found in config file
+  EOF
+  expect_result 1
+end

data/tests/passing_spec_test.rb

@@ -13,7 +13,6 @@ Test.test "passing spec" do
     Finished in 0 seconds (files took 0 seconds to load)
     2 examples, 0 failures
 
-    => <RSpec::Interactive::Result @success=true, @group_results=[...]>
     [2] pry(main)> exit
   EOF
 end

data/tests/support/test_helper.rb

@@ -156,38 +156,61 @@ end
 
 class Test
 
-  def self.test(name, &block)
-    Test.new.run(name, &block)
+  def self.test(name, config_path: nil, &block)
+    Test.new.run(name, config_path, &block)
   end
 
-  def run(name, &block)
+  def run(name, config_path, &block)
+    puts "running: #{name}"
+
     @output_temp_file = Tempfile.new('output')
     @output_write = File.open(@output_temp_file.path, 'w')
 
+    @error_temp_file = Tempfile.new('error')
+    @error_write = File.open(@error_temp_file.path, 'w')
+
+    @history_temp_file = Tempfile.new('history')
+
     @interactive_thread = Thread.start do
-      RSpec::Interactive.start(ARGV, input_stream: STDIN, output_stream: @output_write, error_stream: @output_write)
+      @result = RSpec::Interactive.start(
+        ARGV,
+        config_file: config_path,
+        history_file: @history_temp_file.path,
+        input_stream: STDIN,
+        output_stream: @output_write,
+        error_stream: @error_write)
     end
 
     begin
       instance_eval &block
     rescue Exception => e
       failed = true
-      Ansi.puts :red, "failed: #{name}\n#{e.message}"
+      STDERR.puts e.message
+      e.backtrace[0..5].each { |line| STDERR.puts "  #{line}" }
     end
 
     await_termination
 
     if Readline.error
       failed = true
-      Ansi.puts :red, "failed: #{name}\n#{Readline.error}"
+      STDOUT.puts Readline.error
     end
 
-    if !failed
+    if failed
+      Ansi.puts :red, "failed: #{name}"
+    else
       Ansi.puts :green, "passed: #{name}"
     end
+    puts
   ensure
     @output_write.close
     @output_temp_file.close
+
+    @error_write.close
+    @error_temp_file.close
+
+    @history_temp_file.close
+
     Readline.reset
   end
 
@@ -213,9 +236,35 @@ class Test
     File.read(@output_temp_file.path).gsub("\e[0G", "")
   end
 
+  def error_output
+    @error_write.flush
+    @error_temp_file.rewind
+    File.read(@error_temp_file.path)
+  end
+
+  def expect_history(expected)
+    @history_temp_file.rewind
+    history = File.read(@history_temp_file.path)
+    if expected != history
+      raise "unexpected history:\n  expected: #{expected.inspect}\n  actual:   #{history.inspect}"
+    end
+  end
+
   def expect_output(expected)
     if expected != output
       raise "unexpected output:\n  expected: #{expected.inspect}\n  actual:   #{output.inspect}"
     end
   end
+
+  def expect_error_output(expected)
+    if expected != error_output
+      raise "unexpected error output:\n  expected: #{expected.inspect}\n  actual:   #{error_output.inspect}"
+    end
+  end
+
+  def expect_result(expected)
+    if expected != @result
+      raise "unexpected result:\n  expected: #{expected.inspect}\n  actual:   #{@result.inspect}"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-interactive
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nick Dower
@@ -82,6 +82,7 @@ files:
 - rspec-interactive.gemspec
 - tests/debugged_spec_test.rb
 - tests/failing_spec_test.rb
+- tests/invalid_config_test.rb
 - tests/passing_spec_test.rb
 - tests/support/ansi.rb
 - tests/support/test_helper.rb