[Pkg-javascript-commits] [node-coveralls] 232/332: merge conflicts

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-coveralls.

commit d084add18e87fd1a292315de7c9eb171e8fd4b93
Merge: 712e6e4 d606358
Author: Nick Merwin <n at mer.io>
Date:   Thu Dec 10 12:52:55 2015 -0800

    merge conflicts

 .travis.yml                    |  6 ++++--
 README.md                      | 23 ++++++++++++++++-------
 lib/convertLcovToCoveralls.js  |  6 ++++++
 lib/detectLocalGit.js          |  2 +-
 lib/fetchGitData.js            |  2 +-
 lib/getOptions.js              | 22 ++++++++++++++++++----
 lib/handleInput.js             |  7 ++++---
 lib/sendToCoveralls.js         |  7 ++++++-
 package.json                   | 12 +++++++-----
 test/convertLcovToCoveralls.js |  2 ++
 test/getOptions.js             | 19 +++++++++++++++++++
 test/sendToCoveralls.js        | 31 +++++++++++++++++++++++++++++--
 12 files changed, 113 insertions(+), 26 deletions(-)

diff --cc README.md
index eb28744,ab20cc3..842c532
--- a/README.md
+++ b/README.md
@@@ -108,21 -108,15 +108,30 @@@ Client-side JS code coverage using [Pha
  lab -r lcov | ./node_modules/.bin/coveralls
  ```
  
 +### [nyc](https://github.com/bcoe/nyc)
 +
 +works with almost any testing framework. Simply execute
 +`npm test` with the `nyc` bin followed by running its reporter:
 +
 +```
 +nyc npm test && nyc report --reporter=text-lcov | coveralls
 +```
 +
 +### [TAP](https://github.com/isaacs/node-tap)
 +
 +Simply run your tap tests with the `COVERALLS_REPO_TOKEN` environment
 +variable set and tap will automatically use `nyc` to report
 +coverage to coveralls.
 +
+ ### Command Line Parameters
+ Usage: coveralls.js [-v] filepath
+ 
+ #### Optional arguments:
+ 
+ -v, --verbose
+ 
+ filepath - optionally defines the base filepath of your source files.
+ 
  ## Running locally
  
  If you're running locally, you must have a `.coveralls.yml` file, as documented in [their documentation](https://coveralls.io/docs/ruby), with your `repo_token` in it; or, you must provide a `COVERALLS_REPO_TOKEN` environment-variable on the command-line.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-coveralls.git