Skip to content

Commit

Permalink
Merge pull request #57 from stevex86/chore/bump-fs-extra-7.0.0
Browse files Browse the repository at this point in the history
Bump node-promisify, include executive for promisified child_process
  • Loading branch information
implausible authored Oct 5, 2018
2 parents 4c655dc + a8e4e76 commit ee71fd6
Show file tree
Hide file tree
Showing 6 changed files with 2,451 additions and 13 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
sudo: true

env:
matrix:
- export NODE_VERSION="4" CC=clang CXX=clang++ npm_config_clang=1
- export NODE_VERSION="6" CC=clang CXX=clang++ npm_config_clang=1
- export NODE_VERSION="7" CC=clang CXX=clang++ npm_config_clang=1
- export NODE_VERSION="8" CC=clang CXX=clang++ npm_config_clang=1
- export NODE_VERSION="10" CC=clang CXX=clang++ npm_config_clang=1

branches:
only:
Expand All @@ -14,6 +16,7 @@ git:
compiler: clang

before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p; fi
- git clone https://github.com/creationix/nvm.git ./.nvm
- source ./.nvm/nvm.sh
- nvm install $NODE_VERSION
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
environment:
matrix:
# Node.js
- nodejs_version: "4"
- nodejs_version: "6"
- nodejs_version: "7"
- nodejs_version: "8"
- nodejs_version: "10"

branches:
only:
Expand Down
6 changes: 2 additions & 4 deletions js/spec/index-spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
const nsfw = require('../src/');
const path = require('path');
const promisify = require('promisify-node');
const fse = promisify(require('fs-extra'));
const exec = promisify((command, options, callback) =>
require('child_process').exec(command, options, callback));
const fse = require('fs-extra');
const exec = require('executive');

jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;

Expand Down
2 changes: 1 addition & 1 deletion js/src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { NSFW } = require('../../build/Release/nsfw.node');
const fse = require('promisify-node')(require('fs-extra'));
const fse = require('fs-extra');
const path = require('path');
const _isInteger = require('lodash.isinteger');
const _isUndefined = require('lodash.isundefined');
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
],
"homepage": "https://github.com/axosoft/node-simple-file-watcher",
"dependencies": {
"fs-extra": "^0.26.5",
"fs-extra": "^7.0.0",
"lodash.isinteger": "^4.0.4",
"lodash.isundefined": "^3.0.1",
"nan": "^2.0.0",
"promisify-node": "^0.3.0"
"nan": "^2.0.0"
},
"devDependencies": {
"babel-cli": "^6.5.1",
"babel-preset-es2015": "^6.5.0",
"eslint": "^2.2.0",
"jasmine-node": "^2.0.0"
"executive": "^1.6.3",
"jasmine-node": "^2.0.1"
},
"keywords": [
"FileWatcher",
Expand Down
Loading

0 comments on commit ee71fd6

Please sign in to comment.