solargraph_test_coverage 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 663088457d9de39c37ee21f06b2bd16be5a983025af2909f55acfa1d432be0f4
-  data.tar.gz: adc3da11d72363b2c1d3ca4a8db307609b34090d9bdf24643a411e47e0a8be09
+  metadata.gz: afacac1a6d557ea7ef39c86081fc7f3aafcb7e09c3a8243679e9d252ba47a2c7
+  data.tar.gz: 9e929da5ff5873ef3c044edebb4a96575cb47f4bfb9b2d36121082257ac03569
 SHA512:
-  metadata.gz: f3407c7390c65e09f14c8f872455317ef28e8dfc30592554d9087d5bf1fb34e30b802077b7098dd1adc7c1a2082ce29c37b999a358654a929c614d6952e376b4
-  data.tar.gz: 7c252dc55695be04bdfed84d654d3d1ab41143c4d7cd606488f5cdd56365bea3eee8968f8674d1aa4e1d38e254ece0170dd3f6567752bf46e6fe4451da783f8e
+  metadata.gz: 58b77e64736847a4d5d6fedb3c67f7b76e6af6056e844926356269c052b8bfe5f29af0c1f76e916f2e26d1ddb5c5628d3d324f53c890ceeff55f289959409b8c
+  data.tar.gz: 92e5f351f941d99103339f80fb05450e1393cb5929f584cd7d080759450f9cd31422a71d51ba847664b1217b88c761f1f132f346f280106580c8c806ba1c6bd9

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    solargraph_test_coverage (0.2.0)
+    solargraph_test_coverage (0.2.3)
       solargraph (~> 0.40, > 0.40)
 
 GEM

data/README.md

@@ -9,8 +9,6 @@ Currently there are four different diagnostics:
 - Spec cannot be found (Error message will be on line 1)
 
 
-Currently expects RSpec/Rails.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -41,6 +39,7 @@ test_coverage:
   - test_missing
   exclude_paths:
   - 'app/controller'
+  - 'concerns'
 ```
 
 

data/lib/solargraph_test_coverage/config.rb

@@ -15,7 +15,8 @@ module SolargraphTestCoverage
           'test_missing'
         ],
         'exclude_paths' => [             # don't attempt to find/run a spec for files that match these paths
-          'app/controller'
+          'app/controller',
+          'concerns'
         ]
       }.freeze
 

data/lib/solargraph_test_coverage/helpers.rb

@@ -1,51 +1,27 @@
 # frozen_string_literal: true
 
 module SolargraphTestCoverage
+  # Some helper functions for the diagnostics
   module Helpers
-    #
-    # Determines if a file should be excluded from running diagnostics
-    #
     # @return [Boolean]
-    #
     def exclude_file?(source_filename)
-      return true if source_filename.start_with? File.join(Dir.pwd, Config.test_dir)
+      return true if source_filename.start_with? Helpers.test_path
 
       Config.exclude_paths.each { |path| return true if source_filename.sub(Dir.pwd, '').include? path }
 
       false
     end
 
-    #
-    # Attempts to find the corresponding unit test file
-    #
     # @return [String]
-    #
     def test_file(source)
-      @test_file ||= begin
-        relative_filepath = source.location.filename.sub(Dir.pwd, '').split('/').reject(&:empty?)
-        relative_filepath[0] = Config.test_dir
-
-        File.join(Dir.pwd, relative_filepath.join('/'))
-            .sub('.rb', Config.test_file_suffix)
-      end
-    end
+      relative_filepath = source.location.filename.sub(Dir.pwd, '').split('/').reject(&:empty?)
+      relative_filepath[0] = Config.test_dir
 
-    #
-    # Memoized wrapper for #run_test
-    #
-    # @return [Hash]
-    #
-    def results(source)
-      @results ||= run_test(source)
+      File.join(Dir.pwd, relative_filepath.join('/'))
+          .sub('.rb', Config.test_file_suffix)
     end
 
-    #
-    # Runs RSpec on test file in a child process
-    # Returns coverage results for current working file
-    # RSpec::Core::Runner.run will return 0 if the test file passes, and 1 if it does not.
-    #
     # @return [Hash]
-    #
     def run_test(source)
       ForkProcess.run do
         Coverage.start(lines: true, branches: true)
@@ -54,7 +30,6 @@ module SolargraphTestCoverage
       end
     end
 
-    #
     # Adapted from SingleCov
     # Coverage returns nil for untestable lines (like do, end, if keywords)
     # otherwise returns int showing how many times a line was called
@@ -64,28 +39,24 @@ module SolargraphTestCoverage
     # @return [Array]
     #
     def uncovered_lines(results)
-      results.fetch(:lines)
-             .each_with_index
-             .select { |c, _| c == 0 }
-             .map { |_, i| i }
-             .compact
+      return [] unless results[:lines]
+
+      results[:lines].each_with_index
+                     .select { |c, _| c&.zero? }
+                     .map { |_, i| i }
+                     .compact
     end
 
-    #
-    # Builds a new Branch object for each branch tested from results hash
-    # Then removes branches which have test coverage
-    #
     # @return [Array]
-    #
     def uncovered_branches(results)
       Branch.build_from(results).reject(&:covered?)
     end
 
-    #
-    # requires the specified testing framework
-    #
-    # @return [Boolean]
-    #
+    # @return [Hash]
+    def range(start_line, start_column, end_line, end_column)
+      Solargraph::Range.from_to(start_line, start_column, end_line, end_column).to_hash
+    end
+
     def self.require_testing_framework!
       case Config.test_framework
       when 'rspec'
@@ -97,7 +68,6 @@ module SolargraphTestCoverage
       end
     end
 
-    #
     # Only called once, when gem is loaded
     # Preloads rails via spec/rails_helper if Rails isn't already defined
     # This gives us a nice speed-boost when running test in child process
@@ -112,18 +82,15 @@ module SolargraphTestCoverage
     # calling Coverage.result after requiring stops and resets it.
     #
     # This is a bit experimental - I'm not sure if there will be downstream side-effects
-    # from having Rails preloaded, but... we'll see :)
     #
     # @return [Boolean]
     #
     def self.preload_rails!
-      return if defined?(Rails)
-      return unless File.file?('spec/rails_helper.rb')
+      return if defined?(Rails) || !File.file?('spec/rails_helper.rb')
 
-      spec_path = File.join(Dir.pwd, 'spec')
-      $LOAD_PATH.unshift(spec_path) unless $LOAD_PATH.include?(spec_path)
+      $LOAD_PATH.unshift(test_path) unless $LOAD_PATH.include?(test_path)
 
-      require File.expand_path('spec/rails_helper')
+      require File.join(test_path, 'rails_helper')
       Coverage.result(stop: true, clear: true) if Coverage.running?
 
       true
@@ -133,5 +100,10 @@ module SolargraphTestCoverage
 
       false
     end
+
+    # @return [String]
+    def self.test_path
+      File.join(Dir.pwd, Config.test_dir)
+    end
   end
 end

data/lib/solargraph_test_coverage/test_coverage_reporter.rb

@@ -5,65 +5,71 @@ module SolargraphTestCoverage
   class TestCoverageReporter < Solargraph::Diagnostics::Base
     include Helpers
 
-    #
     # LSP Diagnostic method
-    #
     # @return [Array]
     #
     def diagnose(source, _api_map)
       return [] if source.code.empty? || exclude_file?(source.location.filename)
       return [test_missing_error(source)] unless File.file?(test_file(source))
 
-      messages(source)
+      results = run_test(source)
+      messages(source, results)
     rescue ChildFailedError
       []
     end
 
     private
 
-    def messages(source)
+    # Compiles all diagnostic messages for source file
+    # @return [Array]
+    #
+    def messages(source, results)
       messages = [
-        line_warnings(source),
-        branch_warnings(source),
-        test_passing_error(source)
+        line_warnings(source, results),
+        branch_warnings(source, results),
+        test_passing_error(source, results)
       ]
 
       messages.flatten.compact
     end
 
-    def line_warnings(source)
-      uncovered_lines(results(source)).map { |line| line_coverage_warning(source, line) }
+    # Creates array of warnings for uncovered lines
+    # @return [Array]
+    #
+    def line_warnings(source, results)
+      uncovered_lines(results).map { |line| line_coverage_warning(source, line) }
     end
 
-    def branch_warnings(source)
-      uncovered_branches(results(source)).map { |branch| branch_coverage_warning(source, branch.report) }
+    # Creates array of warnings for uncovered branches
+    # @return [Array]
+    #
+    def branch_warnings(source, results)
+      uncovered_branches(results).map { |branch| branch_coverage_warning(source, branch.report) }
     end
 
-    def test_passing_error(source)
-      results(source)[:test_status] ? [] : [test_failing_error(source)]
+    # Creates array containing error for failing spec
+    # @return [Array]
+    #
+    def test_passing_error(source, results)
+      results[:test_status] ? [] : [test_failing_error(source)]
     end
 
-    #
     # Creates LSP warning message for missing line coverage
-    #
     # @return [Hash]
     #
     def line_coverage_warning(source, line)
       return unless Config.line_coverage?
 
       {
-        range: Solargraph::Range.from_to(line, 0, line, source.code.lines[line].length).to_hash,
+        range: range(line, 0, line, source.code.lines[line].length),
         severity: Solargraph::Diagnostics::Severities::WARNING,
         source: 'TestCoverage',
         message: 'Line is missing test coverage'
       }
     end
 
-    #
     # Creates LSP warning message for missing branch coverage
-    # We need to correct the line number (-1), since the coverage module
-    # starts counting lines at 1, while the LSP (source.code.line) is an array
-    # with an index starting at 0
+    # Line numbers are off by 1, since Branch Coverage starts counting at 1, not 0
     #
     # @return [Hash]
     #
@@ -71,24 +77,21 @@ module SolargraphTestCoverage
       return unless Config.branch_coverage?
 
       {
-        range: Solargraph::Range.from_to(report[:line] - 1, 0, report[:line] - 1,
-                                         source.code.lines[report[:line] - 1].length).to_hash,
+        range: range(report[:line] - 1, 0, report[:line] - 1, source.code.lines[report[:line] - 1].length),
         severity: Solargraph::Diagnostics::Severities::WARNING,
         source: 'TestCoverage',
         message: "'#{report[:type].upcase}' branch is missing test coverage"
       }
     end
 
-    #
-    # Creates LSP error message if test is failing
-    #
+    # Creates LSP error message if test file is failing
     # @return [Hash]
     #
     def test_failing_error(source)
       return unless Config.test_failing_coverage?
 
       {
-        range: Solargraph::Range.from_to(0, 0, 0, source.code.lines[0].length).to_hash,
+        range: range(0, 0, 0, source.code.lines[0].length),
         severity: Solargraph::Diagnostics::Severities::ERROR,
         source: 'TestCoverage',
         message: 'Unit Test is currently failing.'
@@ -104,7 +107,7 @@ module SolargraphTestCoverage
       return unless Config.test_missing_coverage?
 
       {
-        range: Solargraph::Range.from_to(0, 0, 0, source.code.lines[0].length).to_hash,
+        range: range(0, 0, 0, source.code.lines[0].length),
         severity: Solargraph::Diagnostics::Severities::ERROR,
         source: 'TestCoverage',
         message: "No unit test file found at #{test_file(source)}"

data/lib/solargraph_test_coverage/test_runner.rb

@@ -18,10 +18,14 @@ module SolargraphTestCoverage
     end
 
     def run!
-      @result = test_framework_runner.run([@test_file])
+      @result = test_framework_runner.run(test_options)
       self
     end
 
+    def test_options
+      raise NotImplementedError
+    end
+
     def passed?
       raise NotImplementedError
     end
@@ -33,6 +37,10 @@ module SolargraphTestCoverage
 
   # Test Runner Subclass for RSpec
   class RSpecRunner < TestRunner
+    def test_options
+      [@test_file, '-o', '/dev/null']
+    end
+
     def passed?
       @result&.zero?
     end
@@ -44,6 +52,10 @@ module SolargraphTestCoverage
 
   # Test Runner Subclass for Minitest
   class MinitestRunner < TestRunner
+    def test_options
+      [@test_file]
+    end
+
     def passed?
       @result
     end

data/lib/solargraph_test_coverage/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolargraphTestCoverage
-  VERSION = '0.2.0'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph_test_coverage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Cameron Kolkey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solargraph