graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 02:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

[BREAKING CHANGE] テスト時の設定ファイルを分けるように

Browse source 
See CHANGELOG for more details
This commit is contained in:
syuilo 2017-01-17 08:37:24 +09:00
parent f76d55b1d2
commit 9abb108b5e
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,4 +1,7 @@
# Server
## 2
configのファイル名: config.yml --> default.yml
## 1
First version

4
gulpfile.ts
View file

@ -31,12 +31,12 @@ const env = process.env.NODE_ENV;
const isProduction = env === 'production';
const isDebug = !isProduction;
if (!fs.existsSync('./.config/config.yml')) {
if (!fs.existsSync('./.config/default.yml')) {
console.log('npm run configを実行して設定ファイルを作成してください');
process.exit();
}
(global as any).MISSKEY_CONFIG_PATH = '.config/config.yml';
(global as any).MISSKEY_CONFIG_PATH = '.config/default.yml';
import { IConfig } from './src/config';
const config = eval(require('typescript').transpile(require('fs').readFileSync('./src/config.ts').toString()))() as IConfig;

14
src/config.ts
View file

@ -6,7 +6,19 @@ import * as fs from 'fs';
import * as yaml from 'js-yaml';
import * as isUrl from 'is-url';
export const path = (global as any).MISSKEY_CONFIG_PATH ? (global as any).MISSKEY_CONFIG_PATH : `${__dirname}/../.config/config.yml`;
/**
* Path of configuration directory
*/
const dir = `${__dirname}/../.config`;
/**
* Path of configuration file
*/
export const path = (global as any).MISSKEY_CONFIG_PATH
? (global as any).MISSKEY_CONFIG_PATH
: process.env.NODE_ENV == 'test'
? `${dir}/test.yml`
: `${dir}/default.yml`;
/**
* ユーザーが設定する必要のある情報

2
tools/init.js
View file

@ -3,7 +3,7 @@ const yaml = require('js-yaml');
const inquirer = require('inquirer');
const configDirPath = `${__dirname}/../.config`;
const configPath = `${configDirPath}/config.yml`;
const configPath = `${configDirPath}/default.yml`;
const form = [
{