slather 2.4.9 → 2.7.1

data/spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixtures.xcscheme

@@ -26,7 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B1E6980125F96B670086A3E2"
+            BuildableName = "FixtureFramework.framework"
+            BlueprintName = "FixtureFramework"
+            ReferencedContainer = "container:fixtures.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,8 +50,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +70,6 @@
             ReferencedContainer = "container:fixtures.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -70,6 +77,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8C9A202C195965F10013B6B3"
+            BuildableName = "libfixtures.a"
+            BlueprintName = "fixtures"
+            ReferencedContainer = "container:fixtures.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

data/spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -151,6 +151,26 @@ describe Slather::CoverageService::Coveralls do
         ENV['GIT_BRANCH'] = git_branch
       end
     end
+
+    context "coverage_service is :github" do
+      before(:each) { fixtures_project.ci_service = :github }
+
+      it "should return valid json for coveralls coverage data" do
+        allow(fixtures_project).to receive(:github_job_id).and_return("9182")
+        allow(fixtures_project).to receive(:coverage_access_token).and_return("abc123")
+        allow(fixtures_project).to receive(:github_pull_request).and_return("1")
+        allow(fixtures_project).to receive(:github_build_url).and_return("https://github.com/Bruce/Wayne/actions/runs/1")
+        allow(fixtures_project).to receive(:github_git_info).and_return({ :head => { :id => "ababa123", :author_name => "bwayne", :message => "hello" }, :branch => "master" })
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql("{\"service_job_id\":\"9182\",\"service_name\":\"github\",\"repo_name\":\"\",\"repo_token\":\"abc123\",\"service_pull_request\":\"1\",\"service_build_url\":\"https://github.com/Bruce/Wayne/actions/runs/1\",\"git\":{\"head\":{\"id\":\"ababa123\",\"author_name\":\"bwayne\",\"message\":\"hello\"},\"branch\":\"master\"}}").excluding("source_files")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql(fixtures_project.coverage_files.map(&:as_json).to_json).at_path("source_files")
+      end
+
+      it "should raise an error if there is no GITHUB_RUN_ID" do
+        allow(fixtures_project).to receive(:github_job_id).and_return(nil)
+        expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
+      end
+    end
+
   end
 
   describe '#coveralls_coverage_data' do

data/spec/slather/coverage_service/html_output_spec.rb

@@ -185,8 +185,8 @@ describe Slather::CoverageService::HtmlOutput do
       end
 
       allow(fixtures_project).to receive(:input_format).and_return("profdata")
-      allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("./spec/fixtures/fixtures/other_fixtures.m:
-    1|     |//
+      allow(fixtures_project).to receive(:pathnames_per_binary).and_return([{"filename" => Pathname.new("./spec/fixtures/fixtures/other_fixtures.m"), "segments" => []}])
+      allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("1|     |//
     2|     |//  other_fixtures.m
     3|     |//  fixtures
     4|     |//

data/spec/slather/profdata_coverage_spec.rb

@@ -157,6 +157,22 @@ describe Slather::ProfdataCoverageFile do
     end
   end
 
+  describe "#branch_coverage_data" do
+    it "should have branch data for line 19" do
+      # these segments correspond to the only statement on line 19
+      profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false]]
+      expect(profdata_coverage_file.branch_coverage_data[19]).to eq([0,1])
+    end
+    it "should have missing region data for line 19" do
+      profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false]]
+      expect(profdata_coverage_file.branch_region_data[19]).to eq([[8,11]])
+    end
+    it "should have two missing region data for line 19" do
+      profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false], [19, 30, 0, true, false], [19, 40, 1, true, true]]
+      expect(profdata_coverage_file.branch_region_data[19]).to eq([[8,11], [29,10]])
+    end
+  end
+
   describe "#ignored" do
 
     before(:each) {

data/spec/slather/project_spec.rb

@@ -243,8 +243,9 @@ 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.count).to eq(1)
-      expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(2)
+      expect(binary_file_location.first).to end_with("Debug/FixtureFramework.framework/Versions/A/FixtureFramework")
+      expect(binary_file_location.last).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path provided a workspace and scheme" do
@@ -252,8 +253,9 @@ 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.count).to eq(1)
-      expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(2)
+      expect(binary_file_location.first).to end_with("Debug/FixtureFramework.framework/Versions/A/FixtureFramework")
+      expect(binary_file_location.last).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path for a scheme with no buildable products" do
@@ -653,8 +655,8 @@ describe Slather::Project do
     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")
+      expect(source_files.first.to_s).to include("fixturesTwo.m")
+      expect(source_files.last.to_s).to include("fixtures.m")
     end
 
     it "should print out the coverage for each file, and then total coverage" do
@@ -664,10 +666,12 @@ describe Slather::Project do
               {
                  "files":[
                     {
-                       "filename":"spec/fixtures/fixtures/fixtures.m"
+                       "filename":"spec/fixtures/fixtures/fixtures.m",
+                       "segments": []
                     },
                     {
-                       "filename":"spec/fixtures/fixturesTwo/fixturesTwo.m"
+                       "filename":"spec/fixtures/fixturesTwo/fixturesTwo.m",
+                       "segments": []
                     }
                  ]
               }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 2.7.1
 platform: ruby
 authors:
 - Mark Larsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.10.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.10.beta.1
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -202,23 +202,17 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
-description: 
+        version: '0'
+description:
 email:
 - mark@venmo.com
 executables:
@@ -261,6 +255,12 @@ files:
 - lib/slather/project.rb
 - lib/slather/version.rb
 - slather.gemspec
+- spec/fixtures/FixtureFramework/FixtureFramework.h
+- spec/fixtures/FixtureFramework/FlashExperiment.swift
+- spec/fixtures/FixtureFramework/Info.plist
+- spec/fixtures/FixtureFrameworkTests/FixtureFrameworkTests.swift
+- spec/fixtures/FixtureFrameworkTests/FlashExperimentTests.swift
+- spec/fixtures/FixtureFrameworkTests/Info.plist
 - spec/fixtures/cobertura.xml
 - spec/fixtures/fixtures.xcodeproj/project.pbxproj
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -270,6 +270,7 @@ files:
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTestsSecond.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch
@@ -325,7 +326,7 @@ homepage: https://github.com/SlatherOrg/slather
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -341,10 +342,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects
 test_files:
+- spec/fixtures/FixtureFramework/FixtureFramework.h
+- spec/fixtures/FixtureFramework/FlashExperiment.swift
+- spec/fixtures/FixtureFramework/Info.plist
+- spec/fixtures/FixtureFrameworkTests/FixtureFrameworkTests.swift
+- spec/fixtures/FixtureFrameworkTests/FlashExperimentTests.swift
+- spec/fixtures/FixtureFrameworkTests/Info.plist
 - spec/fixtures/cobertura.xml
 - spec/fixtures/fixtures.xcodeproj/project.pbxproj
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -354,6 +361,7 @@ test_files:
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTestsSecond.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch