1.1.0

install pkgs automatically
beautify log

Author: hanszhoou

README.md

@@ -116,7 +116,7 @@ Run this command to generate a new markdown file contains the necessary structur
 This file contains metadatas like name, email etc.
 
 ### `boowa build`
-Generate new templates after you edit `_config.json` or modify your markdown files
+After edit `_config.json` or modify markdown files, run this command to generate new templates.
 
 ### `npm run start`
 Start a development server
@@ -131,7 +131,7 @@ Boowa has a simple built-in server , after `npm run build && cd dist`, run this
 After install the newest boowa, run `boowa` in the boowa-existed directory, this update would not rewrite the markdown files and `_config.json`.
 
 ### support offline locally
-Service-worker normally runs unlocally under https, so if you want to test the offline function, for chrome, run this command first:
+Service-worker works under https in production mode, so if you want to test the offline function locally, for chrome, run this command first:
 ```sh
 /Applications/Google\ Chrome.app/Conts/MacOS/Google\ Chrome --user-data-dir=/tmp/foo --ignore-certificate-errors --unsafely-treat-insecure-origin-as-secure=http://localhost:port
 ```

lib/generators/build.js

@@ -3,14 +3,17 @@ var generateFile = require('./generateFile')
 var generateArticleScript = require('./generateArticleScript')
 var log = require('../../log')
 
-module.exports = async theme => {
-  var site = await generateArticleHtml(theme)
+module.exports = (theme, quiet) => {
   var generateTmpl = require(`./${theme}/generateTmpl`)
   var cwd = process.cwd()
   var config = require(`${cwd}/_config.json`)
 
-  await generateFile(`${cwd}/app/pages/article/article.js`, generateArticleScript(site))
-  await generateFile(`${cwd}/app/tmpl/homepage.html`, generateTmpl(site, config))
-
-  log.info('boowa build')
+  if (!quiet){
+    log.warn(`boowa build start...`)
+  }
+  
+  generateArticleHtml(theme).then(site => {
+    generateFile(`${cwd}/app/pages/article/article.js`, generateArticleScript(site))
+    generateFile(`${cwd}/app/tmpl/homepage.html`, generateTmpl(site, config))
+  })
 }

lib/generators/create.js

@@ -2,6 +2,8 @@ var generateFile = require('./generateFile')
 var build = require(`./build`)
 
 module.exports = async (blogname, theme) => {
-  await generateFile(`${process.cwd()}/_articles/${blogname}.md`, require(`./${theme}/articleMdTmpl`))
-  build(theme)
+  generateFile(`${process.cwd()}/_articles/${blogname}.md`, require(`./${theme}/articleMdTmpl`))
+    .then(() => {
+      build(theme, true)
+    })
 }

lib/generators/devInstall.js

@@ -0,0 +1,33 @@
+var exec = require('child_process').exec
+var log = require('../../log')
+
+var pkgs = [
+  'bankai',
+  'brfs',
+  'choo',
+  'endent',
+  'detect-indent',
+  'github-markdown-css',
+  'nanocomponent',
+  'prismjs',
+  'sheetify',
+  'sheetify-sass'
+]
+var installPkgs = pkgs.map(pkg => {
+  return () => {
+    var cmd = `npm install --save --cache-min Infinity --loglevel error ${pkg}`
+
+    exec(cmd, err => {
+      log.info(`pkg: ${pkg} installed.`)
+      return Promise.resolve(pkg)
+    })
+  }
+})
+
+module.exports = () => new Promise(async (resolve, reject) => {
+  log.warn('Installing packages, this might take a couple of minutes.')
+  await installPkgs.reduce((p, fn) => {
+    return p = p.then(fn)
+  }, Promise.resolve())
+  resolve()
+})

lib/generators/generateFile.js

@@ -3,7 +3,9 @@ var getDirName = require('path').dirname
 var fs = require('fs')
 var log = require('../../log')
 
-module.exports = (dest, tmpl) => {
+module.exports = (file, tmpl) => {
+  var cwd = process.cwd()
+  var dest = `${cwd}/${file}`
 
   return new Promise((resolve, reject) => {
     fs.access(getDirName(dest), err => {
@@ -22,11 +24,13 @@ module.exports = (dest, tmpl) => {
     })
 
     function writeFile() {
+
       fs.writeFile(dest, tmpl, 'utf8', err => {
         if (err) {
           reject()
           log.error(err)
         } else {
+          log.info(`file: ${file} generated.`)
           resolve()
         }
       })

lib/generators/index.js

@@ -2,34 +2,42 @@ var generateApp = require('./generateApp')
 var generateFile = require('./generateFile')
 var generateArticleScript = require('./generateArticleScript')
 var generateArticleHtml = require('./generateArticleHtml')
-var packageJsonTmpl = require('./packageJsonTmpl')
+var pkgTmpl = require('./pkgTmpl')
+var devInstall = require('./devInstall')
 var serviceWorkerTmpl = require('./serviceWorkerTmpl')
 var readmeMdTmpl = require('./readmeMdTmpl')
 var fs = require('fs')
 var log = require('../../log')
 
-module.exports = async (theme, isUpdate) => {
+module.exports = (theme, isUpdate) => {
   var cwd = process.cwd()
   var config = isUpdate ? require(`${cwd}/_config.json`) : undefined
 
   var configTmpl = require(`./${theme}/configTmpl`)
   var generateTmpl = require(`./${theme}/generateTmpl`)
   var articleDemoMdTmpl = require(`./${theme}/articleDemoMdTmpl`)
 
-  await generateApp(theme)
-  await generateFile(`${cwd}/package.json`, packageJsonTmpl)
-  await generateFile(`${cwd}/service-worker.js`, serviceWorkerTmpl)
-  await generateFile(`${cwd}/_articles/sheetify_document.md`, articleDemoMdTmpl)
-  await generateFile(`${cwd}/README.md`, readmeMdTmpl)
-  if (!isUpdate) {
-    await generateFile(`${cwd}/_config.json`, configTmpl)
-  }
-  var site = await generateArticleHtml(theme)
-  await generateFile(`${cwd}/app/pages/article/article.js`, generateArticleScript(site))
-  await generateFile(`${cwd}/app/tmpl/homepage.html`, generateTmpl(site, config))
+  log.warn(`boowa ${isUpdate ? 'update' : 'init'} start...`)
+
+  generateApp(theme).then(() => log.info(`choo app generated.`))
+
+  generateFile(`package.json`, pkgTmpl)
+  generateFile(`service-worker.js`, serviceWorkerTmpl)
+  generateFile(`_articles/sheetify_document.md`, articleDemoMdTmpl)
+  generateFile(`README.md`, readmeMdTmpl)
+
+  generateArticleHtml(theme).then(site => {
+    generateFile(`app/pages/article/article.js`, generateArticleScript(site))
+    generateFile(`app/tmpl/homepage.html`, generateTmpl(site, config))
+  })
+
   if (theme === 'austere') {
     var generateHeaderTmpl = require(`./${theme}/generateHeaderTmpl`)
-    await generateFile(`${cwd}/app/tmpl/header.html`, generateHeaderTmpl(config))
+    generateFile(`app/tmpl/header.html`, generateHeaderTmpl(config))
+  }
+
+  if (!isUpdate) {
+    generateFile(`_config.json`, configTmpl)
+    devInstall()
   }
-  log.info(`boowa ${isUpdate ? 'update' : 'init'}`)
 }

lib/generators/packageJsonTmpl.js renamed to lib/generators/pkgTmpl.js

@@ -4,26 +4,12 @@ module.exports = endent`
   {
     "name": "boowa-blog",
     "version": "1.0.0",
-    "description": "A blog generated by boowa",
     "main": "index.js",
     "scripts": {
       "start": "bankai start index.js",
+      "inspect": "bankai inspect index.js",
       "build": "bankai build index.js"
     },
-    "author": "",
-    "license": "MIT",
-    "dependencies": {
-      "bankai": "9.4.1",
-      "brfs": "^1.4.3",
-      "choo": "^6.8.0",
-      "endent": "^1.1.1",
-      "detect-indent": "^5.0.0",
-      "github-markdown-css": "^2.10.0",
-      "nanocomponent": "^6.5.0",
-      "prismjs": "^1.10.0",
-      "sheetify": "^7.2.0",
-      "sheetify-sass": "^2.0.0"
-    },
     "browserify": {
       "transform": [
         [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boowa",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "☁️☁️🚂☁️☁️ colorful blog generator",
   "scripts": {
     "test": "tape test/test.js"