slather 1.1.0 → 1.2.0

data/spec/slather/coverage_file_spec.rb

@@ -22,6 +22,18 @@ describe Slather::CoverageFile do
       expect(coverage_file.source_file_pathname).to eq(fixtures_project["fixtures/fixtures.m"].real_path)
     end
 
+    it "should look in the source_directory if it has been set on the project" do
+      coverage_file = Slather::CoverageFile.new(fixtures_project, "fixtures.m")
+      fixtures_project.source_directory = Pathname(File.join(File.dirname(__FILE__), '../fixtures/')).realpath.to_s
+      expect(coverage_file.source_file_pathname).to eq(fixtures_project["fixtures/fixtures.m"].real_path)
+    end
+
+    it "should look in the source_directory if it has been set on the project" do
+      coverage_file = Slather::CoverageFile.new(fixtures_project, "fixtures.m")
+      fixtures_project.source_directory = Pathname(File.join(File.dirname(__FILE__), '../fixtures/fixturesTests')).realpath.to_s
+      expect(coverage_file.source_file_pathname).to be_nil
+    end
+
     it "should return nil if it couldn't find the coverage files's source implementation file in the project" do
       whoami_file = Slather::CoverageFile.new(fixtures_project, "/some/path/whoami.gcno")
       expect(whoami_file.source_file_pathname).to be_nil
@@ -102,5 +114,23 @@ OBJC
       end
     end
 
+    describe "num_lines_tested" do
+      it "should return the correct number of lines tested" do
+        expect(coverage_file.num_lines_tested).to eq(2)
+      end
+    end
+
+    describe "num_lines_testable" do
+      it "should return the correct number of lines that are testable" do
+        expect(coverage_file.num_lines_testable).to eq(4)
+      end
+    end
+
+    describe "percentage_lines_tested" do
+      it "should return the correct percentage of lines that are tested" do
+        expect(coverage_file.percentage_lines_tested).to eq(50)
+      end
+    end
+
   end
-end
+end

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -36,6 +36,21 @@ describe Slather::CoverageService::Coveralls do
       end
     end
 
+    context "coverage_service is :travis_pro" do
+      before(:each) { fixtures_project.ci_service = :travis_pro }
+
+      it "should return valid json for coveralls coverage data" do
+        fixtures_project.stub(:travis_job_id).and_return("9182")
+        fixtures_project.stub(:ci_access_token).and_return("abc123")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to eq("{\"service_job_id\":\"9182\",\"service_name\":\"travis-pro\",\"repo_token\":\"abc123\",\"source_files\":[{\"name\":\"spec/fixtures/fixtures/fixtures.m\",\"source\":\"//\\n//  fixtures.m\\n//  fixtures\\n//\\n//  Created by Mark Larsen on 6/24/14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import \\\"fixtures.h\\\"\\n\\n@implementation fixtures\\n\\n- (void)testedMethod\\n{\\n    NSLog(@\\\"tested\\\");\\n}\\n\\n- (void)untestedMethod\\n{\\n    NSLog(@\\\"untested\\\");\\n}\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,1,1,null,null,null,0,0,null,null]},{\"name\":\"spec/fixtures/fixtures/more_files/peekaview.m\",\"source\":\"//\\n//  peekaview.m\\n//  fixtures\\n//\\n//  Created by Mark Larsen on 6/25/14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import \\\"peekaview.h\\\"\\n\\n@implementation peekaview\\n\\n- (id)initWithFrame:(CGRect)frame\\n{\\n    self = [super initWithFrame:frame];\\n    if (self) {\\n        // Initialization code\\n    }\\n    return self;\\n}\\n\\n/*\\n// Only override drawRect: if you perform custom drawing.\\n// An empty implementation adversely affects performance during animation.\\n- (void)drawRect:(CGRect)rect\\n{\\n    // Drawing code\\n}\\n*/\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,0,null,0,0,null,0,0,0,null,null,null,null,null,null,null,null,null,null,null]},{\"name\":\"spec/fixtures/fixturesTests/fixturesTests.m\",\"source\":\"//\\n//  fixturesTests.m\\n//  fixturesTests\\n//\\n//  Created by Mark Larsen on 6/24/14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import <XCTest/XCTest.h>\\n#import \\\"fixtures.h\\\"\\n\\n@interface fixturesTests : XCTestCase\\n\\n@end\\n\\n@implementation fixturesTests\\n\\n- (void)setUp\\n{\\n    [super setUp];\\n    // Put setup code here. This method is called before the invocation of each test method in the class.\\n}\\n\\n- (void)tearDown\\n{\\n    // Put teardown code here. This method is called after the invocation of each test method in the class.\\n    [super tearDown];\\n}\\n\\n- (void)testExample\\n{\\n    fixtures *f = [[fixtures alloc] init];\\n    [f testedMethod];\\n}\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1,null,1,null,null,null,null,1,1,null,null,null,1,1,1,null,null]},{\"name\":\"spec/fixtures/fixturesTests/peekaviewTests.m\",\"source\":\"//\\n//  peekaviewTests.m\\n//  fixtures\\n//\\n//  Created by Mark Larsen on 6/25/14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import <XCTest/XCTest.h>\\n\\n@interface peekaviewTests : XCTestCase\\n\\n@end\\n\\n@implementation peekaviewTests\\n\\n- (void)setUp\\n{\\n    [super setUp];\\n    // Put setup code here. This method is called before the invocation of each test method in the class.\\n}\\n\\n- (void)tearDown\\n{\\n    // Put teardown code here. This method is called after the invocation of each test method in the class.\\n    [super tearDown];\\n}\\n\\n- (void)testExample\\n{\\n    XCTAssert(YES, @\\\"woot\\\");\\n}\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,1,null,1,null,null,null,null,1,1,null,null,null,2,1,null,null]}]}")
+      end
+
+      it "should raise an error if there is no TRAVIS_JOB_ID" do
+        fixtures_project.stub(:travis_job_id).and_return(nil)
+        expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
+      end
+    end
+
     it "should raise an error if it does not recognize the ci_service" do
       fixtures_project.ci_service = :jenkins_ci
       expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)

data/spec/slather/coverage_service/simple_output_spec.rb

@@ -8,8 +8,8 @@ describe Slather::CoverageService::SimpleOutput do
   end
 
   describe '#coverage_file_class' do
-    it "should return CoverallsCoverageFile" do
-      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverallsCoverageFile)
+    it "should return CoverageFile" do
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::CoverageFile)
     end
   end
 
@@ -23,4 +23,4 @@ describe Slather::CoverageService::SimpleOutput do
       fixtures_project.post
     end
   end
-end
+end

data/spec/slather/project_spec.rb

@@ -70,6 +70,7 @@ describe Slather::Project do
 
     it "should return coverage file objects of type coverage_file_class for unignored project files" do
       fixtures_project.ignore_list = ["*fixturesTests*"]
+      fixtures_project.stub(:dedupe) { |coverage_files| coverage_files }
       coverage_files = fixtures_project.send(:coverage_files)
       coverage_files.each { |cf| expect(cf.kind_of?(SpecCoverageFile)).to be_truthy }
       expect(coverage_files.map { |cf| cf.source_file_pathname.basename.to_s }).to eq(["fixtures.m", "peekaview.m"])
@@ -81,10 +82,33 @@ describe Slather::Project do
     end
   end
 
+  describe "#dedupe" do
+    it "should return a deduplicated list of coverage files, favoring the file with higher coverage" do
+      coverage_file_1 = double(Slather::CoverageFile)
+      coverage_file_1.stub(:source_file_pathname).and_return("some/path/class1.m")
+      coverage_file_1.stub(:percentage_lines_tested).and_return(100)
+
+      coverage_file_2 = double(Slather::CoverageFile)
+      coverage_file_2.stub(:source_file_pathname).and_return("some/path/class2.m")
+      coverage_file_2.stub(:percentage_lines_tested).and_return(100)
+
+      coverage_file_2b = double(Slather::CoverageFile)
+      coverage_file_2b.stub(:source_file_pathname).and_return("some/path/class2.m")
+      coverage_file_2b.stub(:percentage_lines_tested).and_return(0)
+
+      coverage_files = [coverage_file_1, coverage_file_2, coverage_file_2b]
+      deduped_coverage_files = fixtures_project.send(:dedupe, coverage_files)
+      expect(deduped_coverage_files.size).to eq(2)
+      expect(deduped_coverage_files).to include(coverage_file_1)
+      expect(deduped_coverage_files).to include(coverage_file_2)
+    end
+  end
+
   describe "#configure_from_yml" do
     it "should configure all properties from the yml" do
       unstubbed_project = Slather::Project.open(FIXTURES_PROJECT_PATH)
       expect(unstubbed_project).to receive(:configure_build_directory_from_yml)
+      expect(unstubbed_project).to receive(:configure_source_directory_from_yml)
       expect(unstubbed_project).to receive(:configure_ignore_list_from_yml)
       expect(unstubbed_project).to receive(:configure_ci_service_from_yml)
       expect(unstubbed_project).to receive(:configure_coverage_service_from_yml)
@@ -140,6 +164,21 @@ describe Slather::Project do
     end
   end
 
+  describe "#configure_source_directory_from_yml" do
+    it "should set the source_directory if it has been provided in the yml and has not already been set" do
+      Slather::Project.stub(:yml).and_return({"source_directory" => "/some/path"})
+      fixtures_project.configure_source_directory_from_yml
+      expect(fixtures_project.source_directory).to eq("/some/path")
+    end
+
+    it "should not set the source_directory if it has already been set" do
+      Slather::Project.stub(:yml).and_return({"source_directory" => "/some/path"})
+      fixtures_project.source_directory = "/already/set"
+      fixtures_project.configure_source_directory_from_yml
+      expect(fixtures_project.source_directory).to eq("/already/set")
+    end
+  end
+
   describe "#configure_ci_service_from_yml" do
     it "should set the ci_service if it has been provided in the yml and has not already been set" do
       Slather::Project.stub(:yml).and_return({"ci_service" => "some_service"})
@@ -189,6 +228,14 @@ describe Slather::Project do
     end
   end
 
+  describe "#configure_ci_access_token_from_yml" do
+    it "should set the ci_access_token if it has been provided by the yml" do
+      Slather::Project.stub(:yml).and_return({"ci_access_token" => "abc123"})
+      expect(fixtures_project).to receive(:ci_access_token=).with("abc123")
+      fixtures_project.configure_ci_access_token_from_yml
+    end
+  end
+
   describe "#coverage_service=" do
     it "should extend Slather::CoverageService::Coveralls and set coverage_service = :coveralls if given coveralls" do
       expect(fixtures_project).to receive(:extend).with(Slather::CoverageService::Coveralls)
@@ -207,13 +254,13 @@ describe Slather::Project do
     end
   end
 
-  describe "#setup_for_coverage" do
+  describe "#slather_setup_for_coverage" do
     it "should enable the correct flags to generate test coverage on all of the build_configurations build settings" do
-      fixtures_project.setup_for_coverage
+      fixtures_project.slather_setup_for_coverage
       fixtures_project.build_configurations.each do |build_configuration|
         expect(build_configuration.build_settings["GCC_INSTRUMENT_PROGRAM_FLOW_ARCS"]).to eq("YES")
         expect(build_configuration.build_settings["GCC_GENERATE_TEST_COVERAGE_FILES"]).to eq("YES")
       end
     end
   end
-end
+end

data/spec/slather/slather_spec.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Slather do
+
+  describe "::prepare_pods" do
+    it "should setup the pods project for coverage" do
+      pods_mock = double(Object)
+      
+      installer_mock = double(Object)
+      project_mock = double(Xcodeproj::Project)
+      installer_mock.stub(:project).and_return(project_mock)
+      expect(project_mock).to receive(:slather_setup_for_coverage)
+
+      expect(pods_mock).to receive(:post_install).and_yield(installer_mock)
+
+      Slather.prepare_pods(pods_mock)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,6 @@ files:
 - lib/slather/coveralls_coverage_file.rb
 - lib/slather/project.rb
 - lib/slather/version.rb
-- scripts/travis.sh
 - slather.gemspec
 - spec/fixtures/fixtures.xcodeproj/project.pbxproj
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -151,6 +150,7 @@ files:
 - spec/slather/coverage_service/simple_output_spec.rb
 - spec/slather/fixtures.gcno
 - spec/slather/project_spec.rb
+- spec/slather/slather_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/marklarr/slather
 licenses:
@@ -194,5 +194,6 @@ test_files:
 - spec/slather/coverage_service/simple_output_spec.rb
 - spec/slather/fixtures.gcno
 - spec/slather/project_spec.rb
+- spec/slather/slather_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/scripts/travis.sh

@@ -1,2 +0,0 @@
-xcodebuild -project spec/fixtures/fixtures.xcodeproj/ -scheme fixtures -configuration Debug test
-bundle exec rspec