slather 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5346e7ae5cba9037d3f9386b52acbdf4a4b40c91
-  data.tar.gz: c6c6736662bc1f1f2730cf4fc351e131687b6d92
+  metadata.gz: c3091b591850a4c53ba0f5d19fea4f62b01f833e
+  data.tar.gz: dc3b6ed662c319e4d3cb7f0abd463ab80047ad8d
 SHA512:
-  metadata.gz: ecd69108753a0d5bc1fd1cb0b89a6d1a98b970a26f29d1af4e7cef63a1b19c9b197212e01828da90a03f85c5a5ae5856c73dbef9959f5b5eaf448caf3c38b1e3
-  data.tar.gz: bf38de9f006be3f6ec9ad966435ecb45ace99bc716a483a7eba1b6c0b69294b7f5409aeaa0a88f57a6bfda45846357e15ebbbecebcd7f4cda12128df59f84704
+  metadata.gz: b9abc7f87812d4f98fff3bbc4f90fa04c68516885b187fe5d6a60066b3084e814059de68d418b7c971af219d16aedc7acdc24f8526e0ce56a98070872ea32000
+  data.tar.gz: b3eac9e758b90f7b74e3cc3280ec4d9b21c668f1b6249d2568d89d411815054d4210e644ed7a0619c52f767af601f354e682ca059d898bee7e233257564faf48

data/.gitignore

@@ -44,3 +44,6 @@ cobertura.xml
 html
 *.gcda
 *.gcno
+
+# JetBrains IDE
+.idea/

data/.travis.yml

@@ -1,6 +1,6 @@
 language: objective-c
 script: bundle exec rake
-osx_image: xcode7
+osx_image: xcode7.3
 
 # Sets Travis to run the Ruby specs on OS X machines which are required to
 # build the native extensions of Xcodeproj.

data/CHANGELOG.md

@@ -2,9 +2,37 @@
 
 ## master
 
+
+
+## v2.0.2
+
+* Escape the link to file names properly  
+  [Thomas Mellenthin](https://github.com/melle)
+  [#158](https://github.com/SlatherOrg/slather/pull/158)
+
+* Product info is now read from schemes. Specify a scheme in `.slather.yml` or with the `--scheme` argument to ensure consistent results. Automatically detect the derived data directory from `xcodebuild`  
+  [Kent Sutherland](https://github.com/ksuther)
+  [#174](https://github.com/SlatherOrg/slather/pull/174)
+
+* Xcode 7.3 compatibility (updated path returned by `profdata_coverage_dir`)  
+  [Kent Sutherland](https://github.com/ksuther)
+  [#125](https://github.com/SlatherOrg/slather/issues/125), [#169](https://github.com/SlatherOrg/slather/pull/169)
+
+* Improve matching of xctest bundles when using `--binary-basename`  
+  [Kent Sutherland](https://github.com/ksuther)
+  [#167](https://github.com/SlatherOrg/slather/pull/167)
+
+* Build Statistic Reporting for TeamCity  
+  [Michael Myers](https://github.com/michaelmyers)
+  [#150](https://github.com/SlatherOrg/slather/pull/150)
+
+* Use named classes for subcommands in bin/slather  
+  [bootstraponline](https://github.com/bootstraponline)
+  [#170](https://github.com/SlatherOrg/slather/pull/170)
+
 ## v2.0.1
 
-* Fixes how `profdata_coverage_dir` is created.
+* Fixes how `profdata_coverage_dir` is created.  
   [guidomb](https://github.com/guidomb)
   [#145](https://github.com/SlatherOrg/slather/pull/145)
 

data/README.md

@@ -174,6 +174,14 @@ $ slather coverage --html path/to/project.xcodeproj
 
 This will make a directory named `html` in your root directory (unless `--output-directory` is specified) and will generate all the reports as static html pages inside the directory. It will print out the report's path by default, but you can also specify `--show` flag to open it in your browser automatically.
 
+### TeamCity Reporting
+
+To report the coverage statistics to TeamCity:
+
+```sh
+$ slather coverage --teamcity -s
+```
+
 ### Coverage for code included via CocoaPods
 
 If you're trying to compute the coverage of code that has been included via

data/bin/slather

@@ -1,156 +1,15 @@
 #!/usr/bin/env ruby
 require 'clamp'
 require 'yaml'
-require File.join(File.dirname(__FILE__), '../lib/slather')
-
-Clamp do
+require_relative '../lib/slather'
+require_relative '../lib/slather/command/coverage_command'
+require_relative '../lib/slather/command/setup_command'
 
+class MainCommand < Clamp::Command
   self.default_subcommand = "coverage"
 
-  subcommand "coverage", "Computes coverage for the supplied project" do
-
-    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"
-    option ["--jenkins"], :flag, "Indicate that the builds are running on Jenkins"
-    option ["--buildkite"], :flag, "Indicate that the builds are running on Buildkite"
-
-    option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
-    option ["--simple-output", "-s"], :flag, "Output coverage results to the terminal"
-    option ["--gutter-json", "-g"], :flag, "Output coverage results as Gutter JSON format"
-    option ["--cobertura-xml", "-x"], :flag, "Output coverage results as Cobertura XML format"
-    option ["--html"], :flag, "Output coverage results as static html pages"
-    option ["--show"], :flag, "Indicate that the static html pages will open automatically"
-
-    option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
-    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"
-    option ["--binary-basename"], "BINARY_BASENAME", "Basename of the file against which the coverage will be run"
-
-    def execute
-      puts "Slathering..."
-
-      setup_service_name
-      setup_ignore_list
-      setup_build_directory
-      setup_source_directory
-      setup_output_directory
-      setup_coverage_service
-      setup_verbose_mode
-      setup_input_format
-      setup_scheme
-      setup_binary_file
-      setup_binary_basename
-
-      project.configure
-
-      post
-
-      puts "Slathered"
-    end
-
-    def setup_build_directory
-      project.build_directory = build_directory if build_directory
-    end
-
-    def setup_source_directory
-      project.source_directory = source_directory if source_directory
-    end
-
-    def setup_output_directory
-      project.output_directory = output_directory if output_directory
-    end
-
-    def setup_ignore_list
-      project.ignore_list = ignore_list if !ignore_list.empty?
-    end
-
-    def setup_service_name
-      if travis?
-        project.ci_service = :travis_ci
-      elsif circleci?
-        project.ci_service = :circleci
-      elsif jenkins?
-        project.ci_service = :jenkins
-      elsif buildkite?
-        project.ci_service = :buildkite
-      end
-    end
-
-    def post
-      project.post
-    end
-
-    def project
-      @project ||= begin
-        xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml["xcodeproj"]
-        if xcodeproj_path_to_open
-          project = Slather::Project.open(xcodeproj_path_to_open)
-        else
-          raise StandardError, "Must provide an xcodeproj either via the 'slather [SUBCOMMAND] [PROJECT].xcodeproj' command or through .slather.yml"
-        end
-      end
-    end
-
-    def setup_coverage_service
-      if coveralls?
-        project.coverage_service = :coveralls
-      elsif simple_output?
-        project.coverage_service = :terminal
-      elsif gutter_json?
-        project.coverage_service = :gutter_json
-      elsif cobertura_xml?
-        project.coverage_service = :cobertura_xml
-      elsif html?
-        project.coverage_service = :html
-        project.show_html = show?
-      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
-
-    def setup_binary_basename
-      project.binary_basename = binary_basename
-    end
-
-  end
-
-  subcommand "setup", "Configures a .xcodeproj for test coverage generation" do
-
-    parameter "[PROJECT]", "Path to the .xcodeproj", :attribute_name => :xcodeproj_path
-
-    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 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
-
-  end
+  subcommand "setup", "Configures a .xcodeproj for test coverage generation", SetupCommand
+  subcommand "coverage", "Computes coverage for the supplied project", CoverageCommand
 end
+
+MainCommand.run

data/lib/slather/command/coverage_command.rb

@@ -0,0 +1,127 @@
+class CoverageCommand < Clamp::Command
+
+  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"
+  option ["--jenkins"], :flag, "Indicate that the builds are running on Jenkins"
+  option ["--buildkite"], :flag, "Indicate that the builds are running on Buildkite"
+
+  option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
+  option ["--simple-output", "-s"], :flag, "Output coverage results to the terminal"
+  option ["--gutter-json", "-g"], :flag, "Output coverage results as Gutter JSON format"
+  option ["--cobertura-xml", "-x"], :flag, "Output coverage results as Cobertura XML format"
+  option ["--html"], :flag, "Output coverage results as static html pages"
+  option ["--show"], :flag, "Indicate that the static html pages will open automatically"
+
+  option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
+  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"
+  option ["--binary-basename"], "BINARY_BASENAME", "Basename of the file against which the coverage will be run"
+
+  def execute
+    puts "Slathering..."
+
+    setup_service_name
+    setup_ignore_list
+    setup_build_directory
+    setup_source_directory
+    setup_output_directory
+    setup_coverage_service
+    setup_verbose_mode
+    setup_input_format
+    setup_scheme
+    setup_binary_file
+    setup_binary_basename
+
+    project.configure
+
+    post
+
+    puts "Slathered"
+  end
+
+  def setup_build_directory
+    project.build_directory = build_directory if build_directory
+  end
+
+  def setup_source_directory
+    project.source_directory = source_directory if source_directory
+  end
+
+  def setup_output_directory
+    project.output_directory = output_directory if output_directory
+  end
+
+  def setup_ignore_list
+    project.ignore_list = ignore_list if !ignore_list.empty?
+  end
+
+  def setup_service_name
+    if travis?
+      project.ci_service = :travis_ci
+    elsif circleci?
+      project.ci_service = :circleci
+    elsif jenkins?
+      project.ci_service = :jenkins
+    elsif buildkite?
+      project.ci_service = :buildkite
+    end
+  end
+
+  def post
+    project.post
+  end
+
+  def project
+    @project ||= begin
+      xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml["xcodeproj"]
+      if xcodeproj_path_to_open
+        project = Slather::Project.open(xcodeproj_path_to_open)
+      else
+        raise StandardError, "Must provide an xcodeproj either via the 'slather [SUBCOMMAND] [PROJECT].xcodeproj' command or through .slather.yml"
+      end
+    end
+  end
+
+  def setup_coverage_service
+    if coveralls?
+      project.coverage_service = :coveralls
+    elsif simple_output?
+      project.coverage_service = :terminal
+    elsif gutter_json?
+      project.coverage_service = :gutter_json
+    elsif cobertura_xml?
+      project.coverage_service = :cobertura_xml
+    elsif html?
+      project.coverage_service = :html
+      project.show_html = show?
+    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
+
+  def setup_binary_basename
+    project.binary_basename = binary_basename
+  end
+end

data/lib/slather/command/setup_command.rb

@@ -0,0 +1,15 @@
+class SetupCommand < Clamp::Command
+  parameter "[PROJECT]", "Path to the .xcodeproj", :attribute_name => :xcodeproj_path
+
+  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 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
+end

data/lib/slather/coverage_service/html_output.rb

@@ -1,4 +1,5 @@
 require 'nokogiri'
+require "cgi"
 
 module Slather
   module CoverageService
@@ -99,7 +100,7 @@ module Slather
             cov.tbody(:class => "list") {
               coverage_files.each { |coverage_file|
                 filename = File.basename(coverage_file.source_file_pathname_relative_to_repo_root)
-                filename_link = "#{filename}.html"
+                filename_link = CGI.escape(filename) + ".html"
 
                 cov.tr {
                   percentage = coverage_file.percentage_lines_tested

data/lib/slather/coverage_service/simple_output.rb

@@ -26,6 +26,22 @@ module Slather
 
           puts "#{coverage_file.source_file_pathname_relative_to_repo_root}: #{lines_tested} of #{total_lines} lines (#{percentage}%)"
         end
+
+        # check if there needs to be custom reporting based on the ci service
+        if ci_service == :teamcity
+          # TeamCity Build Statistic Reporting
+          #
+          # Reporting format ##teamcity[buildStatisticValue key='<valueTypeKey>' value='<value>']
+          # key='CodeCoverageAbsLCovered' is total number of lines covered
+          # key='CodeCoverageAbsLTotal' is total number of lines
+          #
+          # Sources:
+          # - https://confluence.jetbrains.com/display/TCDL/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-ReportingBuildStatistics
+          # - https://confluence.jetbrains.com/display/TCDL/Custom+Chart#CustomChart-listOfDefaultStatisticValues
+          puts "##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='%i']" % total_project_lines_tested
+          puts "##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='%i']" % total_project_lines
+        end
+
         total_percentage = '%.2f' % [(total_project_lines_tested / total_project_lines.to_f) * 100.0]
         puts "Test Coverage: #{total_percentage}%"
       end

data/lib/slather/project.rb

@@ -62,7 +62,23 @@ module Slather
     end
 
     def derived_data_path
-      File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/"
+      # Get the derived data path from xcodebuild
+      # Use OBJROOT when possible, as it provides regardless of whether or not the Derived Data location is customized
+      if self.scheme
+        build_settings = `xcodebuild -project "#{self.path}" -scheme "#{self.scheme}" -showBuildSettings`
+      else
+        build_settings = `xcodebuild -project "#{self.path}" -showBuildSettings`
+      end
+
+      if build_settings
+        derived_data_path = build_settings.match(/ OBJROOT = (.+)/)[1]
+      end
+
+      if derived_data_path == nil
+        derived_data_path = File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/"
+      end
+
+      derived_data_path
     end
     private :derived_data_path
 
@@ -120,6 +136,11 @@ module Slather
         dir = Dir[File.join("#{build_directory}","/**/#{first_product_name}")].first
       end
 
+      if dir == nil
+        # Xcode 7.3 moved the location of Coverage.profdata
+        dir = Dir[File.join("#{build_directory}","/**/CodeCoverage")].first
+      end
+
       raise StandardError, "No coverage directory found. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.xcodeproj`" unless dir != nil
       dir
     end
@@ -138,21 +159,6 @@ module Slather
     end
     private :profdata_file
 
-    def find_binary_file_for_app(app_bundle_file)
-      app_bundle_file_name_noext = Pathname.new(app_bundle_file).basename.to_s.gsub(".app", "")
-      Dir["#{app_bundle_file}/**/#{app_bundle_file_name_noext}"].first
-    end
-
-    def find_binary_file_for_dynamic_lib(framework_bundle_file)
-      framework_bundle_file_name_noext = Pathname.new(framework_bundle_file).basename.to_s.gsub(".framework", "")
-      "#{framework_bundle_file}/#{framework_bundle_file_name_noext}"
-    end
-
-    def find_binary_file_for_static_lib(xctest_bundle_file)
-      xctest_bundle_file_name_noext = Pathname.new(xctest_bundle_file).basename.to_s.gsub(".xctest", "")
-      Dir["#{xctest_bundle_file}/**/#{xctest_bundle_file_name_noext}"].first
-    end
-
     def unsafe_profdata_llvm_cov_output
       profdata_file_arg = profdata_file
       if profdata_file_arg == nil
@@ -283,25 +289,64 @@ module Slather
       end
     end
 
+    def find_binary_file_in_bundle(bundle_file)
+      bundle_file_noext = File.basename(bundle_file, File.extname(bundle_file))
+      Dir["#{bundle_file}/**/#{bundle_file_noext}"].first
+    end
+
     def find_binary_file
-      xctest_bundle = Dir["#{profdata_coverage_dir}/**/*.xctest"].reject { |bundle|
-        bundle.include? "-Runner.app/PlugIns/"
-      }.first
-      raise StandardError, "No product binary found in #{profdata_coverage_dir}. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.xcodeproj`" unless xctest_bundle != nil
-
-      # Find the matching binary file
-      search_for = self.binary_basename || self.class.yml["binary_basename"] || '*'
-      xctest_bundle_file_directory = Pathname.new(xctest_bundle).dirname
-      app_bundle = Dir["#{xctest_bundle_file_directory}/#{search_for}.app"].first
-      dynamic_lib_bundle = Dir["#{xctest_bundle_file_directory}/#{search_for}.framework"].first
-
-      if app_bundle != nil
-        find_binary_file_for_app(app_bundle)
-      elsif dynamic_lib_bundle != nil
-        find_binary_file_for_dynamic_lib(dynamic_lib_bundle)
+      binary_basename = self.binary_basename || self.class.yml["binary_basename"] || nil
+
+      # Get scheme info out of the xcodeproj
+      if self.scheme
+        schemes_path = Xcodeproj::XCScheme.shared_data_dir(self.path)
+        xcscheme_path = "#{schemes_path + self.scheme}.xcscheme"
+        xcscheme = Xcodeproj::XCScheme.new(xcscheme_path)
+
+        buildable_name = xcscheme.build_action.entries[0].buildable_references[0].buildable_name
+        configuration = xcscheme.test_action.build_configuration
+
+        search_for = binary_basename || buildable_name
+        found_product = Dir["#{profdata_coverage_dir}/Products/#{configuration}*/#{search_for}*"].sort { |x, y|
+          # Sort the matches without the file extension to ensure better matches when there are multiple candidates
+          # For example, if the binary_basename is Test then we want Test.app to be matched before Test Helper.app
+          File.basename(x, File.extname(x)) <=> File.basename(y, File.extname(y))
+        }.reject { |path|
+          path.end_with? ".dSYM"
+        }.first
+
+        if found_product and File.directory? found_product
+          found_binary = find_binary_file_in_bundle(found_product)
+        else
+          found_binary = found_product
+        end
       else
-        find_binary_file_for_static_lib(xctest_bundle)
+        xctest_bundle = Dir["#{profdata_coverage_dir}/**/*.xctest"].reject { |bundle|
+            # Ignore xctest bundles that are in the UI runner app
+            bundle.include? "-Runner.app/PlugIns/"
+        }.first
+
+        # Find the matching binary file
+        search_for = binary_basename || '*'
+        xctest_bundle_file_directory = Pathname.new(xctest_bundle).dirname
+        app_bundle = Dir["#{xctest_bundle_file_directory}/#{search_for}.app"].first
+        dynamic_lib_bundle = Dir["#{xctest_bundle_file_directory}/#{search_for}.framework"].first
+        matched_xctest_bundle = Dir["#{xctest_bundle_file_directory}/#{search_for}.xctest"].first
+
+        if app_bundle != nil
+            found_binary = find_binary_file_in_bundle(app_bundle)
+        elsif dynamic_lib_bundle != nil
+            found_binary = find_binary_file_in_bundle(dynamic_lib_bundle)
+        elsif matched_xctest_bundle != nil
+            found_binary = find_binary_file_in_bundle(matched_xctest_bundle)
+        else
+            found_binary = find_binary_file_in_bundle(xctest_bundle)
+        end
       end
+
+      raise StandardError, "No product binary found in #{profdata_coverage_dir}. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.xcodeproj`" unless found_binary != nil
+
+      found_binary
     end
 
   end

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/slather/coverage_service/simple_output_spec.rb

@@ -30,5 +30,30 @@ describe Slather::CoverageService::SimpleOutput do
 
       fixtures_project.post
     end
+
+    describe 'ci_service reporting output' do
+
+      context "ci_service is :teamcity" do
+        before(:each) { fixtures_project.ci_service = :teamcity }
+
+        it "should print out the coverage" do
+          ["spec/fixtures/fixtures/fixtures.m: 3 of 6 lines (50.00%)",
+           "spec/fixtures/fixtures/more_files/Branches.m: 13 of 30 lines (43.33%)",
+           "spec/fixtures/fixturesTests/BranchesTests.m: 16 of 16 lines (100.00%)",
+           "spec/fixtures/fixturesTests/fixturesTests.m: 12 of 12 lines (100.00%)",
+           "spec/fixtures/fixturesTests/peekaviewTests.m: 11 of 11 lines (100.00%)",
+           "##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='55']",
+           "##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='75']",
+           "Test Coverage: 73.33%"
+          ].each do |line|
+            expect(fixtures_project).to receive(:puts).with(line)
+          end
+
+          fixtures_project.post
+        end
+      end
+
+    end
+
   end
 end

data/spec/slather/project_spec.rb

@@ -8,24 +8,12 @@ describe Slather::Project do
     Slather::Project.open(FIXTURES_PROJECT_PATH)
   end
 
-  describe "#derived_data_path" do
-    it "should return the system's derived data directory" do
-      expect(fixtures_project.send(:derived_data_path)).to eq(File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/")
-    end
-  end
-
   describe "#build_directory" do
     it "should return the build_directory property, if it has been explicitly set" do
       build_directory_mock = double(String)
       fixtures_project.build_directory = build_directory_mock
       expect(fixtures_project.build_directory).to eq(build_directory_mock)
     end
-
-    it "should return the derived_data_path if no build_directory has been set" do
-      derived_data_path = File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/"
-      fixtures_project.send(:configure_build_directory)
-      expect(fixtures_project.build_directory).to eq(derived_data_path)
-    end
   end
 
   describe "::yml" do
@@ -141,31 +129,15 @@ describe Slather::Project do
       allow(Dir).to receive(:[]).and_call_original
       allow(fixtures_project).to receive(:build_directory).and_return(build_directory)
       allow(fixtures_project).to receive(:input_format).and_return("profdata")
-      allow(fixtures_project).to receive(:scheme).and_return("FixtureScheme")
+      allow(fixtures_project).to receive(:scheme).and_return("fixtures")
       allow(Dir).to receive(:[]).with("#{build_directory}/**/CodeCoverage/FixtureScheme").and_return(["#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme"])
       allow(Dir).to receive(:[]).with("#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme/**/*.xctest").and_return(["#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme/FixtureAppTests.xctest"])
     end
 
-    it "should return the binary file location for an app bundle provided a scheme" do
-      allow(Dir).to receive(:[]).with("#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme/*.app").and_return(["/FixtureScheme/FixtureApp.app"])
-      allow(Dir).to receive(:[]).with("/FixtureScheme/FixtureApp.app/**/FixtureApp").and_return(["/FixtureScheme/FixtureApp.app/FixtureApp"])
-      fixtures_project.send(:configure_binary_file)
-      binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to eq("/FixtureScheme/FixtureApp.app/FixtureApp")
-    end
-
-    it "should return the binary file location for a framework bundle provided a scheme" do
-      allow(Dir).to receive(:[]).with("#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme/*.framework").and_return(["/FixtureScheme/FixtureFramework.framework"])
+    it "should find the product path provided a scheme" do
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to eq("/FixtureScheme/FixtureFramework.framework/FixtureFramework")
-    end
-
-    it "should return the binary file location for a test bundle provided a scheme" do
-      allow(Dir).to receive(:[]).with("#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme/FixtureAppTests.xctest/**/FixtureAppTests").and_return(["/FixtureScheme/FixtureAppTests.xctest/Contents/MacOS/FixtureAppTests"])
-      fixtures_project.send(:configure_binary_file)
-      binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to eq("/FixtureScheme/FixtureAppTests.xctest/Contents/MacOS/FixtureAppTests")
+      expect(binary_file_location).to end_with("Debug/libfixtures.a")
     end
 
     let(:fixture_yaml) do
@@ -184,26 +156,18 @@ describe Slather::Project do
 
     let(:other_fixture_yaml) do
       yaml_text = <<-EOF
-        binary_basename: "FixtureFramework"
+        binary_basename: "fixtures"
       EOF
       yaml = YAML.load(yaml_text)
     end
 
     it "should configure the binary_basename from yml" do
       allow(Slather::Project).to receive(:yml).and_return(other_fixture_yaml)
-      allow(Dir).to receive(:[]).with("#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme/FixtureFramework.framework").and_return(["/FixtureScheme/FixtureFramework.framework"])
+      allow(Dir).to receive(:[]).with("#{build_directory}/Build/Intermediates/CodeCoverage/Products/Debug/fixtureTests.xctest").and_return(["fixtureTests.xctest"])
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to eq("/FixtureScheme/FixtureFramework.framework/FixtureFramework")
+      expect(binary_file_location).to end_with("/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
-
- #  it "should find the binary file without any yml setting" do
- #    fixtures_project.configure_binary_file
- #    Dir.stub(:[]).with("#{build_directory}/Build/Intermediates/CodeCoverage/FixtureScheme/*.app").and_return(["/FixtureScheme/FixtureApp.app"])
- #    Dir.stub(:[]).with("/FixtureScheme/FixtureApp.app/**/FixtureApp").and_return(["/FixtureScheme/FixtureApp.app/FixtureApp"])
- #    binary_file_location = fixtures_project.send(:binary_file)
- #    expect(binary_file_location).to eq("/FixtureScheme/FixtureApp.app/FixtureApp")
- #  end
   end
 
   describe "#dedupe" do
@@ -449,8 +413,8 @@ describe Slather::Project do
 
       project_root = Pathname("./").realpath
 
-      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/fixtures/Coverage.profdata",
-       "Against binary file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/fixtures/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests\n\n"
+      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+       "Against binary file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests\n\n"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,6 +200,8 @@ files:
 - docs/logo.jpg
 - lib/cocoapods_plugin.rb
 - lib/slather.rb
+- lib/slather/command/coverage_command.rb
+- lib/slather/command/setup_command.rb
 - lib/slather/coverage_file.rb
 - lib/slather/coverage_info.rb
 - lib/slather/coverage_service/cobertura_xml_output.rb