Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

feature(config) add ability to override absent values in config

Browse source
This commit is contained in:
coderaiser 2017-05-11 11:42:31 +03:00
parent a127ac9b53
commit 1c934d5a82
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
server/config.js
View file

@ -24,28 +24,25 @@ const apiURL = CloudFunc.apiURL;
const ConfigPath = path.join(DIR, 'json/config.json');
const ConfigHome = path.join(HOME, '.cloudcmd.json');
const readjsonSync = (name) => jju.parse(fs.readFileSync(name, 'utf8'), {
mode: 'json'
});
const readjsonSync = (name) => {
return jju.parse(fs.readFileSync(name, 'utf8'), {
mode: 'json'
});
};
const rootConfig = readjsonSync(ConfigPath);
const key = (a) => Object.keys(a).pop();
let config;
let configHome;
let error = tryCatch(() => {
config = readjsonSync(ConfigHome);
configHome = readjsonSync(ConfigHome);
});
if (error) {
if (error.code !== 'ENOENT')
console.error('cloudcmd --config ~/.cloudcmd.json:', error.message);
error = tryCatch(() => {
config = readjsonSync(ConfigPath);
});
if (error)
exit('cloudcmd --config', ConfigPath + ':', error.message);
}
if (error && error.code !== 'ENOENT')
exit(`cloudcmd --config ${ConfigHome}: ${error.message}`);
const config = Object.assign({}, rootConfig, configHome);
module.exports = manage;
module.exports.save = save;

9
test/server/config.js
View file

@ -10,15 +10,15 @@ const root = '../../';
const dir = root + 'server/';
const config = require(dir + 'config');
const pathConfig = path.join(os.homedir(), '.cloudcmd.json');
const localConfig = path.join(__dirname, '..', '..', 'json', 'config.json');
const pathHomeConfig = path.join(os.homedir(), '.cloudcmd.json');
const pathConfig = path.join(__dirname, '..', '..', 'json', 'config.json');
const clean = (name) => {
delete require.cache[require.resolve(name)];
};
function readConfig() {
return readjson.sync.try(pathConfig) || require(localConfig);
return readjson.sync.try(pathHomeConfig) || require(pathConfig);
}
const before = require('../before');
@ -57,8 +57,9 @@ test('config: manage: get: *', (t) => {
const config = require(dir + 'config');
const data = config('*');
const expected = Object.assign({}, require(pathConfig), readConfig());
t.deepEqual(data, readConfig(), 'should return config data');
t.deepEqual(data, expected, 'should return config data');
t.end();
});