From 677f3b559efa8eaaf63ee8c094187a80e477231e Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Sat, 31 Dec 2016 02:55:56 +0900 Subject: Use lowerCamelCase for file name --- src/index.ts | 2 +- src/utils/check-dependencies.ts | 29 ----------------------------- src/utils/checkDependencies.ts | 29 +++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 src/utils/check-dependencies.ts create mode 100644 src/utils/checkDependencies.ts diff --git a/src/index.ts b/src/index.ts index 5cc91d840d..ff4a01c834 100644 --- a/src/index.ts +++ b/src/index.ts @@ -18,7 +18,7 @@ const portUsed = require('tcp-port-used'); const isRoot = require('is-root'); import ProgressBar from './utils/cli/progressbar'; import initdb from './db/mongodb'; -import checkDependencies from './utils/check-dependencies'; +import checkDependencies from './utils/checkDependencies'; // Init babel require('babel-core/register'); diff --git a/src/utils/check-dependencies.ts b/src/utils/check-dependencies.ts deleted file mode 100644 index af2b5fb6bf..0000000000 --- a/src/utils/check-dependencies.ts +++ /dev/null @@ -1,29 +0,0 @@ -import Logger from './logger'; -import { exec } from 'shelljs'; - -export default function(): void { - checkDependency('Node.js', 'node -v', x => x.match(/^v(.*)\r?\n$/)); - checkDependency('npm', 'npm -v', x => x.match(/^(.*)\r?\n$/)); - checkDependency('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version: (.*)\r?\n$/)); - checkDependency('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/)); -} - -function checkDependency(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void { - const code = { - success: 0, - notFound: 127 - }; - let depsLogger = new Logger('Deps'); - const x = exec(command, { silent: true }) as any; - if (x.code === code.success) { - let ver = transform(x.stdout); - if (ver != null) { - depsLogger.info(`${serviceName} ${ver[1]} found`); - } else { - depsLogger.warn(`${serviceName} not found`); - depsLogger.warn(`Regexp used for version check of ${serviceName} is probably messed up`); - } - } else if (x.code === code.notFound) { - depsLogger.warn(`${serviceName} not found`); - } -} diff --git a/src/utils/checkDependencies.ts b/src/utils/checkDependencies.ts new file mode 100644 index 0000000000..af2b5fb6bf --- /dev/null +++ b/src/utils/checkDependencies.ts @@ -0,0 +1,29 @@ +import Logger from './logger'; +import { exec } from 'shelljs'; + +export default function(): void { + checkDependency('Node.js', 'node -v', x => x.match(/^v(.*)\r?\n$/)); + checkDependency('npm', 'npm -v', x => x.match(/^(.*)\r?\n$/)); + checkDependency('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version: (.*)\r?\n$/)); + checkDependency('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/)); +} + +function checkDependency(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void { + const code = { + success: 0, + notFound: 127 + }; + let depsLogger = new Logger('Deps'); + const x = exec(command, { silent: true }) as any; + if (x.code === code.success) { + let ver = transform(x.stdout); + if (ver != null) { + depsLogger.info(`${serviceName} ${ver[1]} found`); + } else { + depsLogger.warn(`${serviceName} not found`); + depsLogger.warn(`Regexp used for version check of ${serviceName} is probably messed up`); + } + } else if (x.code === code.notFound) { + depsLogger.warn(`${serviceName} not found`); + } +} -- cgit v1.2.3-freya