simplecov 0.13.0 → 0.17.1

data/lib/simplecov/source_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleCov
   #
   # Representation of a source file including it's coverage data, source code,
@@ -80,6 +82,11 @@ module SimpleCov
       @coverage = coverage
     end
 
+    # The path to this source file relative to the projects directory
+    def project_filename
+      @filename.sub(Regexp.new("^#{Regexp.escape(SimpleCov.root)}"), "")
+    end
+
     # The source code for this file. Aliased as :source
     def src
       # We intentionally read source code lazily to
@@ -91,22 +98,24 @@ module SimpleCov
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,
     # and thus including coverage data. Aliased as :source_lines
     def lines
-      return @lines if defined? @lines
+      @lines ||= build_lines
+    end
+    alias source_lines lines
 
-      # Warning to identify condition from Issue #56
-      if coverage.size > src.size
-        $stderr.puts "Warning: coverage data provided by Coverage [#{coverage.size}] exceeds number of lines in #{filename} [#{src.size}]"
-      end
+    def build_lines
+      coverage_exceeding_source_warn if coverage.size > src.size
 
-      # Initialize lines
-      @lines = []
-      src.each_with_index do |src, i|
-        @lines << SimpleCov::SourceFile::Line.new(src, i + 1, coverage[i])
+      lines = src.map.with_index(1) do |src, i|
+        SimpleCov::SourceFile::Line.new(src, i, coverage[i - 1])
       end
-      process_skipped_lines!
-      @lines
+
+      process_skipped_lines(lines)
+    end
+
+    # Warning to identify condition from Issue #56
+    def coverage_exceeding_source_warn
+      $stderr.puts "Warning: coverage data provided by Coverage [#{coverage.size}] exceeds number of lines in #{filename} [#{src.size}]"
     end
-    alias source_lines lines
 
     # Access SimpleCov::SourceFile::Line source lines by line number
     def line(number)
@@ -115,31 +124,29 @@ module SimpleCov
 
     # The coverage for this file in percent. 0 if the file has no relevant lines
     def covered_percent
-      return 100.0 if lines.length.zero? || lines.length == never_lines.count
-      relevant_lines = lines.count - never_lines.count - skipped_lines.count
-      if relevant_lines.zero?
-        0.0
-      else
-        Float(covered_lines.count * 100.0 / relevant_lines.to_f)
-      end
+      return 100.0 if no_lines?
+
+      return 0.0 if relevant_lines.zero?
+
+      Float(covered_lines.size * 100.0 / relevant_lines.to_f)
     end
 
     def covered_strength
-      return 0.0 if lines.length.zero? || lines.length == never_lines.count
+      return 0.0 if relevant_lines.zero?
 
-      lines_strength = 0
-      lines.each do |c|
-        lines_strength += c.coverage if c.coverage
-      end
+      round_float(lines_strength / relevant_lines.to_f, 1)
+    end
+
+    def no_lines?
+      lines.length.zero? || (lines.length == never_lines.size)
+    end
 
-      effective_lines_count = Float(lines.count - never_lines.count - skipped_lines.count)
+    def lines_strength
+      lines.map(&:coverage).compact.reduce(:+)
+    end
 
-      if effective_lines_count.zero?
-        0.0
-      else
-        strength = lines_strength / effective_lines_count
-        round_float(strength, 1)
-      end
+    def relevant_lines
+      lines.size - never_lines.size - skipped_lines.size
     end
 
     # Returns all covered lines as SimpleCov::SourceFile::Line
@@ -166,16 +173,18 @@ module SimpleCov
 
     # Returns the number of relevant lines (covered + missed)
     def lines_of_code
-      covered_lines.count + missed_lines.count
+      covered_lines.size + missed_lines.size
     end
 
     # Will go through all source files and mark lines that are wrapped within # :nocov: comment blocks
     # as skipped.
-    def process_skipped_lines!
+    def process_skipped_lines(lines)
       skipping = false
+
       lines.each do |line|
-        if line.src =~ /^([\s]*)#([\s]*)(\:#{SimpleCov.nocov_token}\:)/
+        if SimpleCov::LinesClassifier.no_cov_line?(line.src)
           skipping = !skipping
+          line.skipped!
         elsif skipping
           line.skipped!
         end

data/lib/simplecov/version.rb

@@ -1,25 +1,5 @@
-module SimpleCov
-  version = "0.13.0"
-
-  def version.to_a
-    split(".").map(&:to_i)
-  end
-
-  def version.major
-    to_a[0]
-  end
-
-  def version.minor
-    to_a[1]
-  end
+# frozen_string_literal: true
 
-  def version.patch
-    to_a[2]
-  end
-
-  def version.pre
-    to_a[3]
-  end
-
-  VERSION = version
+module SimpleCov
+  VERSION = "0.17.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -50,28 +50,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: phantomjs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 description: Code coverage for Ruby 1.9+ with a powerful configuration library and
   automatic merging of coverage across test suites
 email:
@@ -80,55 +192,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
-- MIT-LICENSE
+- ISSUE_TEMPLATE.md
+- LICENSE
 - README.md
-- Rakefile
-- cucumber.yml
 - doc/alternate-formatters.md
 - doc/commercial-services.md
 - doc/editor-integration.md
-- features/config_autoload.feature
-- features/config_command_name.feature
-- features/config_coverage_dir.feature
-- features/config_deactivate_merging.feature
-- features/config_formatters.feature
-- features/config_merge_timeout.feature
-- features/config_nocov_token.feature
-- features/config_profiles.feature
-- features/config_project_name.feature
-- features/config_styles.feature
-- features/config_tracked_files.feature
-- features/cucumber_basic.feature
-- features/maximum_coverage_drop.feature
-- features/merging_test_unit_and_rspec.feature
-- features/minimum_coverage.feature
-- features/refuse_coverage_drop.feature
-- features/rspec_basic.feature
-- features/rspec_fails_on_initialization.feature
-- features/rspec_groups_and_filters_basic.feature
-- features/rspec_groups_and_filters_complex.feature
-- features/rspec_groups_using_filter_class.feature
-- features/rspec_without_simplecov.feature
-- features/skipping_code_blocks_manually.feature
-- features/step_definitions/html_steps.rb
-- features/step_definitions/simplecov_steps.rb
-- features/step_definitions/transformers.rb
-- features/step_definitions/web_steps.rb
-- features/support/env.rb
-- features/test_unit_basic.feature
-- features/test_unit_groups_and_filters_basic.feature
-- features/test_unit_groups_and_filters_complex.feature
-- features/test_unit_groups_using_filter_class.feature
-- features/test_unit_without_simplecov.feature
-- features/unicode_compatiblity.feature
 - lib/simplecov.rb
 - lib/simplecov/command_guesser.rb
 - lib/simplecov/configuration.rb
@@ -141,60 +212,22 @@ files:
 - lib/simplecov/formatter/simple_formatter.rb
 - lib/simplecov/jruby_fix.rb
 - lib/simplecov/last_run.rb
-- lib/simplecov/merge_helpers.rb
+- lib/simplecov/lines_classifier.rb
+- lib/simplecov/load_global_config.rb
 - lib/simplecov/no_defaults.rb
 - lib/simplecov/profiles.rb
+- lib/simplecov/profiles/bundler_filter.rb
+- lib/simplecov/profiles/hidden_filter.rb
+- lib/simplecov/profiles/rails.rb
+- lib/simplecov/profiles/root_filter.rb
+- lib/simplecov/profiles/test_frameworks.rb
 - lib/simplecov/railtie.rb
 - lib/simplecov/railties/tasks.rake
+- lib/simplecov/raw_coverage.rb
 - lib/simplecov/result.rb
 - lib/simplecov/result_merger.rb
 - lib/simplecov/source_file.rb
 - lib/simplecov/version.rb
-- simplecov.gemspec
-- spec/1_8_fallbacks_spec.rb
-- spec/command_guesser_spec.rb
-- spec/deleted_source_spec.rb
-- spec/faked_project/Gemfile
-- spec/faked_project/Rakefile
-- spec/faked_project/cucumber.yml
-- spec/faked_project/features/step_definitions/my_steps.rb
-- spec/faked_project/features/support/env.rb
-- spec/faked_project/features/test_stuff.feature
-- spec/faked_project/lib/faked_project.rb
-- spec/faked_project/lib/faked_project/framework_specific.rb
-- spec/faked_project/lib/faked_project/meta_magic.rb
-- spec/faked_project/lib/faked_project/some_class.rb
-- spec/faked_project/lib/faked_project/untested_class.rb
-- spec/faked_project/spec/faked_spec.rb
-- spec/faked_project/spec/forking_spec.rb
-- spec/faked_project/spec/meta_magic_spec.rb
-- spec/faked_project/spec/some_class_spec.rb
-- spec/faked_project/spec/spec_helper.rb
-- spec/faked_project/test/faked_test.rb
-- spec/faked_project/test/meta_magic_test.rb
-- spec/faked_project/test/some_class_test.rb
-- spec/faked_project/test/test_helper.rb
-- spec/file_list_spec.rb
-- spec/filters_spec.rb
-- spec/fixtures/app/controllers/sample_controller.rb
-- spec/fixtures/app/models/user.rb
-- spec/fixtures/deleted_source_sample.rb
-- spec/fixtures/frameworks/rspec_bad.rb
-- spec/fixtures/frameworks/rspec_good.rb
-- spec/fixtures/frameworks/testunit_bad.rb
-- spec/fixtures/frameworks/testunit_good.rb
-- spec/fixtures/iso-8859.rb
-- spec/fixtures/resultset1.rb
-- spec/fixtures/resultset2.rb
-- spec/fixtures/sample.rb
-- spec/fixtures/utf-8.rb
-- spec/helper.rb
-- spec/merge_helpers_spec.rb
-- spec/multi_formatter_spec.rb
-- spec/result_spec.rb
-- spec/return_codes_spec.rb
-- spec/source_file_line_spec.rb
-- spec/source_file_spec.rb
 homepage: http://github.com/colszowka/simplecov
 licenses:
 - MIT
@@ -214,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Code coverage for Ruby 1.9+ with a powerful configuration library and automatic