slather 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8060102a85e060f09791423c1b509c567f9f591b9d74876fb569dd39ff0cad0
-  data.tar.gz: a329264218fd8df751c96c3ff91fa8f12d56a3f1c832ed5d9f8e9c18089a5ffe
+  metadata.gz: 05adf16363e34b66c94cd7429e974358c3db5ec6da5e793ff5153a9502e44748
+  data.tar.gz: 6427c7163b3d175f79c9c4b02f192254081932787a9ac81c4b3ea5bd012112c6
 SHA512:
-  metadata.gz: 685c7f692735063e4840e858a2c71c27298a25c066f1e503758cf89ba6e9d1b8e4a255f168e5633c8a51e91de4832927d82ebba4d2564176304830cfc56050b3
-  data.tar.gz: 453a3c0a5623c9a8feb4b28d9a73c47cbfaa6e5cb954ec33efb5eafab109ec8e46308d83186a9290ab3433306cac9f68e28c6899b54dba29b0c8823827d30ca3
+  metadata.gz: d95ef950d4cdc027a1b2f3bc961523d5e58d86014a1595c9cee9a47cbd7ab6ff025952080aa443f0c790b4df9dc1289aa8ec053c71c42a906ced810f29da53a2
+  data.tar.gz: 5504fd56de51e429d949652da30fc5ac5684a6ad6edc2f4964effc90d6f824e83a6584f0e66f866bc81ab927c9c50e8c21fbdee70780d48473c1c4302818b443

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v2.8.1
+
+* cobertura.sourceforge.net should use https instead of http
+  [jarrodlombardo-EventBase](https://github.com/jarrodlombardo-EventBase)
+  [#559](https://github.com/SlatherOrg/slather/pull/559)
+
+* Handle include globs
+  [dnedrow](https://github.com/dnedrow)
+  [#553](https://github.com/SlatherOrg/slather/pull/553)
+
 ## v2.8.0
 
 * Add `--ymlfile` option to override `.slather.yml`

data/README.md

@@ -88,7 +88,20 @@ Run this command to enable the `Generate Test Coverage` and `Instrument Program
 ```sh
 $ slather setup path/to/project.xcodeproj
 ```
+## General Usage Notes
+### Commandline Arguments Win
+When using both a config file (`.slather.yml`) and providing arguments via the commandline,
+the arguments will take precedence over the matching setting in the config file.
 
+### `ignore` always wins over `source-files`
+When defining both files that should be ignored (`--ignore`, ignore) and source files to include (`--source-files`, source_files),
+the ignore list is checked first. If the file being scanned matches a glob in the ignore list, it will not be included. In this case, the
+source_file list is not checked.
+
+If the file being scanned is not in the ignore list, and source_file has been defined, the source_file list is
+checked. If the source file matches a glob, it will be included.
+
+## CI Integration
 ### Usage with Codecov
 
 Login to [Codecov](https://codecov.io/) (no need to activate a repository, this happens automatically). Right now, `slather` supports Codecov via **all** supported CI providers [listed here](https://github.com/codecov/codecov-bash#ci-providers).

data/lib/slather/coverage_info.rb

@@ -80,5 +80,11 @@ module Slather
       end
     end
 
+    def include_file?
+      project.source_files.any? do |include|
+        File.fnmatch(include, source_file_pathname_relative_to_repo_root)
+      end
+    end
+
   end
 end

data/lib/slather/coverage_service/cobertura_xml_output.rb

@@ -171,7 +171,7 @@ module Slather
           xml.doc.create_internal_subset(
             'coverage',
             nil,
-            "http://cobertura.sourceforge.net/xml/coverage-04.dtd"
+            "https://cobertura.sourceforge.net/xml/coverage-04.dtd"
           )
           xml.coverage do
             xml.sources do

data/lib/slather/profdata_coverage_file.rb

@@ -246,16 +246,15 @@ module Slather
     private :supported_file_extensions
 
     def ignored?
-      # This indicates a llvm-cov coverage warning (occurs if a passed in source file 
-      # is not covered or with ccache in some cases).
-      ignore = source_file_pathname.to_s.end_with? "isn't covered."
+      path = source_file_pathname.to_s
 
-      if !ignore
-        # Ignore source files inside of platform SDKs
-        ignore = (/Xcode.*\.app\/Contents\/Developer\/Platforms/ =~ source_file_pathname.to_s) != nil
-      end
+      # This indicates a llvm-cov coverage warning (occurs if a passed in source file
+      # is not covered or with cache in some cases).
+      return true if path.end_with?("isn't covered.")
+      # Ignore source files inside of platform SDKs
+      return true if path.include?("/Xcode.*\.app\/Contents\/Developer\/Platforms")
 
-      ignore ? ignore : super
+      super
     end
   end
 end

data/lib/slather/project.rb

@@ -185,7 +185,7 @@ module Slather
         if paths_to_segments.key?(coverage_file.source_file_pathname)
           coverage_file.segments = paths_to_segments[coverage_file.source_file_pathname]
         end
-        !coverage_file.ignored? ? coverage_file : nil
+        !coverage_file.ignored? && coverage_file.include_file? ? coverage_file : nil
       end.compact
     end
     private :create_coverage_files
@@ -341,6 +341,7 @@ module Slather
         configure_arch
         configure_binary_file
         configure_decimals
+        configure_source_files
 
         self.llvm_version = `xcrun llvm-cov --version`.match(/LLVM version ([\d\.]+)/).captures[0]
       rescue => e
@@ -380,6 +381,10 @@ module Slather
       self.ignore_list ||= [(self.class.yml["ignore"] || [])].flatten
     end
 
+    def configure_source_files
+      self.source_files ||= [(self.class.yml["source_files"] || [])].flatten
+    end
+
     def configure_ci_service
       self.ci_service ||= (ENV["CI_SERVICE"] || self.class.yml["ci_service"] || :other)
     end

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.8.0' unless defined?(Slather::VERSION)
+  VERSION = '2.8.1' unless defined?(Slather::VERSION)
 end

data/spec/fixtures/cobertura.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
+<!DOCTYPE coverage SYSTEM "https://cobertura.sourceforge.net/xml/coverage-04.dtd">
 <coverage line-rate="0.7500000000000000" branch-rate="0.6410256410256411" lines-covered="60" lines-valid="80" branches-covered="25" branches-valid="39" complexity="0.0" timestamp="1614041230" version="Slather 2.6.1">
   <sources>
     <source>/Users/hborawski/sandbox/slather</source>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Mark Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-12 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects