xcov 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2fbf38638743436f19f20c895047c07af963e5
-  data.tar.gz: 611fa1e2c51729ae7a96f40c92bf259609cc1a90
+  metadata.gz: 91702d34b310b64ac9b161ffdc46a375d514e164
+  data.tar.gz: 07e3acb2b8fbd7cb674c94acb7ee258655f8322b
 SHA512:
-  metadata.gz: 57198ae9212ebdead54ddad4217af75e2f2e8a64211ec937cda182c685b2881e9fe96ee416c381983f7bac6c6a26f9f7e1958ea241fcb926a5226cc39f431ed1
-  data.tar.gz: d68831b7fcf3b8b08b48f93ff8ba4656da14f10e05abbd1146dc7b08abd03dd936a43f56894dc3a80f43962e7c9e07795d78adc5f819a503a2b524ebda3d667a
+  metadata.gz: d44ad849fd3de7ba246fbdd35b594b958dcb46b622f11365ac2d8b271db7a095bd67af9aae64141dd5920be75b3b5f04304627bf92c7e1d66c650463e62ce733
+  data.tar.gz: 9d1a384c93f4fb49078a7d7775a818556350b18de2fb76b5ca1344b6e19fcb530e8f3434fb5d72bcb51e96afb84b4f3276af77f14070e3c41e94945abb12f0ec

data/README.md

@@ -48,12 +48,13 @@ xcov -w LystSDK.xcworkspace -s LystSDK -o xcov_output
 * `--minimum_coverage_percentage` `-m`: Raise exception if overall coverage percentage is under this value (ie. 75).
 * `--include_test_targets`: Enables coverage reports for `.xctest` targets.
 * `--ignore_file_path` `-x`: Relative or absolute path to the file containing the list of ignored files.
+* `--exclude_targets`: Comma separated list of targets to exclude from coverage report.
 * `--slack_url` `-i`: Incoming WebHook for your Slack group to post results (optional).
 * `--slack_channel` `-e`: Slack channel where the results will be posted (optional).
 * `--skip_slack`: Add this flag to avoid publishing results on Slack (optional).
 
 ### Ignoring files
-You can easily ignore the coverage for a specified set of files by adding their filenames to the *ignore file* specified with the `--ignore_file_path` parameter (this file is `.xcovignore` by default).
+You can easily ignore the coverage for a specified set of files by adding their filenames to the *ignore file* specified with the `--ignore_file_path` parameter (this file is `.xcovignore` by default). You can also specify a wildcard expression for matching a group of files.
 
 Each one of the filenames you would like to ignore must be prefixed by the dash symbol `-`. In addition you can comment lines by prefixing them by `#`. Example:
 
@@ -69,9 +70,12 @@ Each one of the filenames you would like to ignore must be prefixed by the dash
 
 # Utils
 - LSTStateMachine.swift
+
+# Exclude all files ending by "View.swift"
+- .*View.swift
 ```
 
-### [Fastlane](https://github.com/fastlane/fastlane/blob/master/docs/Actions.md)
+### [Fastlane](https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Actions.md)
 *Fastlane 1.61.0* includes *xcov* as a custom action. You can easily create your coverage reports as follows:
 ```ruby
 xcov(
@@ -83,6 +87,10 @@ xcov(
 
 ## Changelog
 
+### v.0.7
+* Ignore file allows wildcards for matching a group of files (by **stevenreinisch**)
+* New `exclude_targets` option to exclude reporting for the targets given (by **stevenreinisch**)
+
 ### v.0.6
 * Ignored coverage for a specified list of files
 
@@ -104,6 +112,7 @@ xcov(
 
 * [nakiostudio](https://github.com/nakiostudio)
 * [opfeffer](https://github.com/opfeffer)
+* [stevenreinisch](https://github.com/stevenreinisch)
 
 ## License
 This project is licensed under the terms of the MIT license. See the LICENSE file.

data/lib/xcov.rb

@@ -17,7 +17,7 @@ module Xcov
   class << self
 
     attr_accessor :config
-    attr_accessor :ignore_list
+    attr_accessor :ignore_handler
     attr_accessor :project
 
     def project=(value)

data/lib/xcov/commands_generator.rb

@@ -11,7 +11,10 @@ module Xcov
     FastlaneCore::CommanderGenerator.new.generate(Xcov::Options.available_options)
 
     def self.start
+      FastlaneCore::UpdateChecker.start_looking_for_update("xcov")
       new.run
+     ensure
+       FastlaneCore::UpdateChecker.show_update_status("xcov", Xcov::VERSION)
     end
 
     def convert_options(options)

data/lib/xcov/ignore_handler.rb

@@ -2,7 +2,23 @@
 module Xcov
   class IgnoreHandler
 
-    def read_ignore_file
+    attr_accessor :list
+
+    def initialize
+      @list = IgnoreHandler.read_ignore_file
+    end
+
+    def should_ignore_file filename
+      return false if @list.empty?
+      return true if @list.include?(filename)
+
+      # Evaluate possible regexs
+      return @list.any? { |pattern| filename =~ Regexp.new("#{pattern}$") }
+    end
+
+    # Static methods
+
+    def self.read_ignore_file
       require "yaml"
       ignore_file_path = Xcov.config[:ignore_file_path]
       ignore_list = []
@@ -12,7 +28,7 @@ module Xcov
         Helper.log.info "Skipping file blacklisting as no ignore file was found at path #{ignore_file_path}".yellow
       end
 
-      ignore_list
+      return ignore_list
     end
 
   end

data/lib/xcov/manager.rb

@@ -11,8 +11,8 @@ module Xcov
       FastlaneCore::Project.detect_projects(options)
       Xcov.project = FastlaneCore::Project.new(options)
 
-      # Set ignored files list
-      Xcov.ignore_list = IgnoreHandler.new.read_ignore_file
+      # Set ignored files handler
+      Xcov.ignore_handler = IgnoreHandler.new
 
       # Print summary
       FastlaneCore::PrintTable.print_values(config: options, hide_keys: [:slack_url], title: "Summary for xcov #{Xcov::VERSION}")

data/lib/xcov/model/report.rb

@@ -17,7 +17,7 @@ module Xcov
 
     def average_coverage targets
       return 0 if targets.count == 0
-      
+
       coverage = 0
       targets.each do |target|
         coverage = coverage + target.coverage
@@ -44,10 +44,7 @@ module Xcov
     # Class methods
 
     def self.map dictionary
-      targets = dictionary["targets"].select { |target| !target["name"].include?(".xctest") }
-
-      # Don't filter test targets if the flag is set
-      targets = dictionary["targets"] if Xcov.config[:include_test_targets]
+      targets = Report.filter_targets dictionary["targets"]
 
       # Create target objects
       targets = targets.map { |target| Target.map(target)}
@@ -55,5 +52,23 @@ module Xcov
       Report.new(targets)
     end
 
+    def self.filter_targets targets
+      filtered_targets = Array.new(targets)
+      filtered_targets = filtered_targets.select { |target| !target["name"].include?(".xctest") } if !Xcov.config[:include_test_targets]
+      filtered_targets = filtered_targets.select { |target| !self.excluded_targets.include?(target["name"])}
+
+      filtered_targets
+    end
+
+    def self.excluded_targets
+      excluded_targets = Array.new()
+
+      if Xcov.config[:exclude_targets]
+        excluded_targets = Xcov.config[:exclude_targets].split(/\s*,\s*/)
+      end
+
+      excluded_targets
+    end
+
   end
 end

data/lib/xcov/model/source.rb

@@ -14,7 +14,7 @@ module Xcov
       @name = CGI::escapeHTML(name)
       @coverage = coverage
       @functions = functions
-      @ignored = Xcov.ignore_list.include?(name)
+      @ignored = Xcov.ignore_handler.should_ignore_file(name)
       @displayable_coverage = self.create_displayable_coverage
       @coverage_color = self.create_coverage_color
       @id = Source.create_id(name)

data/lib/xcov/options.rb

@@ -77,7 +77,10 @@ module Xcov
         FastlaneCore::ConfigItem.new(key: :skip_slack,
                                      description: "Don't publish to slack, even when an URL is given",
                                      is_string: false,
-                                     default_value: false)
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :exclude_targets,
+                                     optional: true,
+                                     description: "Comma separated list of targets to exclude from coverage report")
       ]
     end
 

data/lib/xcov/version.rb

@@ -1,6 +1,6 @@
 module Xcov
 
-  VERSION = "0.6"
+  VERSION = "0.7"
   DESCRIPTION = "xcov is a friendly visualizer for Xcode's code coverage files"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcov
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Carlos Vidal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core