zhangdocs 1.1.34 → 1.1.35

package/lib/init.js

@@ -91,10 +91,8 @@ function runTask(commander) {
         if (!/\/$/.test(todir)) todir = todir + '/';
 
         // 记录皮肤名字
-        if (answers.zhangdocstheme) {
-            answers.zhangdocs.theme = answers.zhangdocstheme;
-            delete answers.zhangdocstheme;
-        }
+        answers.zhangdocs.theme = answers.theme;
+        delete answers.theme;
 
         //需要生成的md文件路径
         if (commander.init) {
@@ -148,19 +146,42 @@ function runTask(commander) {
         var todir = default_package.zhangdocs.todir ? default_package.zhangdocs.todir : __dirname;
 
         log()
-        log(color.green('Initialization is successful! Please run "zhangdocs build" command!'));
+        log(color.green('Initialization is successful! Please run "doc build" command!'));
         log()
 
-    })
+    }).catch(function (err) {
+        if (err && err.isTtyError) {
+            log(color.red('\nInitialization cancelled.\n'));
+            return;
+        }
+        log(color.red('\nInitialization failed!'));
+        if (err && err.message) {
+            log(color.red(err.message));
+        }
+        if (err && err.stack) {
+            log(color.red(err.stack));
+        }
+        log();
+    });
     return;
 }
 
 function init(commander) {
-    if (fs.existsSync(template + '/theme/default/')) {
-        runTask(commander);
-    } else {
-        log(color.red("Initialization failed!"));
+    var themeDir = path.join(template, 'theme');
+    if (!fs.existsSync(themeDir)) {
+        log(color.red('\nInitialization failed!'));
+        log(color.red('Theme directory not found: ' + themeDir));
+        log(color.red('Reinstall doc: npm install -g zhangdocs\n'));
+        return;
+    }
+    var themes = theme.themeList();
+    if (!themes || themes.length === 0) {
+        log(color.red('\nInitialization failed!'));
+        log(color.red('No themes found in: ' + themeDir));
+        log(color.red('Expected at least one theme folder (e.g. handbook).\n'));
+        return;
     }
+    runTask(commander);
 }
 
 module.exports = init;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zhangdocs",
-    "version": "1.1.34",
+    "version": "1.1.35",
     "description": "Simple document generation tool. Dependence Node.js run.",
     "repository": {
         "type": "git",
@@ -39,7 +39,7 @@
         "underscore": "^1.8.3"
     },
     "zhangdocs": {
-        "theme": "default",
+        "theme": "handbook",
         "md": [
             "README.md"
         ]