SWREI/switched
0
0
Fork 0
Code

Extract LastCommitInfo

Browse Source
This commit is contained in:
Aya Morisawa 2016-12-31 03:29:24 +09:00
parent 6ead284f31
commit eb10c3a8dc
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/index.ts
View File

@ -10,14 +10,13 @@ Error.stackTraceLimit = Infinity;
import * as fs from 'fs'; import * as fs from 'fs';
import * as os from 'os'; import * as os from 'os';
import * as cluster from 'cluster'; import * as cluster from 'cluster';
const prominence = require('prominence');
import Logger from './utils/logger'; import Logger from './utils/logger';
import * as chalk from 'chalk'; import * as chalk from 'chalk';
const git = require('git-last-commit');
const portUsed = require('tcp-port-used'); const portUsed = require('tcp-port-used');
const isRoot = require('is-root'); const isRoot = require('is-root');
import ProgressBar from './utils/cli/progressbar'; import ProgressBar from './utils/cli/progressbar';
import initdb from './db/mongodb'; import initdb from './db/mongodb';
import LastCommitInfo from './utils/lastCommitInfo';
import MachineInfo from './utils/machineInfo'; import MachineInfo from './utils/machineInfo';
import DependencyInfo from './utils/dependencyInfo'; import DependencyInfo from './utils/dependencyInfo';
@ -138,19 +137,7 @@ async function init(): Promise<State> {
Logger.info(chalk.bold('Misskey Core <aoi>')); Logger.info(chalk.bold('Misskey Core <aoi>'));
Logger.info('Initializing...'); Logger.info('Initializing...');
// Get commit info await LastCommitInfo.show();
let lastCommitLogger = new Logger('LastCommit');
try {
const commit = await prominence(git).getLastCommit();
const shortHash: string = commit.shortHash;
const hash: string = commit.hash;
const commitDate = new Date(parseInt(commit.committedOn, 10) * 1000).toLocaleDateString('ja-JP');
const commitTime = new Date(parseInt(commit.committedOn, 10) * 1000).toLocaleTimeString('ja-JP');
lastCommitLogger.info(`${shortHash}${chalk.gray(hash.substr(shortHash.length))}`);
lastCommitLogger.info(`${commit.subject} ${chalk.green(`(${commitDate} ${commitTime})`)} ${chalk.blue(`<${commit.author.name}>`)}`);
} catch (e) {
lastCommitLogger.info('No commit information found');
}
let envLogger = new Logger('Env'); let envLogger = new Logger('Env');
envLogger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`); envLogger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`);

21
src/utils/lastCommitInfo.ts Normal file
View File

@ -0,0 +1,21 @@
import Logger from './logger';
import * as chalk from 'chalk';
const prominence = require('prominence');
const git = require('git-last-commit');
export default class LastCommitInfo {
static async show(): Promise<void> {
let logger = new Logger('LastCommit');
try {
const commit = await prominence(git).getLastCommit();
const shortHash: string = commit.shortHash;
const hash: string = commit.hash;
const commitDate = new Date(parseInt(commit.committedOn, 10) * 1000).toLocaleDateString('ja-JP');
const commitTime = new Date(parseInt(commit.committedOn, 10) * 1000).toLocaleTimeString('ja-JP');
logger.info(`${shortHash}${chalk.gray(hash.substr(shortHash.length))}`);
logger.info(`${commit.subject} ${chalk.green(`(${commitDate} ${commitTime})`)} ${chalk.blue(`<${commit.author.name}>`)}`);
} catch (e) {
logger.info('No commit information found');
}
}
}