From e49a7d9bb2e94cb35206a11d60010f9a105a06c5 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 2 Dec 2015 07:46:10 -0800 Subject: [PATCH 1/2] Run tests on Node 4 --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6c598b1..99f67899 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ -before_install: npm install -g npm language: node_js node_js: - - "0.10" - - "0.8" + - "4" + +branches: + only: + - master From 33849acadf5b141b6c4801c5bd48aa396b6b5d8a Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 2 Dec 2015 07:51:09 -0800 Subject: [PATCH 2/2] Remove dependency on lodash --- lib/index.js | 10 ++++++++-- package.json | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/index.js b/lib/index.js index 61f7bef1..df5b3e32 100644 --- a/lib/index.js +++ b/lib/index.js @@ -3,7 +3,6 @@ var fs = require('fs'); var Q = require('q'); var wrench = require('wrench'); -var _ = require('lodash'); var glob = require('glob'); var git = require('./git'); @@ -73,7 +72,14 @@ exports.publish = function publish(basePath, config, done) { }; // override defaults with any task options - var options = _.extend({}, defaults, config); + // TODO: Require Node >= 4 and use Object.assign + var options = {}; + for (var d in defaults) { + options[d] = defaults[d]; + } + for (var c in config) { + options[c] = config[c]; + } try { if (!fs.statSync(basePath).isDirectory()) { diff --git a/package.json b/package.json index 50045661..fa3d664d 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "commander": "2.9.0", "glob": "~4.0.2", "graceful-fs": "4.1.2", - "lodash": "~2.4.1", "q": "1.4.1", "q-io": "1.13.2", "wrench": "1.5.8"