From 3b451f78fadb7d62edd8e055321a21fc305db75e Mon Sep 17 00:00:00 2001 From: Jeroen Engels Date: Fri, 14 Apr 2017 12:10:21 +0200 Subject: [PATCH] Bump eslint-plugin-coorpacademy to v5 (+ prettier reformat) --- package.json | 2 +- src/api.js | 9 +++----- src/build-index.js | 22 ++++++++----------- src/fetch.js | 3 ++- src/save.js | 23 ++++++++++---------- src/test/etcd.js | 3 ++- src/test/store.js | 17 ++++----------- src/util/cli.js | 12 +++++----- src/util/etcd.js | 41 +++++++++++++++++------------------ src/util/fs.js | 3 ++- src/util/test/helpers/etcd.js | 36 +++++++++++++++--------------- 11 files changed, 76 insertions(+), 95 deletions(-) diff --git a/package.json b/package.json index ea32773..b806e0c 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "rxjs": "^5.0.0-beta.7" }, "devDependencies": { - "@coorpacademy/eslint-plugin-coorpacademy": "^4.0.1", + "@coorpacademy/eslint-plugin-coorpacademy": "^5.0.0", "ava": "^0.16.0", "babel-cli": "^6.18.0", "babel-core": "^6.18.2", diff --git a/src/api.js b/src/api.js index 0e58126..bf404ef 100644 --- a/src/api.js +++ b/src/api.js @@ -30,12 +30,9 @@ const createAPI = (store, client, options = {cwd: '/'}) => { return _get( _path, - find( - function(child) { - return startsWith(child.key, _path); - }, - node.nodes - ) + find(function(child) { + return startsWith(child.key, _path); + }, node.nodes) ); }); diff --git a/src/build-index.js b/src/build-index.js index 7bf2058..7b3c32c 100644 --- a/src/build-index.js +++ b/src/build-index.js @@ -18,18 +18,14 @@ const buildIndex = (index, node) => { )(node); }; -const updateIndexes = indexes => - store => { - debug(`Update indexes ${indexes.join(',')}`); - return zipObject( - indexes, - map( - function(index) { - return buildIndex(index, store); - }, - indexes - ) - ); - }; +const updateIndexes = indexes => store => { + debug(`Update indexes ${indexes.join(',')}`); + return zipObject( + indexes, + map(function(index) { + return buildIndex(index, store); + }, indexes) + ); +}; export default updateIndexes; diff --git a/src/fetch.js b/src/fetch.js index ccfb04c..d800d13 100644 --- a/src/fetch.js +++ b/src/fetch.js @@ -7,7 +7,8 @@ const debug = createDebug('squirrel:etcd'); const createFetch$ = (client, cwd) => { debug(`fetch: ${cwd}`); const list = Observable.bindNodeCallback(cb => - client.get(cwd, {recursive: true}, (err, data) => cb(err, data))); + client.get(cwd, {recursive: true}, (err, data) => cb(err, data)) + ); return Observable.of(list).map(f => f()).mergeAll().retry(Infinity).map(parseAction); }; diff --git a/src/save.js b/src/save.js index 040dd05..20fd3c0 100644 --- a/src/save.js +++ b/src/save.js @@ -8,18 +8,17 @@ const debug = createDebug('squirrel:save'); const writeFile$ = Observable.bindNodeCallback(writeFile); -const createSave = filePath => - event$ => { - if (!isString(filePath)) return event$; +const createSave = filePath => event$ => { + if (!isString(filePath)) return event$; - return event$ - .map(event => { - debug(`saving ${filePath}`); - return writeFile$(filePath, stringify(event), {encoding: 'UTF8'}) - .do(() => debug(`saved ${filePath}`)) - .mapTo(event); - }) - .concatAll(); - }; + return event$ + .map(event => { + debug(`saving ${filePath}`); + return writeFile$(filePath, stringify(event), {encoding: 'UTF8'}) + .do(() => debug(`saved ${filePath}`)) + .mapTo(event); + }) + .concatAll(); +}; export default createSave; diff --git a/src/test/etcd.js b/src/test/etcd.js index 349ea09..0297315 100644 --- a/src/test/etcd.js +++ b/src/test/etcd.js @@ -70,7 +70,8 @@ test('should composite events observable', async t => { const eventsP = events$.take(6).toArray().toPromise(); [setEvent, deleteEvent, resyncEvent, deleteEvent, setEvent].forEach(event => - watcher.emit(event.action, event)); + watcher.emit(event.action, event) + ); const events = await eventsP; t.deepEqual(events, expected); diff --git a/src/test/store.js b/src/test/store.js index 6317938..313a665 100644 --- a/src/test/store.js +++ b/src/test/store.js @@ -6,9 +6,7 @@ import createStore from '../store'; test('should get node and indexes', t => { const node$ = new Subject(); - const { - store - } = createStore(node$, identity); + const {store} = createStore(node$, identity); const assert = Promise.all([ store('node').then(node => t.deepEqual(node, 'foo')), @@ -23,9 +21,7 @@ test('should get node and indexes', t => { test('should wait first event', t => { const node$ = new Subject(); - const { - store - } = createStore(node$, identity); + const {store} = createStore(node$, identity); t.throws(Promise.race([store('node'), Promise.reject(new Error())])); }); @@ -33,9 +29,7 @@ test('should wait first event', t => { test('should return subscription', t => { const node$ = Observable.empty(); - const { - subscription - } = createStore(node$, identity); + const {subscription} = createStore(node$, identity); t.true(subscription instanceof Subscription); }); @@ -43,10 +37,7 @@ test('should return subscription', t => { test('should', async t => { const node$ = Observable.of('foo', 'bar'); - const { - store, - subscription - } = createStore(node$, identity); + const {store, subscription} = createStore(node$, identity); const [node, indexes] = await Promise.all([store('node'), store('indexes')]); t.deepEqual(node, 'bar'); diff --git a/src/util/cli.js b/src/util/cli.js index 3cbf209..2c8d373 100644 --- a/src/util/cli.js +++ b/src/util/cli.js @@ -27,14 +27,12 @@ export const syncDirectory$ = (client, pathFS, pathETCD) => { return entries .toArray() .flatMap(_entries => { - const nodeToDelete = filter( - _node => { - return !includes(join(pathFS, relative(pathETCD, _node.key)), _entries); - }, - nodes - ); + const nodeToDelete = filter(_node => { + return !includes(join(pathFS, relative(pathETCD, _node.key)), _entries); + }, nodes); const nodeToDelete$ = Observable.from(nodeToDelete).flatMap(_node => - delRecursive$(client, _node.key)); + delRecursive$(client, _node.key) + ); return nodeToDelete$; }) .toArray() diff --git a/src/util/etcd.js b/src/util/etcd.js index ba1517d..708a81c 100644 --- a/src/util/etcd.js +++ b/src/util/etcd.js @@ -4,27 +4,26 @@ import makeDebug from 'debug'; const debug = makeDebug('squirrel:util:etcd'); -const wrap = fnName => - (client, ...argz) => - debug(fnName, ...argz, client) || - Observable.create(observer => { - const token = invokeArgs( - fnName, - [ - ...argz, - (err, value) => { - if (err) return observer.error(err); - observer.next(value); - observer.complete(); - } - ], - client - ); - - return () => { - token.abort(); - }; - }); +const wrap = fnName => (client, ...argz) => + debug(fnName, ...argz, client) || + Observable.create(observer => { + const token = invokeArgs( + fnName, + [ + ...argz, + (err, value) => { + if (err) return observer.error(err); + observer.next(value); + observer.complete(); + } + ], + client + ); + + return () => { + token.abort(); + }; + }); export const compareAndSwap$ = wrap('compareAndSwap'); diff --git a/src/util/fs.js b/src/util/fs.js index eab1861..68aecad 100644 --- a/src/util/fs.js +++ b/src/util/fs.js @@ -17,4 +17,5 @@ export const isFile$ = pathFS => stat$(pathFS).map(_stat => _stat.isFile()); export const isDirectory$ = pathFS => stat$(pathFS).map(_stat => _stat.isDirectory()); export const filter$ = curry((predicate, value) => - predicate(value).filter(Boolean).map(() => value)); + predicate(value).filter(Boolean).map(() => value) +); diff --git a/src/util/test/helpers/etcd.js b/src/util/test/helpers/etcd.js index 128e183..b00bfc8 100644 --- a/src/util/test/helpers/etcd.js +++ b/src/util/test/helpers/etcd.js @@ -1,28 +1,26 @@ import EventEmitter from 'events'; // eslint-disable-line fp/no-events import {assign, mapValues, noop, pipe} from 'lodash/fp'; -const createWatcher = () => - () => { - const watcher = new EventEmitter(); - watcher.stop = noop; - return watcher; - }; +const createWatcher = () => () => { + const watcher = new EventEmitter(); + watcher.stop = noop; + return watcher; +}; const createEtcdMock = (mock, watcher = createWatcher(), abort = noop) => pipe( - mapValues(mocks => - (...argz) => { - let rets = mocks.shift(); - if (rets.assert) { - rets.assert(...argz); - rets = rets.values; - } - const cb = argz.pop(); - setTimeout(() => cb(...rets), 0); - return { - abort - }; - }), + mapValues(mocks => (...argz) => { + let rets = mocks.shift(); + if (rets.assert) { + rets.assert(...argz); + rets = rets.values; + } + const cb = argz.pop(); + setTimeout(() => cb(...rets), 0); + return { + abort + }; + }), assign({ watcher })