slather 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8096ea189a9cebaad5a72f45dce58fd1f9f6b284
-  data.tar.gz: 15d24647aeba911b4e194dd150ea9700335fe21c
+  metadata.gz: 5e27d1218948f82525f0b2ed8a6a98204b717fc1
+  data.tar.gz: bbaffb2b00075ab13a568ae40992d1cb09138e0f
 SHA512:
-  metadata.gz: 311d63ca7b84e89bbdda3f1f0a0d7063df7c2e890ca96bb9a81d3aead8263ee14a18b0264d506107600d0985cf4fa3519527d2808ea3a169b21b5d9ba4c739fc
-  data.tar.gz: e138521b5d249354893eb05c24a88edf245cf649d1c0338aa3e757721bd9e7127132ae5b84d456e1562b58ec7b32b1f574149763c74eb4e7b14d8d10e5cb7365
+  metadata.gz: 751fde31c23722c6c143ac0a1bd04421dcb9be6ef3074c97209667ac6e6da393b02dae0457ba36b9223f5d785657be191cba67336d9a960861a0089619bcd43c
+  data.tar.gz: 31953c5059db5e6197f6fc61fd2b7b1c6173f6c9a77a7dadd4888cf45cca8c88c7bb460271aa8529655c519bd8b90cba15ab84044d041245ac6a9c28b12d1606

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master
 
+## v2.3.0
+
+* Fixes broken fallback value of `input_format` inside `configure_input_format`  
+  [sbhklr](https://github.com/sbhklr)
+  [#233](https://github.com/SlatherOrg/slather/pull/233), [#232](https://github.com/SlatherOrg/slather/issues/232)
+
+* Add `--travispro` flag  
+  [sbhklr](https://github.com/sbhklr)
+  [#223](https://github.com/SlatherOrg/slather/pull/223), [#219](https://github.com/SlatherOrg/slather/issues/219)
+
+* Fixes silent failure in case of unsuccessful upload to Coveralls  
+  [sbhklr](https://github.com/sbhklr)
+  [#222](https://github.com/SlatherOrg/slather/pull/222), [#217](https://github.com/SlatherOrg/slather/issues/217)
+
 ## v2.2.1
 
 * Make `project.coverage_files` public  

data/lib/slather/command/coverage_command.rb

@@ -3,6 +3,7 @@ class CoverageCommand < Clamp::Command
   parameter "[PROJECT]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
 
   option ["--travis", "-t"], :flag, "Indicate that the builds are running on Travis CI"
+  option ["--travispro"], :flag, "Indicate that the builds are running on Travis Pro CI"
   option ["--circleci"], :flag, "Indicate that the builds are running on CircleCI"
   option ["--jenkins"], :flag, "Indicate that the builds are running on Jenkins"
   option ["--buildkite"], :flag, "Indicate that the builds are running on Buildkite"
@@ -73,6 +74,8 @@ class CoverageCommand < Clamp::Command
   def setup_service_name
     if travis?
       project.ci_service = :travis_ci
+    elsif travispro?
+      project.ci_service = :travis_pro
     elsif circleci?
       project.ci_service = :circleci
     elsif jenkins?

data/lib/slather/coverage_service/coveralls.rb

@@ -100,12 +100,22 @@ module Slather
         if ci_service == :travis_ci || ci_service == :travis_pro
           if travis_job_id
             if ci_service == :travis_ci
+              
+              if coverage_access_token.to_s.strip.length > 0
+                raise StandardError, "Access token is set. Uploading coverage data for public repositories doesn't require an access token."
+              end
+
               {
                 :service_job_id => travis_job_id,
                 :service_name => "travis-ci",
                 :source_files => coverage_files.map(&:as_json)
               }.to_json
-            elsif ci_service == :travis_pro
+            elsif ci_service == :travis_pro              
+
+              if coverage_access_token.to_s.strip.length == 0
+                raise StandardError, "Access token is not set. Uploading coverage data for private repositories requires an access token."
+              end
+
               {
                 :service_job_id => travis_job_id,
                 :service_name => "travis-pro",
@@ -172,7 +182,18 @@ module Slather
         begin
           f.write(coveralls_coverage_data)
           f.close
-          `curl -s --form json_file=@#{f.path} #{coveralls_api_jobs_path}`
+
+          curl_result = `curl -s --form json_file=@#{f.path} #{coveralls_api_jobs_path}`
+
+          if curl_result.is_a? String 
+            curl_result_json = JSON.parse(curl_result)          
+
+            if curl_result_json["error"]
+              error_message = curl_result_json["message"]
+              raise StandardError, "Error while uploading coverage data to Coveralls. CI Service: #{ci_service} Message: #{error_message}"
+            end
+          end
+
         rescue StandardError => e
           FileUtils.rm(f)
           raise e

data/lib/slather/project.rb

@@ -277,7 +277,7 @@ module Slather
     end
 
     def configure_input_format
-      self.input_format ||= self.class.yml["input_format"] || input_format
+      self.input_format ||= (self.class.yml["input_format"] || "auto")
     end
 
     def input_format=(format)

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.2.1' unless defined?(Slather::VERSION)
+  VERSION = '2.3.0' unless defined?(Slather::VERSION)
 end

data/slather.gemspec

@@ -28,6 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.5.1"
 
   spec.add_dependency "clamp", "~> 0.6"
-  spec.add_dependency "xcodeproj", "~> 1.1"
+  spec.add_dependency "xcodeproj", "< 2.0.0", ">= 0.20"
   spec.add_dependency "nokogiri", "~> 1.6.3"
+
+  ## Version 5 needs Ruby 2.2, so we specify an upper bound to stay compatible with system ruby
+  spec.add_runtime_dependency 'activesupport', '>= 4.0.2', '< 5'
 end

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -41,6 +41,12 @@ describe Slather::CoverageService::Coveralls do
         allow(fixtures_project).to receive(:travis_job_id).and_return(nil)
         expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
       end
+
+      it "should raise an error if there is a COVERAGE_ACCESS_TOKEN" do        
+        allow(fixtures_project).to receive(:coverage_access_token).and_return("abc123")
+        expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
+      end
+
     end
 
     context "coverage_service is :travis_pro" do
@@ -57,6 +63,12 @@ describe Slather::CoverageService::Coveralls do
         allow(fixtures_project).to receive(:travis_job_id).and_return(nil)
         expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
       end
+
+      it "should raise an error if there is no COVERAGE_ACCESS_TOKEN" do        
+        allow(fixtures_project).to receive(:coverage_access_token).and_return("")
+        expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
+      end
+
     end
 
     context "coverage_service is :circleci" do
@@ -143,6 +155,13 @@ describe Slather::CoverageService::Coveralls do
         fixtures_project.post
       end
 
+      it "should save the coveralls_coverage_data to a file, post it to coveralls, and fail due to a Coveralls error" do
+        allow(fixtures_project).to receive(:travis_job_id).and_return("9182")
+        allow(fixtures_project).to receive(:`).and_return("{\"message\":\"Couldn't find a repository matching this job.\",\"error\":true}")
+        expect(fixtures_project).to receive(:`).once
+        expect { fixtures_project.post }.to raise_error(StandardError)        
+      end
+
       it "should always remove the coveralls_json_file after it's done" do
         allow(fixtures_project).to receive(:`)
         allow(fixtures_project).to receive(:travis_job_id).and_return("9182")

data/spec/slather/project_spec.rb

@@ -394,6 +394,28 @@ describe Slather::Project do
 
   end
 
+  describe "#configure_input_format" do
+    it "should set the input_format if it has been provided by the yml" do
+      allow(Slather::Project).to receive(:yml).and_return({"input_format" => "gcov"})
+      fixtures_project.configure_input_format
+      expect(fixtures_project.input_format).to eq("gcov")
+    end
+
+    it "should default the input_format to auto if nothing is provided in the yml" do
+      allow(Slather::Project).to receive(:yml).and_return({})
+      expect(fixtures_project).to receive(:input_format=).with("auto")
+      fixtures_project.configure_input_format
+    end
+
+    it "should not set the input_format if it has already been set" do
+      allow(Slather::Project).to receive(:yml).and_return({"input_format" => "some_format" })
+      fixtures_project.input_format = "gcov"
+      expect(fixtures_project).to_not receive(:input_format=)
+      fixtures_project.configure_input_format
+    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: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,16 +154,22 @@ dependencies:
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +184,26 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 description: 
 email:
 - mark@venmo.com
@@ -289,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Test coverage reports for Xcode projects