slather 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac517dd878eb5bce60aab2496af9a66e559aa65
-  data.tar.gz: e1738148431be3032b3071ff1401454d3eb1144c
+  metadata.gz: 4f112ecdd585fc0e1ec5d2a20e10b9ab38a3a355
+  data.tar.gz: a10bcd0d9036bb4e66ca5dd91cf6d874ca667b6e
 SHA512:
-  metadata.gz: 076afcb5a6290f350808eb3d5e7f82ff140ef063f103c97dddca0a300f5ecca92a2ef7f3a4c35c6e9596860525a3da8692e12d97a3a506fc2a78a45fa7fed664
-  data.tar.gz: 590e5c5eed3b6148b8baf39328de21cb9a2f3b2f5647d66ed207e33a3d0df917dbe7b480cdcd472bd0a473d750da9581972d5b96e344b4ee57d0a5aaa0bad209
+  metadata.gz: 46cf336e773f273f6e0ac10131028725f6a5d908dd86315d7615c89bdc9d2a113d4cb271bb1ba511626300c7d952c995284cbd2671a1527c26ff0cc5c44e8090
+  data.tar.gz: fc30e49d6dbd3c0589830aa80ef8d0942f17574b5fb4c57ec0bfaa611e09a62eb79e626557031ce09fba11c79407bfa97734991dd78309452fb87c9e7af6d256

data/CHANGELOG.md

@@ -2,9 +2,17 @@
 
 ## master
 
+## v1.8.2
+* Add buildkite support to coveralls   
+  [David Hardiman](https://github.com/dhardiman)
+  [#98](https://github.com/venmo/slather/pull/98)
+* Update to xcodeproj 0.28.0 to avoid collisions with Cocoapods 0.39.0   
+  [Julian Krumow](https://github.com/tarbrain)   
+  [#106](https://github.com/venmo/slather/pull/106)/[#109](https://github.com/venmo/slather/pull/109)
+
 ## v1.8.1
 * Fixed dependency conflict with CocoaPods v0.38
-* Updated usage of cocoapods plugin API since it has changed in v0.38
+* Updated usage of cocoapods plugin API since it has changed in v0.38   
   [Julian Krumow](https://github.com/tarbrain)
   [#95](https://github.com/venmo/slather/pull/95)
 

data/README.md

@@ -14,7 +14,6 @@ Generate test coverage reports for Xcode projects & hook it into CI.
 | ------- |:--------:|
 | [Parsimmon](https://github.com/ayanonagon/Parsimmon) | [![Parsimmon Coverage](https://coveralls.io/repos/ayanonagon/Parsimmon/badge.svg?branch=master)](https://coveralls.io/r/ayanonagon/Parsimmon?branch=master) |
 | [VENCore](https://github.com/venmo/VENCore) | [![VENCore Coverage](https://coveralls.io/repos/venmo/VENCore/badge.svg?branch=master)](https://coveralls.io/r/venmo/VENCore?branch=master) |
-| [CGFloatType](https://github.com/kylef/CGFloatType) | [![CGFloatType Coverage](https://coveralls.io/repos/kylef/CGFloatType/badge.svg?branch=master)](https://coveralls.io/r/kylef/CGFloatType?branch=master) |
 | [DAZABTest](https://github.com/dasmer/DAZABTest) | [![DAZABTest Coverage](https://coveralls.io/repos/dasmer/DAZABTest/badge.svg?branch=master)](https://coveralls.io/r/dasmer/DAZABTest?branch=master) |
 | [TBStateMachine](https://github.com/tarbrain/TBStateMachine) | [![TBStateMachine Coverage](https://coveralls.io/repos/tarbrain/TBStateMachine/badge.svg?branch=master)](https://coveralls.io/r/tarbrain/TBStateMachine?branch=master) |
 
@@ -76,7 +75,7 @@ before_install: rvm use $RVM_RUBY_VERSION
 install: bundle install --without=documentation --path ../travis_bundle_dir
 after_success: 
   - slather
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash) -f path/to/xml_report/cobertura.xml
 ```
 
 ```yml
@@ -162,13 +161,13 @@ $ slather coverage -x --output-directory path/to/xml_report
 
 ### Static HTML
 
-To create a report as static html pages, use the command line options `--html` or `-h`:
+To create a report as static html pages, use the command line options `--html`:
 
 ```sh
-$ slather coverage -h path/to/project.xcodeproj
+$ slather coverage --html path/to/project.xcodeproj
 ```
 
-This will make a directory called `html` in your directory (unless output directory is specified) and generate all the static html pages inside the directory.
+This will make a directory named `html` in your root directory (unless `--output-directory` is specified) and will generate all the reports as static html pages inside the directory. It will print out the report's path by default, but you can also specify `--show` flag to open it in your browser automatically.
 
 ### Coverage for code included via CocoaPods
 
@@ -203,5 +202,5 @@ Please make sure to follow our general coding style and add test coverage for ne
 * [@tpoulos](https://github.com/tpoulos), the perfect logo.
 * [@ayanonagon](https://github.com/ayanonagon) and [@kylef](https://github.com/kylef), feedback and testing.
 * [@jhersh](https://github.com/jhersh), CircleCI support.
-* [@ixnixnixn](https://github.com/ixnixnixn), html support.
 * [@tarbrain](https://github.com/tarbrain), Cobertura support and bugfixing.
+* [@ikhsan](https://github.com/ikhsan), html support.

data/bin/slather

@@ -14,12 +14,13 @@ Clamp do
     option ["--travis", "-t"], :flag, "Indicate that the builds are running on Travis 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"
 
     option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
     option ["--simple-output", "-s"], :flag, "Output coverage results to the terminal"
     option ["--gutter-json", "-g"], :flag, "Output coverage results as Gutter JSON format"
     option ["--cobertura-xml", "-x"], :flag, "Output coverage results as Cobertura XML format"
-    option ["--html", "-h"], :flag, "Output coverage results as static html pages"
+    option ["--html"], :flag, "Output coverage results as static html pages"
     option ["--show"], :flag, "Indicate that the static html pages will open automatically"
 
     option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
@@ -65,6 +66,8 @@ Clamp do
         project.ci_service = :circleci
       elsif jenkins?
         project.ci_service = :jenkins
+      elsif buildkite?
+        project.ci_service = :buildkite
       end
     end
 

data/lib/slather/coverage_service/coveralls.rb

@@ -37,6 +37,16 @@ module Slather
       end
       private :jenkins_branch_name
 
+      def buildkite_job_id
+        ENV['BUILDKITE_BUILD_NUMBER']
+      end
+      private :buildkite_job_id
+
+      def buildkite_pull_request
+        ENV['BUILDKITE_PULL_REQUEST']
+      end
+      private :buildkite_pull_request
+
       def jenkins_git_info
         {
           head: {
@@ -66,6 +76,22 @@ module Slather
       end
       private :circleci_git_info
 
+      def buildkite_git_info
+        {
+          :head => {
+            :id => ENV['BUILDKITE_COMMIT'],
+            :author_name => (`git log --format=%an -n 1 HEAD`.chomp || ""),
+            :author_email => (`git log --format=%ae -n 1 HEAD`.chomp || ""),
+            :message => (`git log --format=%s -n 1 HEAD`.chomp || "")
+          },
+          :branch => ENV['BUILDKITE_BRANCH']
+        }
+      end
+
+      def buildkite_build_url
+        "https://buildkite.com/" + ENV['BUILDKITE_PROJECT_SLUG'] + "/builds/" + ENV['BUILDKITE_BUILD_NUMBER'] + "#"
+      end
+
       def coveralls_coverage_data
         if ci_service == :travis_ci || ci_service == :travis_pro
           if travis_job_id
@@ -117,6 +143,20 @@ module Slather
           else
             raise StandardError, "Environment variable `BUILD_ID` not set. Is this running on a jenkins build?"
           end
+        elsif ci_service == :buildkite
+          if buildkite_job_id
+            {
+              :service_job_id => buildkite_job_id,
+              :service_name => "buildkite",
+              :repo_token => coverage_access_token,
+              :source_files => coverage_files.map(&:as_json),
+              :git => buildkite_git_info,
+              :service_build_url => buildkite_build_url,
+              :service_pull_request => buildkite_pull_request
+            }.to_json
+          else
+            raise StandardError, "Environment variable `BUILDKITE_BUILD_NUMBER` not set. Is this running on a buildkite build?"
+          end
         else
           raise StandardError, "No support for ci named #{ci_service}"
         end
@@ -143,4 +183,4 @@ module Slather
 
     end
   end
-end
+end

data/lib/slather/project.rb

@@ -47,7 +47,7 @@ module Slather
       end.compact
 
       if coverage_files.empty?
-        raise StandardError, "No coverage files found. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.pbxproj`"
+        raise StandardError, "No coverage files found. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.xcodeproj`"
       else
         dedupe(coverage_files)
       end

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = "1.8.1"
+  VERSION = "1.8.3"
 end

data/slather.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "pry", "~> 0.9"
-  spec.add_development_dependency "cocoapods", "~> 0.38.0"
+  spec.add_development_dependency "cocoapods", "~> 0.39.0"
   spec.add_development_dependency "json_spec", "~> 1.1.4"
   spec.add_development_dependency "equivalent-xml", "~> 0.5.1"
 
   spec.add_dependency "clamp", "~> 0.6"
-  spec.add_dependency "xcodeproj", "~> 0.26.2"
+  spec.add_dependency "xcodeproj", "~> 0.28.0"
   spec.add_dependency "nokogiri", "~> 1.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.3
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement