slather 2.1.0 → 2.2.0

data/spec/slather/project_spec.rb

@@ -71,6 +71,7 @@ describe Slather::Project do
     before(:each) do
       allow(Dir).to receive(:[]).and_call_original
       allow(Dir).to receive(:[]).with("#{fixtures_project.build_directory}/**/Coverage.profdata").and_return(["/some/path/Coverage.profdata"])
+      allow(fixtures_project).to receive(:binary_file).and_return(["Fixtures"])
       allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("#{FIXTURES_SWIFT_FILE_PATH}:
        |    0|
        |    1|import UIKit
@@ -109,6 +110,7 @@ describe Slather::Project do
       allow(fixtures_project).to receive(:input_format).and_return("profdata")
       allow(fixtures_project).to receive(:ignore_list).and_return([])
       allow(Dir).to receive(:[]).with("#{fixtures_project.build_directory}/**/Coverage.profdata").and_return(["/some/path/Coverage.profdata"])
+      allow(fixtures_project).to receive(:binary_file).and_return(["Fixtures"])
       allow(fixtures_project).to receive(:unsafe_profdata_llvm_cov_output).and_return("#{FIXTURES_SWIFT_FILE_PATH}:
       1|    8|    func application(application: \255, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
       1|    9|        return true
@@ -134,11 +136,20 @@ describe Slather::Project do
       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 use binary_file" do
+      fixtures_project.binary_file = ["/path/to/binary"]
+      fixtures_project.send(:configure_binary_file)
+      binary_file_location = fixtures_project.send(:binary_file)
+      expect(binary_file_location.count).to eq(1)
+      expect(binary_file_location.first).to eq("/path/to/binary")
+    end
+
     it "should find the product path provided a scheme" do
       allow(fixtures_project).to receive(:scheme).and_return("fixtures")
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(1)
+      expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path provided a workspace and scheme" do
@@ -146,14 +157,16 @@ describe Slather::Project do
       allow(fixtures_project).to receive(:scheme).and_return("fixtures")
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(1)
+      expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path for a scheme with no buildable products" do
       allow(fixtures_project).to receive(:scheme).and_return("fixturesTests")
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(1)
+      expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     let(:fixture_yaml) do
@@ -167,7 +180,7 @@ describe Slather::Project do
       allow(Slather::Project).to receive(:yml).and_return(fixture_yaml)
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location).to eq("/FixtureScheme/From/Yaml/Contents/MacOS/FixturesFromYaml")
+      expect(binary_file_location).to eq(["/FixtureScheme/From/Yaml/Contents/MacOS/FixturesFromYaml"])
     end
 
     let(:other_fixture_yaml) do
@@ -182,7 +195,8 @@ describe Slather::Project do
       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 end_with("/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(1)
+      expect(binary_file_location.first).to end_with("/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
   end
 
@@ -445,11 +459,12 @@ describe Slather::Project do
     end
 
     it "should print out environment info when in verbose_mode" do
-
       project_root = Pathname("./").realpath
 
       ["\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"
+       "Against binary files:",
+       "\t#{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests",
+       "\n"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
       end
@@ -457,4 +472,35 @@ describe Slather::Project do
       fixtures_project.send(:configure)
     end
   end
+
+  describe "#source_files" do
+
+    let(:fixtures_project) do
+      proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
+      proj.build_directory = TEMP_DERIVED_DATA_PATH
+      proj.input_format = "profdata"
+      proj.source_files = ["./**/fixtures{,Two}.m"]
+      proj.binary_basename = ["fixturesTests", "libfixturesTwo"]
+      proj.configure
+      proj
+    end
+
+    it "should find relevant source files" do
+      source_files = fixtures_project.find_source_files
+      expect(source_files.count).to eq(2)
+      expect(source_files.first.to_s).to include("fixtures.m")
+      expect(source_files.last.to_s).to include("fixturesTwo.m")
+    end
+
+    it "should print out the coverage for each file, and then total coverage" do
+      ["spec/fixtures/fixtures/fixtures.m: 3 of 6 lines (50.00%)",
+      "spec/fixtures/fixturesTwo/fixturesTwo.m: 6 of 6 lines (100.00%)",
+      "Test Coverage: 75.00%"
+      ].each do |line|
+        expect(fixtures_project).to receive(:puts).with(line)
+      end
+      fixtures_project.post
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ RSpec.configure do |config|
     FixtureHelpers.delete_derived_data
     FixtureHelpers.delete_temp_gcov_files
     `xcodebuild -project "#{FIXTURES_PROJECT_PATH}" -scheme fixtures -configuration Debug -derivedDataPath #{TEMP_PROJECT_BUILD_PATH} -enableCodeCoverage YES clean test`
-    `xcodebuild -workspace "#{FIXTURES_WORKSPACE_PATH}" -scheme fixtures -configuration Debug -derivedDataPath #{TEMP_WORKSPACE_BUILD_PATH} -enableCodeCoverage YES clean test`
+    `xcodebuild -workspace "#{FIXTURES_WORKSPACE_PATH}" -scheme fixturesTestsWorkspace -configuration Debug -derivedDataPath #{TEMP_WORKSPACE_BUILD_PATH} -enableCodeCoverage YES clean test`
   end
 
   config.after(:suite) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,7 +234,9 @@ files:
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixtures.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTests.xcscheme
+- spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch
 - spec/fixtures/fixtures/fixtures.h
@@ -257,6 +259,8 @@ files:
 - spec/fixtures/fixturesTests/Supporting Files/fixturesTests-Info.plist
 - spec/fixtures/fixturesTests/fixturesTests.m
 - spec/fixtures/fixturesTests/peekaviewTests.m
+- spec/fixtures/fixturesTwo/fixturesTwo.h
+- spec/fixtures/fixturesTwo/fixturesTwo.m
 - spec/fixtures/fixtures_html/Branches.m.html
 - spec/fixtures/fixtures_html/BranchesTests.m.html
 - spec/fixtures/fixtures_html/fixtures.m.html
@@ -306,7 +310,9 @@ test_files:
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixtures.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTests.xcscheme
+- spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch
 - spec/fixtures/fixtures/fixtures.h
@@ -329,6 +335,8 @@ test_files:
 - spec/fixtures/fixturesTests/Supporting Files/fixturesTests-Info.plist
 - spec/fixtures/fixturesTests/fixturesTests.m
 - spec/fixtures/fixturesTests/peekaviewTests.m
+- spec/fixtures/fixturesTwo/fixturesTwo.h
+- spec/fixtures/fixturesTwo/fixturesTwo.m
 - spec/fixtures/fixtures_html/Branches.m.html
 - spec/fixtures/fixtures_html/BranchesTests.m.html
 - spec/fixtures/fixtures_html/fixtures.m.html