Merge branch 'feature-temp-profdata' into feature-profdata

.gitignore

@@ -23,7 +23,6 @@ mkmf.log
 
 # Xcode
 #
-build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -41,3 +40,7 @@ DerivedData
 *.xcuserstate
 *.DS_Store
 cobertura.xml
+.gutter.json
+html
+*.gcda
+*.gcno

.travis.yml

@@ -1,5 +1,6 @@
 language: objective-c
 script: bundle exec rspec 
+osx_image: xcode7
 
 # Sets Travis to run the Ruby specs on OS X machines which are required to
 # build the native extensions of Xcodeproj.

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## master
 
+## v1.8.2
+* Add buildkite support to coveralls   
+  [David Hardiman](https://github.com/dhardiman)
+  [#98](https://github.com/venmo/slather/pull/98)
+
+
+## v1.8.1
+* Fixed dependency conflict with CocoaPods 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)
+
 ## v1.7.0
 * Objective-C++ support  
   [ben-ng](https://github.com/ben-ng)

README.md

@@ -49,6 +49,47 @@ To verify you're ready to generate test coverage, run your test suite on your pr
 $ slather coverage -s path/to/project.xcodeproj
 ```
 
+### Usage with Codecov
+
+Login to [Codecov](https://codecov.io/) (no need to activate a repository, this happens automatically). Right now, `slather` supports Codecov via **all** supported CI providers [listed here](https://github.com/codecov/codecov-bash#ci-providers).
+
+Make a `.slather.yml` file:
+
+```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/*
+```
+
+And then in your `.travis.yml`, `circle.yml` (or after test commands in other CI providers), call `slather` after a successful build:
+
+```yml
+# .travis.yml
+
+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) -f path/to/xml_report/cobertura.xml
+```
+
+```yml
+# circle.yml
+
+test:
+  post:
+    - bundle exec slather
+    - bash <(curl -s https://codecov.io/bash)
+```
+
+> Private repo? Add `-t :uuid-repo-token` to the codecov uploader. Read more about uploading report to Codecov [here](https://github.com/codecov/codecov-bash)
+
 ### Usage with Coveralls
 
 Login to [Coveralls](https://coveralls.io/) and enable your repository. Right now, `slather` supports Coveralls via [Travis CI](https://travis-ci.org) and [CircleCI](https://circleci.com).
@@ -113,12 +154,22 @@ ignore:
   - ProjectTestsGroup/*
 ```
 
-Or use the command line options `--cobertura-xml` or `-x` and `--output_directory`:
+Or use the command line options `--cobertura-xml` or `-x` and `--output-directory`:
 
 ```sh
 $ 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`:
+
+```sh
+$ slather coverage --html path/to/project.xcodeproj
+```
+
+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
 
 If you're trying to compute the coverage of code that has been included via
@@ -152,3 +203,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.
+* [@tarbrain](https://github.com/tarbrain), Cobertura support and bugfixing.
+* [@ikhsan](https://github.com/ikhsan), html support.

Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+desc 'Execute tests'
+task :spec do
+  sh 'bundle exec rspec spec'
+end
+