From d6a81b21c9721c184983568e82a45ad2ab6f198c Mon Sep 17 00:00:00 2001 From: TevinLi <6317595@qq.com> Date: Wed, 29 Mar 2017 20:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A1=8C=E6=9D=BF=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B8=AE=E5=8A=A9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/main.js | 18 +++++++++-------- bin/printf.js | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--- lib/main.js | 2 +- package.json | 3 ++- 4 files changed, 66 insertions(+), 13 deletions(-) diff --git a/bin/main.js b/bin/main.js index 2cb6d77..7af349e 100644 --- a/bin/main.js +++ b/bin/main.js @@ -55,10 +55,10 @@ co(function*() { } const type = parameters[0]; //更新导航 - if (type === 'nav' || type === 'navigation') { + if (type === 'nav') { makeNav.refresh(root); } - //更新植入文库数据 + //更新文库嵌入数据 else if (type === 'embed') { } //更新 SEO 模块 @@ -123,16 +123,18 @@ co(function*() { outPath = outPath.replace(/\\/g, '/'); yield exportGithub.export(root, outPath); break; - //显示帮助 - case 'help': - case '-h': - printFn.help(); - break; //显示版本号 case 'version': case '-v': - printFn.ver(); + printFn.ver(mainPath); break; + //显示帮助 + case 'help': + case '-h': + default: + printFn.help(); + break; + } //关闭用户输入 diff --git a/bin/printf.js b/bin/printf.js index 3614a0f..a6413b2 100644 --- a/bin/printf.js +++ b/bin/printf.js @@ -58,15 +58,65 @@ console.error = (...content) => { return console.log(`${clc(41, 'ERROR:')}`, ...content); }; +const helpWords = ` +用法: + amwiki [command] [arguments] + +命令列表: + -h, help 显示帮助 + -v, version 显示版本号 + -c, create 创建 wiki + -u, update 更新 wiki 数据 + 默认全部项目更新,添加参数可以指定部分更新 + [nav] 仅更新导航 + ${clc(90, '(eg: amwik update nav)')} + -s, server 启动本地服务器 + 默认本地服务器使用端口5171,添加参数可以修改端口 + [5171] 修改端口(待开发) + ${clc(90, '(eg: amwiki server 8080)')} + -b, browser 本地浏览文档 + 默认访问文库首页,添加参数可以打开指定页面 + [002/001] 按目录文档的id打开指定文档(待开发) + ${clc(90, '(eg: amwiki browser 002/001)')} + -e, export 项目导出 + 第一位参数,必需,指定导出类型 + github-wiki 导出为github的项目wiki + 第二位参数,必需,指定导出路径 + d:/your-path 导出路径 + ${clc(90, '(eg: amwiki export github-wiki d:/your-path)')} + +更多文档: + https://tevinli.github.io/amWiki/index.html`; + +//[embed] 仅更新嵌入数据(待开发) +//[seo] 仅更新SEO模块(待开发) + +const vesWords = ` + kk kk kk kk ww + wwwwww www www kk kk kk + ww ww ww ww kk kk kk kk kk kk kk + wwwwwww ww ww ww kk kkkk kk kk kk kk kk +ww ww ww ww ww kk kk kk kk kk kkkk kk + wwwwwww ww ww ww kk kk kk kk kk kk + +`.replace(/w/g, `${clc(32, '$')}`).replace(/k/g, `${clc(36, '$')}`); + module.exports = { clc: clc, help: function () { - alert('coming soon!') + alert(helpWords); }, ver: function (mainPath) { const packageStr = fs.readFileSync(mainPath.replace(/bin[\\\/]main$/, '') + 'package.json', 'utf-8'); const packageConf = JSON.parse(packageStr); - const text = ` ${clc(92, 'am')}${clc(96, 'Wiki')} ${clc(1, 'v' + packageConf.version)}`; - alert(text); + const text = [ + 'Package: amWiki', + `Version: ${clc(0, packageConf.version)}`, + 'Author: Tevin Li', + 'HomePage: https://github.com/tevinli/amWiki', + 'License: MIT' + ]; + //const text = ` ${clc(92, 'am')}${clc(96, 'Wiki')} ${clc(1, 'v' + packageConf.version)}`; + alert(vesWords + text.join('\n')); } }; \ No newline at end of file diff --git a/lib/main.js b/lib/main.js index 44ee55e..e17d796 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,6 +1,6 @@ /** * @desc 工作端·主模块 - * @author Tevin + * @author Tevin Li * @see {@link https://github.com/TevinLi/amWiki} * @license MIT - Released under the MIT license. */ diff --git a/package.json b/package.json index 09dead7..9b7a663 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ }, "license": "MIT", "engines": { - "atom": ">=1.0.0 <2.0.0" + "atom": ">=1.0.0 <2.0.0", + "node": ">=1.0.0" }, "bugs": { "url": "https://github.com/TevinLi/amWiki/issues"