splot 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a02e6293df35f85f64deee512f9cf1578ed9ff5e
-  data.tar.gz: 4d6a6370d513eae9ba1f8d90ef298490132cffdc
+  metadata.gz: e923fdd3cece99b795b726968ab664c2b5f85735
+  data.tar.gz: 5a97b017eb3ac14269012ab42f6afcdb3c6be1cf
 SHA512:
-  metadata.gz: f46537a99393fe4abe1cbd8463269e0507e94f820a807017de0d1b97c2154d4c8e1e1e912387260907403a067aabbfa770eef5b8c052405144c0f564e9c7ed8a
-  data.tar.gz: 6b8bb95b26328f36a6ac07adbb1866484714a3add2681831477fab6687258b7d9180adefc42da91ac5a54053b6c7041ef0221aa92effa98bcd9c18b9cbc344ed
+  metadata.gz: 303d126166adb7a7d324020c7972fb479dc1b1ab798e5b8c94d6a47e7b37d77e954e43ffd966979b71d951357f0c5fc1abb878826c43a763c06688586e90cb52
+  data.tar.gz: c7aa78bc509abc917051e998e12aa61e8a3ccce8de7498c2a8974193d7ddcfbbf4e2c8b14882d3192c981e03b25c9cbcae5d2f143af00adf1578e9bce83669fc

data/bin/splot

@@ -7,4 +7,4 @@ rescue LoadError
   require "splot"
 end
 
-Splot.exec_command_from_argv
+Splot::Runner.run!

data/lib/splot/corresponding_file.rb

@@ -1,6 +1,8 @@
 module Splot
-  class CorrespondingFile
-    def self.fetch(file)
+  module CorrespondingFile
+    extend self
+
+    def fetch(file)
       catch :test_file do
         root_path = Pathname.new File.expand_path Dir.pwd
         file_path = Pathname.new File.expand_path file
@@ -9,6 +11,9 @@ module Splot
           ['test', 'spec'].each do |e|
             try_file "#{e}/lib/#{bit}_#{e}.rb"
             try_file "#{e}/#{bit}_#{e}.rb"
+            bit_without_gem_name = extract_gem_name bit
+            try_file "#{e}/lib/#{bit_without_gem_name}_#{e}.rb"
+            try_file "#{e}/#{bit_without_gem_name}_#{e}.rb"
           end
         end
         if %r{\Aapp/(?<subdir>[a-z_]+)/(?<bit>.*)\.rb} =~ relative_path
@@ -25,11 +30,16 @@ module Splot
       end
     end
 
-    def self.try_file(test_path)
+    # my_gem/foo.rb -> foo.rb
+    def extract_gem_name(lib_file)
+      File.join File.split(lib_file).tap(&:shift)
+    end
+
+    def try_file(test_path)
       throw :test_file, test_path if file_exists? test_path
     end
 
-    def self.file_exists?(file)
+    def file_exists?(file)
       File.size? file
     end
   end

data/lib/splot/runner.rb

@@ -2,6 +2,10 @@ module Splot
   class Runner
     attr :params
 
+    def self.run!
+      new.tap(&:parse).run!
+    end
+
     def initialize
       @params = {}
     end
@@ -45,6 +49,13 @@ module Splot
       params[:config_file] = splotrc if File.size? splotrc
     end
 
+    def run!
+      Kernel.exec command
+    rescue RunnerNotFoundError => e
+      warn "Warning: #{e}; will not run any test"
+      exit 2
+    end
+
     private
 
     def splotrc

data/lib/splot/version.rb

@@ -1,3 +1,3 @@
 module Splot
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/splot.rb

@@ -21,11 +21,4 @@ module Splot
     Command.for(params[:file]).new(params).command
   end
 
-  def self.exec_command_from_argv
-    command = Runner.new.tap(&:parse).command
-    Kernel.exec command
-  rescue RunnerNotFoundError => e
-    warn "Warning: #{e}; will not run any test"
-    exit 2
-  end
 end

data/test/corresponding_file_test.rb

@@ -21,6 +21,13 @@ class CorrespondingFileTest < Minitest::Test
     end
   end
 
+  def test_gem_lib_dir
+    mock_files_existing "test/my_class_test.rb" do
+      assert_equal "test/my_class_test.rb",
+        CorrespondingFile.fetch("lib/gem_name/my_class.rb")
+    end
+  end
+
   def test_namespacing
     mock_files_existing "test/lib/my_namespace/my_class_test.rb" do
       assert_equal "test/lib/my_namespace/my_class_test.rb",
@@ -56,25 +63,4 @@ class CorrespondingFileTest < Minitest::Test
         CorrespondingFile.fetch("app/services/my_service.rb")
     end
   end
-
-  private
-
-  def mock_files_existing(*files)
-    File.singleton_class.class_eval <<-CLASS_EVAL, __FILE__, __LINE__
-    alias_method :size_orig?, :size?
-
-    def size?(file)                      # def size?(file)
-      #{files.inspect}.include?(file)    #   ["fileA", "my/fileB"].include?(file)
-    end                                  # end
-    CLASS_EVAL
-
-    begin
-      yield
-    ensure
-      File.singleton_class.class_eval <<-CLASS_EVAL, __FILE__, __LINE__
-      alias_method :size?, :size_orig?
-      undef :size_orig?
-      CLASS_EVAL
-    end
-  end
 end

data/test/runner_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class RunnerTest < Minitest::Test
+
+  def setup
+    @runner = Splot::Runner.new
+  end
+
+  def test_config_file_set_if_present
+    mock_files_existing ".splotrc" do
+      @runner.parse_splotrc
+      assert_equal ".splotrc", @runner.params[:config_file]
+    end
+  end
+
+  def test_config_file_not_set_if_not_present
+    @runner.parse_splotrc
+    refute_equal ".splotrc", @runner.params[:config_file]
+  end
+
+end

data/test/splot_test.rb

@@ -2,9 +2,8 @@ require "test_helper"
 
 class SplotTest < Minitest::Test
   def test_binary
-    assert_equal 0, run_binary(runner: "ruby", include_path: "test/fixtures", file: "test/fixtures/test_unit_example_test.rb", line: 5)
-    refute_equal 0, run_binary(runner: "ruby", include_path: "test/fixtures", file: "test/fixtures/test_unit_example_test.rb", line: 8)
-    assert_equal 2, run_binary(runner: "ruby", include_path: "test/fixtures", file: "non/existent/file.rb")
+    assert_equal 0, run_binary("-r ruby --include-path test/fixtures -f test/fixtures/test_unit_example_test.rb --line 5")
+    refute_equal 0, run_binary("-r ruby --include-path test/fixtures -f test/fixtures/test_unit_example_test.rb --line 8")
   end
 
   def test_test_unit
@@ -91,21 +90,18 @@ class SplotTest < Minitest::Test
   def test_auto_loads_dot_splotrc
     splotrc = File.expand_path('../../.splotrc', __FILE__)
     File.write splotrc, "include_path: test/fixtures"
-    assert_equal 0, run_binary(runner: "ruby", file: "test/fixtures/test_unit_example_test.rb", line: 5)
+    assert_equal 0, run_binary("-r ruby -f test/fixtures/test_unit_example_test.rb --line 5")
   ensure
     File.unlink splotrc if File.exist? splotrc
   end
 
   private
 
-  def run_binary(params = {})
+  def run_binary(command)
     Process::fork do
-      command = params.each_with_object 'bin/splot' do |(k,v), str|
-        str << " --#{k.to_s.gsub('_', '-')} #{v}"
-      end
+      command.insert 0, "RUBYLIB=#{File.expand_path('../../lib', __FILE__)}:$RUBYLIB bin/splot "
       $stdout.reopen File.open("/dev/null", "w+")
       $stderr.reopen File.open("/dev/null", "w+")
-      command.insert 0, "RUBYLIB=#{File.expand_path('../../lib', __FILE__)}:$RUBYLIB "
       exec command
     end
     Process::wait

data/test/test_helper.rb

@@ -11,3 +11,26 @@ require 'stringio'
 require 'splot'
 
 Minitest::Reporters.use! MiniTest::Reporters::DefaultReporter.new
+
+class Minitest::Test
+  private
+
+  def mock_files_existing(*files)
+    File.singleton_class.class_eval <<-CLASS_EVAL, __FILE__, __LINE__
+    alias_method :size_orig?, :size?
+
+    def size?(file)                      # def size?(file)
+      #{files.inspect}.include?(file)    #   ["fileA", "my/fileB"].include?(file)
+    end                                  # end
+    CLASS_EVAL
+
+    begin
+      yield
+    ensure
+      File.singleton_class.class_eval <<-CLASS_EVAL, __FILE__, __LINE__
+      alias_method :size?, :size_orig?
+      undef :size_orig?
+      CLASS_EVAL
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: splot
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - ntl
@@ -122,6 +122,7 @@ files:
 - test/fixtures/config_example_rc
 - test/fixtures/fake_test_helper.rb
 - test/fixtures/test_unit_example_test.rb
+- test/runner_test.rb
 - test/splot_test.rb
 - test/test_helper.rb
 - tmp/.gitkeep
@@ -155,5 +156,6 @@ test_files:
 - test/fixtures/config_example_rc
 - test/fixtures/fake_test_helper.rb
 - test/fixtures/test_unit_example_test.rb
+- test/runner_test.rb
 - test/splot_test.rb
 - test/test_helper.rb