slather 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b74146844eaeb36f2504f1b3d68e590a5e10144d
-  data.tar.gz: baed92208b8cba0525eb4c7ed9a0089f5f6d28de
+  metadata.gz: c81c8298dd7e5d03d440067813e42429f437f230
+  data.tar.gz: 01deae864fd161f898c75d90b8c7eaab9bf4d4b5
 SHA512:
-  metadata.gz: 12c63ac37efb3a93bff26f71990a532ce0bc93d98fdca7f637e214b3eb7bdcaf67ad400a57f933241cf01e66f7db32a42d4971c21c9ddd69678cc69cb639384a
-  data.tar.gz: be09f2c02c71ca463bab39d56515b2d5de22d54ab3546950dd370a05daf5618f264cf4aeb46d02d5bd52d06cc5a121b792d524f1a5bcc75a68dd97cb6f4c563d
+  metadata.gz: fb215d533208cd99d38b18481bb11e91dc40a6db8e5e43d601229d26108d56e5fef118cc2d3aa3296459c7e7adaad8d2bc5d5886a852c30e219a1c7114ede654
+  data.tar.gz: a630985a0f07c4d32e158246f43e5c6e2cc2296e6944020a0f2db716d17d846256c6be4b30417e6dcf09d9bb64cc7435f9ad5ec116d8d3bb2a1797556f9f6865

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## v1.6.0
+
+* Add an option to define the output directory for cobertura xml reports  
+  [Julian Krumow](https://github.com/tarbrain)
+  [#37](https://github.com/venmo/slather/pull/37)
+
 ## v1.5.1
 
 * Avoid crashes when coverage data is empty

data/README.md

@@ -72,24 +72,39 @@ install: bundle install --without=documentation --path ../travis_bundle_dir
 after_success: slather
 ```
 
+#### Travis CI Pro
+
+To use Coveralls with Travis CI Pro (for private repos), add following lines along with other settings to `.slather.yml`:
+
+```yml
+# .slather.yml
+
+ci_service: travis_pro
+ci_access_token: <YOUR ACCESS TOKEN>
+```
+
+Repo token can be found at https://coveralls.io/ repo page.
+
 ### Cobertura
 
-To create a Cobertura XML report set `cobertura_xml` as coverage service inside your `.slather.yml`:
+To create a Cobertura XML report set `cobertura_xml` as coverage service inside your `.slather.yml`. Optionally you can define an output directory for the XML report:
 
 ```yml
 # .slather.yml
 
 coverage_service: cobertura_xml
 xcodeproj: path/to/project.xcodeproj
+source_directory: path/to/sources/to/include
+output_directory: path/to/xml_report
 ignore:
   - ExamplePodCode/*
   - ProjectTestsGroup/*
 ```
 
-Or use the command line options `--cobertura-xml` or `-x`:
+Or use the command line options `--cobertura-xml` or `-x` and `--output_directory`:
 
 ```sh
-$ slather coverage -x
+$ slather coverage -x --output-directory path/to/xml_report
 ```
 
 ### Coverage for code included via CocoaPods

data/bin/slather

@@ -20,6 +20,7 @@ Clamp do
 
     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
 
     def execute
@@ -29,6 +30,7 @@ Clamp do
       setup_ignore_list
       setup_build_directory
       setup_source_directory
+      setup_output_directory
       setup_coverage_service
 
       post
@@ -44,6 +46,10 @@ Clamp do
       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

data/lib/slather/coverage_service/cobertura_xml_output.rb

@@ -11,9 +11,16 @@ module Slather
 
       def post
         cobertura_xml_report = create_xml_report(coverage_files)
-        File.open('cobertura.xml', 'w') { |file|
-          file.write(cobertura_xml_report.to_s)
-        }
+        store_report(cobertura_xml_report)
+      end
+
+      def store_report(report)
+        output_file = 'cobertura.xml'
+        if output_directory
+          FileUtils.mkdir_p(output_directory)
+          output_file = File.join(output_directory, output_file)
+        end
+        File.write(output_file, report.to_s)
       end
 
       def grouped_coverage_files

data/lib/slather/coverage_service/coveralls.rb

@@ -13,13 +13,22 @@ module Slather
       private :travis_job_id
 
       def coveralls_coverage_data
-        if ci_service == :travis_ci
+        if ci_service == :travis_ci || ci_service == :travis_pro
           if travis_job_id
-            {
-              :service_job_id => travis_job_id,
-              :service_name => "travis-ci",
-              :source_files => coverage_files.map(&:as_json)
-            }.to_json
+            if ci_service == :travis_ci
+              {
+                :service_job_id => travis_job_id,
+                :service_name => "travis-ci",
+                :source_files => coverage_files.map(&:as_json)
+              }.to_json
+            elsif ci_service == :travis_pro
+              {
+                :service_job_id => travis_job_id,
+                :service_name => "travis-pro",
+                :repo_token => ci_access_token,
+                :source_files => coverage_files.map(&:as_json)
+              }.to_json
+            end
           else
             raise StandardError, "Environment variable `TRAVIS_JOB_ID` not set. Is this running on a travis build?"
           end

data/lib/slather/project.rb

@@ -19,7 +19,7 @@ end
 module Slather
   class Project < Xcodeproj::Project
 
-    attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service, :source_directory
+    attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service, :ci_access_token, :source_directory, :output_directory
 
     alias_method :setup_for_coverage, :slather_setup_for_coverage
 
@@ -70,8 +70,10 @@ module Slather
       configure_build_directory_from_yml
       configure_ignore_list_from_yml
       configure_ci_service_from_yml
+      configure_ci_access_token_from_yml
       configure_coverage_service_from_yml
       configure_source_directory_from_yml
+      configure_output_directory_from_yml
     end
 
     def configure_build_directory_from_yml
@@ -82,6 +84,10 @@ module Slather
       self.source_directory ||= self.class.yml["source_directory"] if self.class.yml["source_directory"]
     end
 
+    def configure_output_directory_from_yml
+      self.output_directory ||= self.class.yml["output_directory"] if self.class.yml["output_directory"]
+    end
+
     def configure_ignore_list_from_yml
       self.ignore_list ||= [(self.class.yml["ignore"] || [])].flatten
     end
@@ -98,6 +104,10 @@ module Slather
       self.coverage_service ||= (self.class.yml["coverage_service"] || :terminal)
     end
 
+    def configure_ci_access_token_from_yml
+      self.ci_access_token ||= (self.class.yml["ci_access_token"] || "")
+    end
+
     def coverage_service=(service)
       service = service && service.to_sym
       if service == :coveralls

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

data/slather.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "pry", "~> 0.9"
   spec.add_development_dependency "cocoapods", "~> 0.34"
+  spec.add_development_dependency "json_spec", "~> 1.1.4"
 
   spec.add_dependency "clamp", "~> 0.6"
   spec.add_dependency "xcodeproj", "~> 0.19.2"

data/spec/slather/coverage_file_spec.rb

@@ -12,7 +12,7 @@ describe Slather::CoverageFile do
 
   describe "#initialize" do
     it "should convert the provided path string to a Pathname object, and set it as the gcno_file_pathname" do
-      expect(coverage_file.gcno_file_pathname.exist?).to be_truthy
+      expect(coverage_file.gcno_file_pathname).to be_exist
       expect(coverage_file.gcno_file_pathname.basename.to_s).to eq("fixtures.gcno")
     end
   end
@@ -43,7 +43,7 @@ describe Slather::CoverageFile do
   describe "#source_file" do
     it "should return a file object for the source_file_pathname" do
       file = coverage_file.source_file
-      expect(file.kind_of?(File)).to be_truthy
+      expect(file).to be_a File
       expect(Pathname(file.path)).to eq(coverage_file.source_file_pathname)
     end
   end
@@ -94,18 +94,18 @@ OBJC
   describe "#ignored" do
     it "should return true if the source_file_pathname globs against anything in the project.ignore_list" do
       coverage_file.project.ignore_list = ["*spec*", "*test*"]
-      expect(coverage_file.ignored?).to be_truthy
+      expect(coverage_file).to be_ignored
     end
 
     it "should return false if the source_file_pathname does not glob against anything in the project.ignore_list" do
       coverage_file.project.ignore_list = ["*test*", "*XCTest*"]
-      expect(coverage_file.ignored?).to be_falsy
+      expect(coverage_file).not_to be_ignored
     end
   end
 
   describe "gcov_data" do
     it "should process the gcno file with gcov and return the contents of the file" do
-      expect(coverage_file.gcov_data.include?("1:   15:    NSLog(@\"tested\");")).to be_truthy
+      expect(coverage_file.gcov_data).to include("1:   15:    NSLog(@\"tested\");")
     end
   end
 

data/spec/slather/coverage_service/cobertura_xml_spec.rb

@@ -34,5 +34,15 @@ describe Slather::CoverageService::CoberturaXmlOutput do
       
       File.unlink('cobertura.xml')
     end
+
+    it "should create an XML report in the given output directory" do
+      fixtures_project.output_directory = "./output"
+      fixtures_project.post
+      
+      filepath = "#{fixtures_project.output_directory}/cobertura.xml"
+      expect(File.exists?(filepath)).to be_truthy
+
+      FileUtils.rm_rf(fixtures_project.output_directory)
+    end
   end
 end

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -27,7 +27,24 @@ describe Slather::CoverageService::Coveralls do
 
       it "should return valid json for coveralls coverage data" do
         fixtures_project.stub(:travis_job_id).and_return("9182")
-        expect(fixtures_project.send(:coveralls_coverage_data)).to eq("{\"service_job_id\":\"9182\",\"service_name\":\"travis-ci\",\"source_files\":[{\"name\":\"spec/fixtures/fixtures/more_files/Branches.m\",\"source\":\"//\\n//  Branches.m\\n//  fixtures\\n//\\n//  Created by Julian Krumow on 11.10.14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import \\\"Branches.h\\\"\\n\\n@implementation Branches\\n\\n- (void)branches:(BOOL)goIf skipBranches:(BOOL)skipBranches\\n{\\n    if (goIf) {\\n        NSLog(@\\\"foo.\\\");\\n        \\n        if (!skipBranches) {\\n            NSLog(@\\\"not skipped.\\\");\\n        }\\n    } else {\\n        NSLog(@\\\"bar.\\\");\\n    }\\n    \\n    int i = 5;\\n    if (i == 5) {\\n        return;\\n    }\\n    switch (i) {\\n        case 0:\\n            NSLog(@\\\"0\\\");\\n            break;\\n            \\n        case 1:\\n            NSLog(@\\\"1\\\");\\n            break;\\n        case 5:\\n            NSLog(@\\\"5\\\");\\n            break;\\n        default:\\n            break;\\n    }\\n}\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,2,null,2,1,null,1,0,0,1,1,null,null,2,2,2,null,0,null,0,0,null,null,0,0,null,0,0,null,0,null,2,null,null]},{\"name\":\"spec/fixtures/fixtures/more_files/Empty.m\",\"source\":\"//\\n//  Empty.m\\n//  fixtures\\n//\\n//  Created by Julian Krumow on 27.10.14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import \\\"Empty.h\\\"\\n\\n@implementation Empty\\n\\n@end\\n\",\"coverage\":[]},{\"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/BranchesTests.m\",\"source\":\"//\\n//  BranchesTests.m\\n//  fixtures\\n//\\n//  Created by Julian Krumow on 11.10.14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import <XCTest/XCTest.h>\\n#import \\\"Branches.h\\\"\\n\\n@interface BranchesTests : XCTestCase\\n\\n@end\\n\\n@implementation BranchesTests\\n\\n- (void)setUp {\\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    // 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)testBranchesNoBranches {\\n    Branches *branches = [[Branches alloc] init];\\n    [branches branches:NO skipBranches:NO];\\n}\\n\\n- (void)testBranchesFirstBranchAndSkip {\\n    Branches *branches = [[Branches alloc] init];\\n    [branches branches:YES skipBranches:YES];\\n}\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,2,null,2,null,null,null,2,2,null,null,1,1,1,null,null,1,1,1,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]}]}")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql("{\"service_job_id\":\"9182\",\"service_name\":\"travis-ci\"}").excluding("source_files")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql(fixtures_project.send(:coverage_files).map(&:as_json).to_json).at_path("source_files")
+      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
+
+    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 be_json_eql("{\"service_job_id\":\"9182\",\"service_name\":\"travis-pro\",\"repo_token\":\"abc123\"}").excluding("source_files")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql(fixtures_project.send(:coverage_files).map(&:as_json).to_json).at_path("source_files")
       end
 
       it "should raise an error if there is no TRAVIS_JOB_ID" do
@@ -47,7 +64,7 @@ describe Slather::CoverageService::Coveralls do
       fixtures_project.stub(:travis_job_id).and_return("9182")
       expect(fixtures_project).to receive(:`) do |cmd|
         expect(cmd).to eq("curl -s --form json_file=@coveralls_json_file https://coveralls.io/api/v1/jobs")
-        expect(File.open('coveralls_json_file', 'r').read).to eq("{\"service_job_id\":\"9182\",\"service_name\":\"travis-ci\",\"source_files\":[{\"name\":\"spec/fixtures/fixtures/more_files/Branches.m\",\"source\":\"//\\n//  Branches.m\\n//  fixtures\\n//\\n//  Created by Julian Krumow on 11.10.14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import \\\"Branches.h\\\"\\n\\n@implementation Branches\\n\\n- (void)branches:(BOOL)goIf skipBranches:(BOOL)skipBranches\\n{\\n    if (goIf) {\\n        NSLog(@\\\"foo.\\\");\\n        \\n        if (!skipBranches) {\\n            NSLog(@\\\"not skipped.\\\");\\n        }\\n    } else {\\n        NSLog(@\\\"bar.\\\");\\n    }\\n    \\n    int i = 5;\\n    if (i == 5) {\\n        return;\\n    }\\n    switch (i) {\\n        case 0:\\n            NSLog(@\\\"0\\\");\\n            break;\\n            \\n        case 1:\\n            NSLog(@\\\"1\\\");\\n            break;\\n        case 5:\\n            NSLog(@\\\"5\\\");\\n            break;\\n        default:\\n            break;\\n    }\\n}\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,2,null,2,1,null,1,0,0,1,1,null,null,2,2,2,null,0,null,0,0,null,null,0,0,null,0,0,null,0,null,2,null,null]},{\"name\":\"spec/fixtures/fixtures/more_files/Empty.m\",\"source\":\"//\\n//  Empty.m\\n//  fixtures\\n//\\n//  Created by Julian Krumow on 27.10.14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import \\\"Empty.h\\\"\\n\\n@implementation Empty\\n\\n@end\\n\",\"coverage\":[]},{\"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/BranchesTests.m\",\"source\":\"//\\n//  BranchesTests.m\\n//  fixtures\\n//\\n//  Created by Julian Krumow on 11.10.14.\\n//  Copyright (c) 2014 marklarr. All rights reserved.\\n//\\n\\n#import <XCTest/XCTest.h>\\n#import \\\"Branches.h\\\"\\n\\n@interface BranchesTests : XCTestCase\\n\\n@end\\n\\n@implementation BranchesTests\\n\\n- (void)setUp {\\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    // 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)testBranchesNoBranches {\\n    Branches *branches = [[Branches alloc] init];\\n    [branches branches:NO skipBranches:NO];\\n}\\n\\n- (void)testBranchesFirstBranchAndSkip {\\n    Branches *branches = [[Branches alloc] init];\\n    [branches branches:YES skipBranches:YES];\\n}\\n\\n@end\\n\",\"coverage\":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,2,null,2,null,null,null,2,2,null,null,1,1,1,null,null,1,1,1,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]}]}")
+        expect(File.read('coveralls_json_file')).to be_json_eql(fixtures_project.send(:coveralls_coverage_data))
       end.once
       fixtures_project.post
     end

data/spec/slather/coverage_service/gutter_json_spec.rb

@@ -18,13 +18,10 @@ describe Slather::CoverageService::GutterJsonOutput do
     it "should print out the coverage for each file, and then total coverage" do
       fixtures_project.post
 
-      fixture_json = JSON.parse(File.read(FIXTURES_JSON_PATH))
-      fixture_json['meta']['timestamp'] = ''
+      fixture_json = File.read(FIXTURES_JSON_PATH)
+      current_json = File.read('.gutter.json')
 
-      current_json = JSON.parse(File.read('.gutter.json'))
-      current_json['meta']['timestamp'] = ''
-
-      expect(current_json).to eq(fixture_json)
+      expect(current_json).to be_json_eql(fixture_json)
       File.unlink('.gutter.json')
     end
   end

data/spec/slather/coverage_service/simple_output_spec.rb

@@ -15,14 +15,17 @@ describe Slather::CoverageService::SimpleOutput do
 
   describe '#post' do
     it "should print out the coverage for each file, and then total coverage" do
-      expect(fixtures_project).to receive(:puts).with("spec/fixtures/fixtures/fixtures.m: 2 of 4 lines (50.00%)")
-      expect(fixtures_project).to receive(:puts).with("spec/fixtures/fixtures/more_files/peekaview.m: 0 of 6 lines (0.00%)")
-      expect(fixtures_project).to receive(:puts).with("spec/fixtures/fixtures/more_files/Branches.m: 10 of 20 lines (50.00%)")
-      expect(fixtures_project).to receive(:puts).with("spec/fixtures/fixtures/more_files/Empty.m: 0 of 0 lines (0.00%)")
-      expect(fixtures_project).to receive(:puts).with("spec/fixtures/fixturesTests/fixturesTests.m: 7 of 7 lines (100.00%)")
-      expect(fixtures_project).to receive(:puts).with("spec/fixtures/fixturesTests/peekaviewTests.m: 6 of 6 lines (100.00%)")
-      expect(fixtures_project).to receive(:puts).with("spec/fixtures/fixturesTests/BranchesTests.m: 10 of 10 lines (100.00%)")
-      expect(fixtures_project).to receive(:puts).with("Test Coverage: 66.04%")
+      ["spec/fixtures/fixtures/fixtures.m: 2 of 4 lines (50.00%)",
+      "spec/fixtures/fixtures/more_files/peekaview.m: 0 of 6 lines (0.00%)",
+      "spec/fixtures/fixtures/more_files/Branches.m: 10 of 20 lines (50.00%)",
+      "spec/fixtures/fixtures/more_files/Empty.m: 0 of 0 lines (0.00%)",
+      "spec/fixtures/fixturesTests/fixturesTests.m: 7 of 7 lines (100.00%)",
+      "spec/fixtures/fixturesTests/peekaviewTests.m: 6 of 6 lines (100.00%)",
+      "spec/fixtures/fixturesTests/BranchesTests.m: 10 of 10 lines (100.00%)",
+      "Test Coverage: 66.04%"].each do |line|
+        expect(fixtures_project).to receive(:puts).with(line)
+      end
+
       fixtures_project.post
     end
   end

data/spec/slather/project_spec.rb

@@ -179,6 +179,21 @@ describe Slather::Project do
     end
   end
 
+  describe "#configure_output_directory_from_yml" do
+    it "should set the output_directory if it has been provided in the yml and has not already been set" do
+      Slather::Project.stub(:yml).and_return({"output_directory" => "/some/path"})
+      fixtures_project.configure_output_directory_from_yml
+      expect(fixtures_project.output_directory).to eq("/some/path")
+    end
+
+    it "should not set the output_directory if it has already been set" do
+      Slather::Project.stub(:yml).and_return({"output_directory" => "/some/path"})
+      fixtures_project.output_directory = "/already/set"
+      fixtures_project.configure_output_directory_from_yml
+      expect(fixtures_project.output_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"})
@@ -228,6 +243,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)

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ Bundler.setup
 require 'slather'
 require 'pry'
 require 'coveralls'
+require 'json_spec'
 
 Coveralls.wear!
 
@@ -16,3 +17,7 @@ RSpec.configure do |config|
     FileUtils.rm_rf(Dir[File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/fixture*"].first)
   end
 end
+
+JsonSpec.configure do
+  exclude_keys "timestamp"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.34'
+- !ruby/object:Gem::Dependency
+  name: json_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement