Introducing coverage format auto-detection based on Xcode version

* Change "--input-format" option of "slather setup" to "--format", more appropriate name in the context of setup
* Supporting auto for `slather setup --format` and `slather coverage --input-format` which will use profdata if Xcode 7, gcov if earlier
* Checking the validity of the parameters given to `--format` / `--input-format`

Author: AliSoftware

bin/slather

@@ -120,16 +120,15 @@ Clamp do
 
     parameter "[xcodeproj]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
 
-    option ["--input-format"], "INPUT_FORMAT", "Input format (gcov, profdata)"
+    option ["--format"], "FORMAT", "Type of coverage to use (gcov, clang, auto)"
 
     def execute
       xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml["xcodeproj"]
       unless xcodeproj_path_to_open
         raise StandardError, "Must provide an xcodeproj through .slather.yml"
       end
       project = Slather::Project.open(xcodeproj_path_to_open)
-      project.input_format = input_format
-      project.setup_for_coverage
+      project.setup_for_coverage(format ? format.to_sym : :auto)
       project.save
     end
 

lib/slather.rb

@@ -19,4 +19,10 @@ def self.prepare_pods(pods)
     Pod::UI.warn("[Slather] prepare_pods is now deprecated. The call to prepare_pods in your Podfile can simply be ommitted.")
   end
 
+  def self.xcode_version
+    xcode_path = `xcode-select -p`.strip
+    xcode_version = `mdls -name kMDItemVersion -raw #{xcode_path.shellescape}/../..`.strip
+    xcode_version.split('.').map(&:to_i)
+  end
+
 end

lib/slather/project.rb

@@ -5,20 +5,28 @@
 require 'shellwords'
 
 module Xcodeproj
+
   class Project
 
-    def slather_setup_for_coverage(input_format = "gcov")
+    def slather_setup_for_coverage(format = :auto)
+      unless [:gcov, :clang, :auto].include?(format)
+        raise StandardError, "Only supported formats for setup are gcov, clang or auto"
+      end
+      if format == :auto
+        format = Slather.xcode_version[0] < 7 ? :gcov : :clang
+      end
+
       build_configurations.each do |build_configuration|
-        build_configuration.build_settings["GCC_INSTRUMENT_PROGRAM_FLOW_ARCS"] = "YES"
-        if input_format == "profdata"
+        if format == :clang
           build_configuration.build_settings["CLANG_ENABLE_CODE_COVERAGE"] = "YES"
         else
+          build_configuration.build_settings["GCC_INSTRUMENT_PROGRAM_FLOW_ARCS"] = "YES"
           build_configuration.build_settings["GCC_GENERATE_TEST_COVERAGE_FILES"] = "YES"
         end
       end
 
       # Patch xcschemes too
-      if input_format == "profdata"
+      if format == :clang
         if Gem::Requirement.new('~> 0.27') =~ Gem::Version.new(Xcodeproj::VERSION)
           # @todo This will require to bump the xcodeproj dependency to ~> 0.27
           # (which would require to bump cocoapods too)
@@ -44,9 +52,7 @@ class Project < Xcodeproj::Project
 
     attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service, :coverage_access_token, :source_directory, :output_directory, :xcodeproj, :show_html, :input_format, :scheme
 
-    def setup_for_coverage
-      slather_setup_for_coverage(self.input_format)
-    end
+    alias_method :setup_for_coverage, :slather_setup_for_coverage
 
     def self.open(xcodeproj)
       proj = super
@@ -226,5 +232,17 @@ def coverage_service=(service)
       end
       @coverage_service = service
     end
+
+    def input_format=(format)
+      format ||= "auto"
+      unless %w(gcov profdata auto).include?(format)
+        raise StandardError, "Only supported input formats are gcov, profdata or auto"
+      end
+      if format == "auto"
+        @input_format = Slather.xcode_version[0] < 7 ? "gcov" : "profdata"
+      else
+        @input_format = format
+      end
+    end
   end
 end