From 6ead284f31564a2fd1905a5683a94fbc33dc45f9 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Sat, 31 Dec 2016 03:24:07 +0900 Subject: Rename DependencyChecker to DependencyInfo --- src/index.ts | 4 ++-- src/utils/dependencyChecker.ts | 38 -------------------------------------- src/utils/dependencyInfo.ts | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 src/utils/dependencyChecker.ts create mode 100644 src/utils/dependencyInfo.ts (limited to 'src') diff --git a/src/index.ts b/src/index.ts index c4cba4d46e..947408e523 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,7 +19,7 @@ const isRoot = require('is-root'); import ProgressBar from './utils/cli/progressbar'; import initdb from './db/mongodb'; import MachineInfo from './utils/machineInfo'; -import DependencyChecker from './utils/dependencyChecker'; +import DependencyInfo from './utils/dependencyInfo'; // Init babel require('babel-core/register'); @@ -160,7 +160,7 @@ async function init(): Promise { } MachineInfo.show(); - new DependencyChecker().checkAll(); + new DependencyInfo().showAll(); let configLogger = new Logger('Config'); if (!fs.existsSync(`${__dirname}/../.config/config.yml`)) { diff --git a/src/utils/dependencyChecker.ts b/src/utils/dependencyChecker.ts deleted file mode 100644 index 2036ebe369..0000000000 --- a/src/utils/dependencyChecker.ts +++ /dev/null @@ -1,38 +0,0 @@ -import Logger from './logger'; -import { exec } from 'shelljs'; - -export default class DependencyChecker { - logger: Logger; - - constructor() { - this.logger = new Logger('Deps'); - } - - checkAll(): void { - this.logger.info('Checking started'); - this.check('Node.js', 'node -v', x => x.match(/^v(.*)\r?\n$/)); - this.check('npm', 'npm -v', x => x.match(/^(.*)\r?\n$/)); - this.check('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version: (.*)\r?\n$/)); - this.check('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/)); - this.logger.info('Checking finished'); - } - - check(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void { - const code = { - success: 0, - notFound: 127 - }; - const x = exec(command, { silent: true }) as any; - if (x.code === code.success) { - let ver = transform(x.stdout); - if (ver != null) { - this.logger.info(`${serviceName} ${ver[1]} found`); - } else { - this.logger.warn(`${serviceName} not found`); - this.logger.warn(`Regexp used for version check of ${serviceName} is probably messed up`); - } - } else if (x.code === code.notFound) { - this.logger.warn(`${serviceName} not found`); - } - } -} diff --git a/src/utils/dependencyInfo.ts b/src/utils/dependencyInfo.ts new file mode 100644 index 0000000000..e0d8f24d74 --- /dev/null +++ b/src/utils/dependencyInfo.ts @@ -0,0 +1,38 @@ +import Logger from './logger'; +import { exec } from 'shelljs'; + +export default class DependencyInfo { + logger: Logger; + + constructor() { + this.logger = new Logger('Deps'); + } + + showAll(): void { + this.logger.info('Checking started'); + this.show('Node.js', 'node -v', x => x.match(/^v(.*)\r?\n$/)); + this.show('npm', 'npm -v', x => x.match(/^(.*)\r?\n$/)); + this.show('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version: (.*)\r?\n$/)); + this.show('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/)); + this.logger.info('Checking finished'); + } + + show(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void { + const code = { + success: 0, + notFound: 127 + }; + const x = exec(command, { silent: true }) as any; + if (x.code === code.success) { + let ver = transform(x.stdout); + if (ver != null) { + this.logger.info(`${serviceName} ${ver[1]} found`); + } else { + this.logger.warn(`${serviceName} not found`); + this.logger.warn(`Regexp used for version check of ${serviceName} is probably messed up`); + } + } else if (x.code === code.notFound) { + this.logger.warn(`${serviceName} not found`); + } + } +} -- cgit v1.2.3-freya