From 5160dcccf062f0b9e6afa5aebad481383443e0c8 Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Sun, 14 May 2017 13:22:41 -0400 Subject: [PATCH 1/6] chore: jaune official versions and remove node-uuid --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 38d61c5..a4cfbd7 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,10 @@ "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", From 8d3390e446724cbe487bbce7469891578d7e6a4e Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Sun, 14 May 2017 15:44:36 -0400 Subject: [PATCH 2/6] chore: coverage + coffee tests --- .coveralls.yml | 1 + .gitignore | 3 +++ Makefile | 31 +++++++++++++++++++++++++++++++ lib/mail/index.js | 10 +++++----- package.json | 17 ++++++++++++----- src/mail/index.coffee | 4 ++++ test/index.coffee | 12 ++++++++++++ test/index.js | 3 --- 8 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 .coveralls.yml create mode 100644 Makefile create mode 100644 src/mail/index.coffee create mode 100644 test/index.coffee delete mode 100644 test/index.js diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..9160059 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +service_name: travis-ci diff --git a/.gitignore b/.gitignore index 123ae94..96c85af 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..60d3725 --- /dev/null +++ b/Makefile @@ -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 diff --git a/lib/mail/index.js b/lib/mail/index.js index d703968..ad51d12 100644 --- a/lib/mail/index.js +++ b/lib/mail/index.js @@ -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; diff --git a/package.json b/package.json index a4cfbd7..6a1e974 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,18 @@ "jaune-env": "~0.0.x", "jaune-util": "~0.0.x", "lodash": "^3.10.1", - "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": { @@ -27,7 +32,9 @@ }, "engine": "node >= 0.12.x", "scripts": { - "test": "mocha ./test/*" + "test": "make test", + "prepublish": "make compile", + "cover": "make cover" }, "bugs": { "url": "https://github.com/ajuste/jaune-engine/issues" diff --git a/src/mail/index.coffee b/src/mail/index.coffee new file mode 100644 index 0000000..cc12d99 --- /dev/null +++ b/src/mail/index.coffee @@ -0,0 +1,4 @@ +exports = Object.assign {}, require './email-manager' +exports = Object.assign exports, require './email-daemon' + +module.exports = exports diff --git a/test/index.coffee b/test/index.coffee new file mode 100644 index 0000000..b4206d5 --- /dev/null +++ b/test/index.coffee @@ -0,0 +1,12 @@ +{ + create +} = require '../' + +{ + ok +} = require 'assert' + +describe 'create', -> + + it 'checks create runs', -> + ok create() diff --git a/test/index.js b/test/index.js deleted file mode 100644 index f3fdb4e..0000000 --- a/test/index.js +++ /dev/null @@ -1,3 +0,0 @@ -// compile test ;-) - -require ("../").create({}); From 119c78de805b0a5bd0ef40513fe62181bec2314d Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Sun, 14 May 2017 15:48:18 -0400 Subject: [PATCH 3/6] chore add .travis.yml --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..177fb4a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: node_js +node_js: + - "0.12" + - "1" + - "2" + - "4.1.2" + - "6.10.0" +script: npm test +sudo: false +after_success: 'npm run cover' From eefce088e57f6f9b6dbdda849425a6bc6663da24 Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Sun, 14 May 2017 15:49:51 -0400 Subject: [PATCH 4/6] chore: version change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a1e974..915b317 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "type": "git", "url": "git+https://github.com/ajuste/jaune-engine.git" }, - "version": "0.0.4", + "version": "1.0.0", "directories": { "test": "test" }, From d3100f579bfd7d78d9b2ce26f6b19edef1a731c4 Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Sun, 14 May 2017 15:53:21 -0400 Subject: [PATCH 5/6] chore: update node minimal version compat --- .travis.yml | 3 --- package.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 177fb4a..a26d905 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,5 @@ language: node_js node_js: - - "0.12" - - "1" - - "2" - "4.1.2" - "6.10.0" script: npm test diff --git a/package.json b/package.json index 915b317..85c0049 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "directories": { "test": "test" }, - "engine": "node >= 0.12.x", + "engine": "node >= 4.1.2", "scripts": { "test": "make test", "prepublish": "make compile", From 86aa080e63b2117980d76a3a78a3b29b402e3d29 Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Sun, 14 May 2017 15:55:01 -0400 Subject: [PATCH 6/6] chore: run ci for 7.0.0 & 7.7.1 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a26d905..0196f17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ 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'