feat: new option to upgrade recursive

resolve #47

Author: Val-istar-Guo

bin/mili

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 const program = require('commander')
+const { join } = require('path')
 const log = require('../src/utils/log')
 const mili = require('../src/mili')
 const { version } = require('../package.json')
@@ -30,17 +31,25 @@ program
       .catch(err => log.error('program', 'initialize break', err))
   })
 
+const collect = (val, memo) => {
+  memo.push(val);
+  return memo;
+}
+
 program
   .command('upgrade')
   .description('upgrade the template')
   .option('--force')
   .option('--no-deps', 'Need not install dependencies', false)
+  .option('-r, --recursive', 'Upgrade recursive all subfolder')
+  .option('--ignore [file]', 'the folder need not search', collect, [])
   .action((option) => {
-    const { force = false, deps = true } = option
+    const { force = false, deps = true, recursive } = option
+    const cwd = process.cwd()
+    const ignore = option.ignore.map(item => join(cwd, item))
 
-    mili.upgrade({ force, noDeps: !deps })
-      .then(() => log.info('upgrade complete'))
-      .catch(err => log.error('program', 'upgrade break', err))
+    mili.upgrade({ force, noDeps: !deps, recursive, ignore })
+    .catch(err => log.error('program', 'upgrade break', err))
   })
 
 program

src/apply-template/copy-files.js

@@ -50,12 +50,12 @@ const appendFileHeader = file => {
 }
 
 
-const copy = async (file, to) => {
+const copy = async (file) => {
   const content = await fs.readFile(file.path, file.encoding)
 
   file = file.handlers.reduce(
     (file, handler) => handler.genFile(file),
-    { ...file, content, targetPath: join(to, file.targetPath) }
+    { ...file, content, targetPath: file.targetPath }
   )
 
   file = appendFileHeader(file)
@@ -66,6 +66,6 @@ const copy = async (file, to) => {
 
 module.exports = async (config) => {
   for (let file of config.template.files) {
-    await copy({ ...file, view: { ...config, custom: {} } }, config.project.path)
+    await copy({ ...file, view: { ...config, custom: {} } })
   }
 }

src/apply-template/generate-milirc/index.js

@@ -3,9 +3,9 @@ const { join } = require('path')
 const mustache = require('mustache')
 
 
-module.exports = async (cwd, config) => {
+module.exports = async config => {
   const template = await fs.readFile(join(__dirname, 'template.mustache'), 'utf8')
   const milirc = mustache.render(template, config)
 
-  await fs.writeFile(join(cwd, '.milirc.yml'), milirc, 'utf8')
+  await fs.writeFile(join(config.project.path, '.milirc.yml'), milirc, 'utf8')
 }

src/apply-template/index.js

@@ -4,10 +4,10 @@ const copyFiles = require('./copy-files')
 const initFolder = require('./init-folder')
 
 
-module.exports = async (cwd, config) => {
+module.exports = async (config) => {
   log.info('initial folders...')
   await initFolder(config.template.files)
   log.info('copy files...')
   await copyFiles(config)
-  await genMilirc(cwd, config)
+  await genMilirc(config)
 }

src/commands/init.js

@@ -57,6 +57,6 @@ module.exports = async (options = {}) => {
   }
 
   await prompt(config)
-  await applyTemplate(cwd, config)
+  await applyTemplate(config)
   await config.template.hooks('afterInit')
 }

src/commands/update.js

@@ -89,6 +89,6 @@ module.exports = async (options) => {
 
   await prompt(config)
   config.template.files = config.template.files.filter(file => file.upgrade !== 'keep')
-  await applyTemplate(cwd, config)
+  await applyTemplate(config)
   await config.template.hooks('afterUpdate')
 }

src/commands/upgrade/index.js

@@ -0,0 +1,12 @@
+const upgradeRecursive = require('./upgrade-recursive')
+const upgrade = require('./upgrade')
+
+
+module.exports = async options => {
+  if (options.recursive) {
+    await upgradeRecursive(options)
+  } else {
+    await upgrade(options)
+    log.info('upgrade complete')
+  }
+}

src/commands/upgrade/upgrade-recursive.js

@@ -0,0 +1,40 @@
+const { join } = require('path')
+const fs = require('fs-extra')
+const glob = require('micromatch')
+const upgrade = require('./upgrade')
+const log = require('../../utils/log')
+
+
+const upgradeRecursive = async (dir, ignore, options) => {
+  const stats = await fs.stat(dir)
+  if (!stats.isDirectory()) return
+
+  if (await fs.pathExists(join(dir, '.milirc.yml'))) {
+    log.info(`upgrading ${dir}`)
+    await upgrade({ ...options, cwd: dir })
+    console.log('\n ')
+  }
+
+  let folders = await fs.readdir(dir)
+  folders = folders
+    .map(filename => join(dir, filename))
+    .filter(filepath => !glob.isMatch(filepath, ignore))
+
+  /**
+   * NOTE: There should upgrade one by one,
+   *       because it's possible that two of these projects were used same template,
+   *       resulting in template download conflict.
+   */
+  for (let folder of folders) {
+    await upgradeRecursive(folder, ignore, options)
+  }
+}
+
+module.exports = async options => {
+  const {
+    cwd = process.cwd(),
+    ignore,
+  } = options
+
+  await upgradeRecursive(cwd, ignore, options)
+}

src/commands/upgrade.js renamed to src/commands/upgrade/upgrade.js

@@ -1,12 +1,12 @@
-const loadConfig = require('../load-config')
+const loadConfig = require('../../load-config')
 const semver = require('semver')
-const downloadTemplate = require('../download-template')
-const getTemplateVersions = require('../get-template-versions')
-const applyTemplate = require('../apply-template')
-const securityCheck = require('../security-check')
-const log = require('../utils/log')
-const prompt = require('../prompt')
-const checkParams = require('../check-params')
+const downloadTemplate = require('../../download-template')
+const getTemplateVersions = require('../../get-template-versions')
+const applyTemplate = require('../../apply-template')
+const securityCheck = require('../../security-check')
+const log = require('../../utils/log')
+const prompt = require('../../prompt')
+const checkParams = require('../../check-params')
 
 
 module.exports = async (options = {}) => {
@@ -39,6 +39,8 @@ module.exports = async (options = {}) => {
 
   await prompt(config)
   config.template.files = config.template.files.filter(file => file.upgrade !== 'keep')
-  await applyTemplate(cwd, config)
+  await applyTemplate(config)
   await config.template.hooks('afterUpgrade')
+
+  log.info('upgrade complete')
 }

src/load-config/index.js

@@ -1,13 +1,36 @@
+const { join } = require('path')
 const loadMiliConfig = require('./load-mili-config')
 const loadTemplateConfig = require('./load-template-config')
 const loadProjectConfig = require('./load-project-config')
+const loadMilirc = require('./load-milirc')
 
 
 const loadConfig = async ({ cwd, projectName, templateRepository, templateVersion, loadTemplate }) => {
+  const milirc = await loadMilirc(cwd)
+
+  if (!templateRepository) {
+    if (milirc.template && milirc.template.repository) templateRepository = milirc.template.repository
+    else throw new Error('Unable to find template repository, please check whether milirc is configured correctly')
+  }
+
+  if (!templateVersion && milirc.template && milirc.template.version) {
+    templateVersion = {
+      number: milirc.template.version
+    }
+  }
+
   const mili = await loadMiliConfig()
   const template = await loadTemplateConfig(templateRepository, templateVersion, loadTemplate)
   const project = await loadProjectConfig(cwd, projectName)
 
+  // NOTE: generate the path that relative to the output folder
+  if (typeof template.repository.path === 'function') template.repository.path = template.repository.path(cwd)
+
+  // NOTE: The files of template's targetPath should point to project
+  template.files = template.files.map(file => ({
+    ...file,
+    targetPath: join(project.path, file.targetPath),
+  }))
 
   return {
     mili,