update sao

package.json

@@ -1,14 +1,14 @@
 {
-  "name": "template-template",
+  "name": "sao-generator",
   "version": "0.9.1",
-  "description": "Scaffold out an SAO template",
+  "description": "Scaffold out an SAO generator",
   "main": "index.js",
   "repository": {
-    "url": "egoist/template-template",
+    "url": "saojs/sao-generator",
     "type": "git"
   },
   "scripts": {
-    "test": "ava test/test*.js"
+    "test": "ava"
   },
   "author": "EGOIST <[email protected]>",
   "license": "MIT",
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "ava": "^0.21.0",
-    "sao": "^0.20.8"
+    "sao": "^1.0.0"
   }
 }

saofile.js

@@ -0,0 +1,58 @@
+const superb = require('superb')
+
+module.exports = {
+  prompts() {
+    return [
+      {
+        name: 'name',
+        message: 'What is the name of the new generator (must be sao-*)',
+        default: this.outFolder,
+        filter: val => val.toLowerCase()
+      },
+      {
+        name: 'description',
+        message: 'How would you descripe the new template',
+        default: `my ${superb()} SAO generator`
+      },
+      {
+        name: 'username',
+        message: 'What is your GitHub username',
+        default: this.gitUser.username || this.gitUser.name,
+        filter: val => val.toLowerCase(),
+        store: true
+      },
+      {
+        name: 'email',
+        message: 'What is your email?',
+        default: this.gitUser.email,
+        store: true
+      },
+      {
+        name: 'website',
+        message: 'The URL of your website',
+        default({ username }) {
+          return `github.com/${username}`
+        },
+        store: true
+      }
+    ]
+  },
+  actions: [
+    {
+      type: 'add',
+      files: '**',
+      transformExclude: 'template/**'
+    },
+    {
+      type: 'move',
+      patterns: {
+        gitignore: '.gitignore'
+      }
+    }
+  ],
+  async completed() {
+    this.gitInit()
+    await this.npmInstall()
+    this.showProjectTips()
+  }
+}

template/README.md

@@ -15,7 +15,7 @@ npm i -g sao
 ### From npm
 
 ```bash
-sao <%= name.replace('template-', '') %> my-project
+sao <%= name.replace('sao-', '') %> my-project
 ```
 
 ### From git

template/circle.yml

@@ -1,4 +1,4 @@
-<% const lockFile = _.pm === 'yarn' ? 'yarn.lock' : 'package-lock.json' -%>
+<% const lockFile = context.npmClient === 'yarn' ? 'yarn.lock' : 'package-lock.json' -%>
 version: 2
 jobs:
   build:
@@ -15,11 +15,11 @@ jobs:
           key: dependency-cache-{{ checksum "<%= lockFile %>" }}
       - run:
           name: install dependences
-          command: <%= _.pm %> install
+          command: <%= context.npmClient %> install
       - save_cache:
           key: dependency-cache-{{ checksum "<%= lockFile %>" }}
           paths:
             - ./node_modules
       - run:
           name: test
-          command: <%= _.pm %> test
+          command: <%= context.npmClient %> test

template/package.json

@@ -9,7 +9,7 @@
   "author": "<%= username %> <<%= email %>> (<%= website %>)",
   "license": "MIT",
   "files": [
-    "sao.js",
+    "saofile.js",
     "template"
   ],
   "scripts": {
@@ -20,6 +20,6 @@
   },
   "devDependencies": {
     "ava": "^0.21.0",
-    "sao": "^0.22.1"
+    "sao": "^1.0.0"
   }
 }

template/saofile.js

@@ -0,0 +1,56 @@
+const superb = require('superb')
+
+module.exports = {
+  prompts() {
+    return [
+      {
+        name: 'name',
+        message: 'What is the name of the new generator (must be sao-*)',
+        default: this.outFolder,
+        filter: val => val.toLowerCase()
+      },
+      {
+        name: 'description',
+        message: 'How would you descripe the new project',
+        default: `my ${superb()} project`
+      },
+      {
+        name: 'username',
+        message: 'What is your GitHub username',
+        default: this.gitUser.username || this.gitUser.name,
+        filter: val => val.toLowerCase(),
+        store: true
+      },
+      {
+        name: 'email'
+        message: 'What is your email?',
+        default: this.gitUser.email,
+        store: true
+      },
+      {
+        message: 'The URL of your website',
+        default({ username }) {
+          return `github.com/${username}`
+        },
+        store: true
+      }
+    ]
+  },
+  actions: [
+    {
+      type: 'add',
+      files: '**'
+    },
+    {
+      type: 'move',
+      patterns: {
+        gitignore: '.gitignore'
+      }
+    }
+  ],
+  async completed() {
+    this.gitInit()
+    await this.npmInstall()
+    this.showProjectTips()
+  }
+}

template/test/test.js

@@ -2,10 +2,10 @@ import path from 'path'
 import test from 'ava'
 import sao from 'sao'
 
-const template = path.join(__dirname, '..')
+const generator = path.join(__dirname, '..')
 
 test('defaults', async t => {
-  const stream = await sao.mockPrompt(template)
+  const stream = await sao.mock({ generator })
 
   t.snapshot(stream.fileList, 'Generated files')
 })

test/snapshots/test.js.md

@@ -16,7 +16,7 @@ Generated by [AVA](https://ava.li).
       'README.md',
       'circle.yml',
       'package.json',
-      'sao.js',
+      'saofile.js',
       'template/.editorconfig',
       'template/.gitattributes',
       'template/LICENSE',

test/test.js

@@ -2,10 +2,10 @@ import path from 'path'
 import test from 'ava'
 import sao from 'sao'
 
-const template = path.join(__dirname, '..')
+const generator = path.join(__dirname, '..')
 
 test('defaults', async t => {
-  const stream = await sao.mockPrompt(template)
+  const stream = await sao.mock({ generator })
 
   t.snapshot(stream.fileList, 'Generated files')
 })