slather 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTQzZDA5ZDdiZGE5ODkwZDYyMDg5NjQ1NjQ5ODI1NDI2OGRmZDJjOA==
+    ZmQ4NmM0NmNjYWQ3Yjc0NjgzN2Q5ODA0NzVhYmM2M2QxMTMzZGQ1ZA==
   data.tar.gz: !binary |-
-    NGRhN2I1Yjk5ZDgzZTgxYWIwNWI1MjQyNjhjNTE3OGYwZjdjMjQyNg==
+    OTQwNTNlMTM3MjFhMjBiMzI3ZDQxZjUyODRiYWM4ZDU3MGVjMTBjYg==
 SHA512:
   metadata.gz: !binary |-
-    NTE3MWUwOGE0MGQxZGQ4M2VmOTA1YjRhZTY1NDVhMzE5YzE2OGRiYzFhZTZi
-    ZjYwZDVhODZmNTVkYWE4ZjUwZmZmOWI5ZjEzOWEwYmRkMDI5NTNiNzUyYjU1
-    MWQzYzAyNTM1ZmU1MWYzZmM5YzE0NzQzNDI1ZDM5OGUyMDI1YWI=
+    NjRhYzYyNGVkMDgwMDliYmJhMDVlNWEyNTUyYTg5YWQ0OTFiMTA2OGJiMDQ1
+    YzYxYmMyODE1MDEyNGQ0MzY1ZGUzOTdjNWU0NjQ1MTM5OTBiZThmODg2MjVi
+    MzU3M2JlZTQ1M2Y4NTFhYmQ5MGI0MGU1NWM0YTg0YjYxMjViN2U=
   data.tar.gz: !binary |-
-    ZmFjMTcxZjBkN2ZiMzk5OWMxNWY2OGJkZTZhZmIwZTY5ZGNmMDVhNDIzNzI5
-    ODc3NjcxOTdkZWE5ODc1NDcxNzcxNWExNTNiYTY2NTc1ODIyNjE5MTI0YWNi
-    MzM4YzgyODM0OTc5YjgzMjM0MDQzNDllNjdhMTkxYzQxNWQ4ZmI=
+    NDRlMGE4ZWM2YjZkNWE3YzBkMGZlZWMxMmE4OTAyN2E4MTE2NTE1YjQyMTVh
+    NTRmZmNmMWFiNWRmZmVjMDY3NTQ3NmNjZjc3OTU2NmVhZWY1NThhYjYzMTc4
+    NDY2ZDM2MWFiMWFhYTQ0M2E3YzE3ZWU4MzFkMzQzNmZmMzg1ZWI=

data/bin/slather

@@ -7,14 +7,14 @@ Clamp do
 
   self.default_subcommand = "coverage"
 
-  subcommand "coverage", "Computes coverage for the supplised project" do
+  subcommand "coverage", "Computes coverage for the supplied project" do
 
     parameter "[xcodeproj]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
 
     option ["--travis", "-t"], :flag, "Indicate that the builds are running on Travis CI"
 
     option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
-    option ["--simple-output", "-s"], :flag, "Post coverage results to coveralls"
+    option ["--simple-output", "-s"], :flag, "Output coverage results to the terminal"
 
     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."
@@ -88,4 +88,4 @@ Clamp do
     end
 
   end
-end
+end

data/lib/slather/coverage_file.rb

@@ -42,8 +42,10 @@ module Slather
         # Sometimes gcov makes gcov files for Cocoa Touch classes, like NSRange. Ignore and delete later.
         gcov_files_created = gcov_output.scan(/creating '(.+\..+\.gcov)'/)
 
-        gcov_file = File.new("./#{source_file_pathname.basename}.gcov")
-        gcov_data = gcov_file.read
+        gcov_file_name = "./#{source_file_pathname.basename}.gcov"
+        if File.exists?(gcov_file_name)
+          gcov_data = File.new(gcov_file_name).read
+        end
 
         gcov_files_created.each { |file| FileUtils.rm(file) }
 
@@ -52,10 +54,14 @@ module Slather
     end
 
     def coverage_data
-      first_line_start = gcov_data =~ /^\s+(-|#+|[0-9+]):\s+1:/
+      if gcov_data
+        first_line_start = gcov_data =~ /^\s+(-|#+|[0-9+]):\s+1:/
 
-      gcov_data[first_line_start..-1].split("\n").map do |line|
-        coverage_for_line(line)
+        gcov_data[first_line_start..-1].split("\n").map do |line|
+          coverage_for_line(line)
+        end
+      else
+        []
       end
     end
 

data/lib/slather/coverage_service/coveralls.rb

@@ -13,22 +13,13 @@ module Slather
       private :travis_job_id
 
       def coveralls_coverage_data
-        if ci_service == :travis_ci || ci_service == :travis_pro
+        if ci_service == :travis_ci
           if travis_job_id
-            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
+            {
+              :service_job_id => travis_job_id,
+              :service_name => "travis-ci",
+              :source_files => coverage_files.map(&:as_json)
+            }.to_json
           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, :ci_access_token, :source_directory
+    attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service, :source_directory
 
     alias_method :setup_for_coverage, :slather_setup_for_coverage
 
@@ -70,7 +70,6 @@ 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
     end
@@ -99,10 +98,6 @@ 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.2.0"
+  VERSION = "1.2.1"
 end

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -36,21 +36,6 @@ 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/project_spec.rb

@@ -228,14 +228,6 @@ 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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,4 +196,3 @@ test_files:
 - spec/slather/project_spec.rb
 - spec/slather/slather_spec.rb
 - spec/spec_helper.rb
-has_rdoc: