Skip to content

Commit

Permalink
Merge 86aa080 into 6cd092e
Browse files Browse the repository at this point in the history
  • Loading branch information
ajuste committed May 14, 2017
2 parents 6cd092e + 86aa080 commit c0fbc44
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 19 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
service_name: travis-ci
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

/test-compiled
/coverage
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
language: node_js
node_js:
- "4.1.2"
- "6.10.0"
- "7.0.0"
- "7.7.1"
script: npm test
sudo: false
after_success: 'npm run cover'
31 changes: 31 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
COFFEE = ./node_modules/coffee-script/bin/coffee

usage:
@echo ''
@echo 'make compile: Compile sources'
@echo 'make compile-tests: Compile test sources'
@echo ''

# --

# Compile sources
.PHONY: compile compile-tests
compile:
@$(COFFEE) --output ./lib --no-header --compile -b ./src

# Compile tests
compile-tests: compile
@$(COFFEE) --output ./test-compiled --no-header --compile -b ./test

# Run lint for coffeescript
run-coffee-lint:
./node_modules/coffeelint/bin/coffeelint src/ test/

test: compile-tests run-coffee-lint
./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha ./test-compiled/**/*.js

test-debug: compile-tests
./node_modules/mocha/bin/mocha --debug-brk ./test-compiled/**/*.js

cover:
cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
10 changes: 5 additions & 5 deletions lib/mail/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const _extend = require("lodash").extend;
const _exports = {};
var exports;

_extend(_exports, require("./email-manager"));
_extend(_exports, require("./email-daemon"));
exports = Object.assign({}, require('./email-manager'));

module.exports = _exports;
exports = Object.assign(exports, require('./email-daemon'));

module.exports = exports;
28 changes: 17 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,37 @@
"dependencies": {
"co": "^4.6.0",
"crypto": "=0.0.x",
"jaune-fs": "git+ssh://github.com/ajuste/jaune-fs.git#master",
"jaune-env": "=0.0.x",
"jaune-util": "git+ssh://github.com/ajuste/jaune-util.git#master",
"jaune-fs": "~0.0",
"jaune-env": "~0.0.x",
"jaune-util": "~0.0.x",
"lodash": "^3.10.1",
"node-uuid": "=1.4.x",
"nodemailer": "=0.6.x",
"pg": "=2.3.x",
"q": "^1.2.1",
"sendgrid": "=0.2.x",
"string": "=1.5.x"
},
"devDependencies": {},
"devDependencies": {
"assert": "^1.3.0",
"coffee-script": "^1.12.5",
"coffeelint": "^1.16.0",
"coveralls": "^2.13.0",
"istanbul": "^0.4.5",
"mocha": "^2.4.5",
"mock-require": "^2.0.2"
},
"main": "index.js",
"name": "jaune-engine",
"repository": {
"type": "git",
"url": "git+https://github.com/ajuste/jaune-engine.git"
},
"version": "0.0.4",
"version": "1.0.0",
"directories": {
"test": "test"
},
"engine": "node >= 0.12.x",
"engine": "node >= 4.1.2",
"scripts": {
"test": "mocha ./test/*"
"test": "make test",
"prepublish": "make compile",
"cover": "make cover"
},
"bugs": {
"url": "https://github.com/ajuste/jaune-engine/issues"
Expand Down
4 changes: 4 additions & 0 deletions src/mail/index.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
exports = Object.assign {}, require './email-manager'
exports = Object.assign exports, require './email-daemon'

module.exports = exports
12 changes: 12 additions & 0 deletions test/index.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
create
} = require '../'

{
ok
} = require 'assert'

describe 'create', ->

it 'checks create runs', ->
ok create()
3 changes: 0 additions & 3 deletions test/index.js

This file was deleted.

0 comments on commit c0fbc44

Please sign in to comment.