cutz
diff --git a/‎.gitignore
+2-1 b/‎.gitignore
+2-1
diff --git a/‎.travis.yml
+1 b/‎.travis.yml
+1
diff --git a/‎Rakefile
+6 b/‎Rakefile
+6
diff --git a/‎bin/slather
+39-6 b/‎bin/slather
+39-6
diff --git a/‎lib/slather.rb
+9-1 b/‎lib/slather.rb
+9-1
diff --git a/‎lib/slather/coverage_file.rb
+37-90 b/‎lib/slather/coverage_file.rb
+37-90
@@ -23,7 +23,6 @@ mkmf.log
 
 # Xcode
 #
-build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -43,3 +42,5 @@ DerivedData
 cobertura.xml
 .gutter.json
 html
+*.gcda
+*.gcno
@@ -1,5 +1,6 @@
 language: objective-c
 script: bundle exec rspec 
+osx_image: xcode7
 
 # Sets Travis to run the Ruby specs on OS X machines which are required to
 # build the native extensions of Xcodeproj.
 
@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+desc 'Execute tests'
+task :spec do
+  sh 'bundle exec rspec spec'
+end
+
@@ -9,7 +9,7 @@ Clamp do
 
   subcommand "coverage", "Computes coverage for the supplied project" do
 
-    parameter "[xcodeproj]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
+    parameter "[PROJECT]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
 
     option ["--travis", "-t"], :flag, "Indicate that the builds are running on Travis CI"
     option ["--circleci"], :flag, "Indicate that the builds are running on CircleCI"
@@ -27,6 +27,11 @@ Clamp do
     option ["--source-directory"], "SOURCE_DIRECTORY", "The directory where your source files are located."
     option ["--output-directory"], "OUTPUT_DIRECTORY", "The directory where your Cobertura XML report will be written to."
     option ["--ignore", "-i"], "IGNORE", "ignore files conforming to a path", :multivalued => true
+    option ["--verbose", "-v"], :flag, "Enable verbose mode"
+
+    option ["--input-format"], "INPUT_FORMAT", "Input format (gcov, profdata)"
+    option ["--scheme"], "SCHEME", "The scheme for which the coverage was generated"
+    option ["--binary-file"], "BINARY_FILE", "The binary file against the which the coverage will be run"
 
     def execute
       puts "Slathering..."
@@ -37,6 +42,12 @@ Clamp do
       setup_source_directory
       setup_output_directory
       setup_coverage_service
+      setup_verbose_mode
+      setup_input_format
+      setup_scheme
+      setup_binary_file
+
+      project.configure
 
       post
 
@@ -81,7 +92,7 @@ Clamp do
         if xcodeproj_path_to_open
           project = Slather::Project.open(xcodeproj_path_to_open)
         else
-          raise StandardError, "Must provide an xcodeproj through .slather.yml"
+          raise StandardError, "Must provide an xcodeproj either via the 'slather [SUBCOMMAND] [PROJECT].xcodeproj' command or through .slather.yml"
         end
       end
     end
@@ -101,15 +112,37 @@ Clamp do
       end
     end
 
+    def setup_verbose_mode
+      project.verbose_mode = verbose?
+    end
+
+    def setup_input_format
+      project.input_format = input_format
+    end
+
+    def setup_scheme
+      project.scheme = scheme
+    end
+
+    def setup_binary_file
+      project.binary_file = binary_file
+    end
+
   end
 
-  subcommand "setup", "Configures an xcodeproj for test coverage generation" do
+  subcommand "setup", "Configures a .xcodeproj for test coverage generation" do
+
+    parameter "[PROJECT]", "Path to the .xcodeproj", :attribute_name => :xcodeproj_path
 
-    parameter "[xcodeproj]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
+    option ["--format"], "FORMAT", "Type of coverage to use (gcov, clang, auto)"
 
     def execute
-      project = Slather::Project.open(xcodeproj_path)
-      project.setup_for_coverage
+      xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml["xcodeproj"]
+      unless xcodeproj_path_to_open
+        raise StandardError, "Must provide a .xcodeproj either via the 'slather [SUBCOMMAND] [PROJECT].xcodeproj' command or through .slather.yml"
+      end
+      project = Slather::Project.open(xcodeproj_path_to_open)
+      project.setup_for_coverage(format ? format.to_sym : :auto)
       project.save
     end
 
 
@@ -1,7 +1,9 @@
 require 'slather/version'
 require 'slather/project'
+require 'slather/coverage_info'
 require 'slather/coverage_file'
-require 'slather/coveralls_coverage_file'
+require 'slather/coveralls_coverage'
+require 'slather/profdata_coverage_file'
 require 'slather/coverage_service/cobertura_xml_output'
 require 'slather/coverage_service/coveralls'
 require 'slather/coverage_service/hardcover'
@@ -17,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
@@ -1,6 +1,12 @@
+require 'slather/coverage_info'
+require 'slather/coveralls_coverage'
+
 module Slather
   class CoverageFile
 
+    include CoverageInfo
+    include CoverallsCoverage
+
     attr_accessor :project, :gcno_file_pathname
 
     def initialize(project, gcno_file_pathname)
@@ -11,7 +17,6 @@ def initialize(project, gcno_file_pathname)
     def source_file_pathname
       @source_file_pathname ||= begin
         base_filename = gcno_file_pathname.basename.sub_ext("")
-        # TODO: Handle Swift
         path = nil
         if project.source_directory
           path = Dir["#{project.source_directory}/**/#{base_filename}.{#{supported_file_extensions.join(",")}}"].first
@@ -36,10 +41,6 @@ def source_data
       source_file.read
     end
 
-    def source_file_pathname_relative_to_repo_root
-      source_file_pathname.realpath.relative_path_from(Pathname("./").realpath)
-    end
-
     def gcov_data
       @gcov_data ||= begin
         gcov_output = `gcov "#{source_file_pathname}" --object-directory "#{gcno_file_pathname.parent}" --branch-probabilities --branch-counts`
@@ -58,6 +59,24 @@ def gcov_data
       end
     end
 
+    def all_lines
+      unless cleaned_gcov_data.empty?
+        first_line_start = cleaned_gcov_data =~ /^\s+(-|#+|[0-9+]):\s+1:/
+        cleaned_gcov_data[first_line_start..-1].split("\n").map
+      else
+        []
+      end
+    end
+
+    def cleaned_gcov_data
+      data = gcov_data.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').gsub(/^function(.*) called [0-9]+ returned [0-9]+% blocks executed(.*)$\r?\n/, '')
+      data.gsub(/^branch(.*)$\r?\n/, '')
+    end
+
+    def raw_data
+      self.gcov_data
+    end
+
     def line_coverage_data
       unless cleaned_gcov_data.empty?
         first_line_start = cleaned_gcov_data =~ /^\s+(-|#+|[0-9+]):\s+1:/
@@ -70,9 +89,8 @@ def line_coverage_data
       end
     end
 
-    def cleaned_gcov_data
-      data = gcov_data.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').gsub(/^function(.*) called [0-9]+ returned [0-9]+% blocks executed(.*)$\r?\n/, '')
-      data.gsub(/^branch(.*)$\r?\n/, '')
+    def line_number_in_line(line)
+      line.split(':')[1].strip.to_i
     end
 
     def coverage_for_line(line)
@@ -89,102 +107,31 @@ def coverage_for_line(line)
       end
     end
 
-    def num_lines_tested
-      line_coverage_data.compact.select { |cd| cd > 0 }.count
-    end
-
-    def num_lines_testable
-      line_coverage_data.compact.count
-    end
-
-    def rate_lines_tested
-      if num_lines_testable > 0
-        (num_lines_tested / num_lines_testable.to_f)
-      else
-        0
-      end
-    end
-
-    def percentage_lines_tested
-      if num_lines_testable == 0
-        100
-      else
-        rate_lines_tested * 100
-      end
-    end
-
     def branch_coverage_data
       @branch_coverage_data ||= begin
         branch_coverage_data = Hash.new
 
-          gcov_data.scan(/(^(\s+(-|#+|[0-9]+):\s+[1-9]+:(.*)$\r?\n)(^branch\s+[0-9]+\s+[a-zA-Z0-9]+\s+[a-zA-Z0-9]+$\r?\n)+)+/) do |data|
-            lines = data[0].split("\n")
-            line_number = lines[0].split(':')[1].strip.to_i
-            branch_coverage_data[line_number] = lines[1..-1].map do |line|
-              if line.split(' ')[2].strip == "never"
-                0
-              else
-                line.split(' ')[3].strip.to_i
-              end
+        gcov_data.scan(/(^(\s+(-|#+|[0-9]+):\s+[1-9]+:(.*)$\r?\n)(^branch\s+[0-9]+\s+[a-zA-Z0-9]+\s+[a-zA-Z0-9]+$\r?\n)+)+/) do |data|
+          lines = data[0].split("\n")
+          line_number = lines[0].split(':')[1].strip.to_i
+          branch_coverage_data[line_number] = lines[1..-1].map do |line|
+            if line.split(' ')[2].strip == "never"
+              0
+            else
+              line.split(' ')[3].strip.to_i
             end
           end
+        end
         branch_coverage_data
       end
     end
 
-    def branch_coverage_data_for_statement_on_line(line_number)
-      branch_coverage_data[line_number] || []
-    end
-
-    def num_branches_for_statement_on_line(line_number)
-      branch_coverage_data_for_statement_on_line(line_number).length
-    end
-
-    def num_branch_hits_for_statement_on_line(line_number)
-      branch_coverage_data_for_statement_on_line(line_number).count { |hit_count| hit_count > 0 }
-    end
-
-    def rate_branch_coverage_for_statement_on_line(line_number)
-      branch_data = branch_coverage_data_for_statement_on_line(line_number)
-      if branch_data.empty?
-        0.0
-      else
-        (num_branch_hits_for_statement_on_line(line_number) / branch_data.length.to_f)
-      end
-    end
-
-    def percentage_branch_coverage_for_statement_on_line(line_number)
-      rate_branch_coverage_for_statement_on_line(line_number) * 100
-    end
-
-    def num_branches_testable
-      branch_coverage_data.keys.reduce(0) do |sum, line_number|
-        sum += num_branches_for_statement_on_line(line_number)
-      end
-    end
-
-    def num_branches_tested
-      branch_coverage_data.keys.reduce(0) do |sum, line_number|
-        sum += num_branch_hits_for_statement_on_line(line_number)
-      end
-    end
-
-    def rate_branches_tested
-      if (num_branches_testable > 0)
-        (num_branches_tested / num_branches_testable.to_f)
-      else
-        0.0
-      end
-    end
-
     def source_file_basename
       File.basename(source_file_pathname, '.m')
     end
 
-    def ignored?
-      project.ignore_list.any? do |ignore|
-        File.fnmatch(ignore, source_file_pathname_relative_to_repo_root)
-      end
+    def line_number_separator
+      ":"
     end
 
     def supported_file_extensions