diff --git a/example/example.js b/example/example.js index b458cb6..404935c 100644 --- a/example/example.js +++ b/example/example.js @@ -1,4 +1,4 @@ -import Sync from '@uci-utils/sync' +import Sync from '../src/sync' import onDeath from 'ondeath' (async () => { @@ -6,8 +6,8 @@ import onDeath from 'ondeath' await sync.runJob('remote') // await sync.loadJob('local') - sync.watch('on') - console.log('ready and waiting') + // sync.watch('on') + // console.log('ready and waiting') onDeath( () => { console.log('\nHe\'s dead Jim') diff --git a/example/source/example.js b/example/source/example.js new file mode 100644 index 0000000..476f184 --- /dev/null +++ b/example/source/example.js @@ -0,0 +1 @@ +// this is a js file sent via the sync package diff --git a/package.json b/package.json index 7be8812..0466b65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@uci-utils/sync", - "version": "0.0.9", + "version": "0.0.10", "description": "module to copy, maintain, and launch hardware modules on other machines", "main": "src/index.js", "bin": { @@ -31,10 +31,10 @@ }, "homepage": "https://github.com/uCOMmandIt/uci-remote-code#readme", "dependencies": { - "@uci-utils/logger": "^0.0.15", + "@uci-utils/class-merge": "^1.0.3", + "@uci-utils/logger": "^0.0.16", "@uci-utils/read-lines": "^0.2.2", "@uci-utils/watcher": "^0.2.4", - "aggregation": "^1.2.5", "await-to-js": "^2.1.1", "conf": "^5.0.0", "debounce-fn": "^3.0.1", diff --git a/src/sync.js b/src/sync.js index f44ded7..05f05e5 100644 --- a/src/sync.js +++ b/src/sync.js @@ -4,7 +4,7 @@ import Rsync from './rsync' import { EventEmitter as Emitter } from 'events' import { dirname, normalize } from 'path' // third party elements -import merge from 'aggregation/es6' +import merge from '@uci-utils/class-merge' import { readFile } from 'fs-read-data' import Conf from 'conf' import debounce from 'debounce-fn'