p71924506
/
cylon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve merge conflicts

This commit is contained in:
deadprogram 2014-05-24 10:02:48 -07:00
parent 69cc76b6a6 c851809bc2
commit ebdac95a7d
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/node_modules/ /node_modules/
npm-debug.log npm-debug.log
/coverage/

5
.travis.yml
View File

@ -1,5 +1,8 @@
language: node_js language: node_js
script: "make" script:
- npm install -g codeclimate-test-reporter
- make cover
- CODECLIMATE_REPO_TOKEN=d3aad610220b6eaf4f51e38393c1b62586b1d68b898b42e418d9c2a8e0a7cb0d codeclimate < coverage/lcov.info
node_js: node_js:
- '0.10' - '0.10'
branches: branches:

6
Makefile
View File

@ -4,7 +4,11 @@ TEST_FILES := test/support.js $(shell find test/specs -type f -name "*.js")
VERSION := $(shell node -e "console.log(require('./package.json').version)") VERSION := $(shell node -e "console.log(require('./package.json').version)")
# Our 'phony' make targets (don't involve any file changes) # Our 'phony' make targets (don't involve any file changes)
.PHONY: test bdd lint release .PHONY: cover test bdd lint release
# Run Mocha, with coverage.
cover:
@$(BIN)/istanbul cover $(BIN)/_mocha $(TEST_FILES) --report lcovonly -- -R spec
# Run Mocha, with standard reporter. # Run Mocha, with standard reporter.
test: test:

2
README.markdown
View File

@ -16,7 +16,7 @@ Want to use Golang to power your robots? Check out our sister project,
## Build Status: ## Build Status:
[![Build Status](https://secure.travis-ci.org/hybridgroup/cylon.png?branch=master)](http://travis-ci.org/hybridgroup/cylon) [![Build Status](https://secure.travis-ci.org/hybridgroup/cylon.png?branch=master)](http://travis-ci.org/hybridgroup/cylon) [![Code Climate](https://codeclimate.com/github/hybridgroup/cylon/coverage.png)](https://codeclimate.com/github/hybridgroup/cylon)
## Examples ## Examples