Merge pull request #100 from amclin/feat/prompt-git

Feat/prompt git

Author: developher-net

create-app.js

@@ -21,7 +21,17 @@ const templateSettings = require('./templates/default.json')
 const ssrTemplateSettings = require('./templates/default-ssr.json')
 const staticTemplateSettings = require('./templates/default-static.json')
 
-const createApp = async ({ appPath, useNpm, noGit = false, isStatic, example }) => {
+const createApp = async ({
+  appPath,
+  example,
+  gitRemote,
+  isStatic,
+  noGit = false,
+  useNpm
+}) => {
+  const root = path.resolve(appPath)
+  const appName = path.basename(root)
+
   if (example) {
     const found = await hasExample(example)
     if (!found) {
@@ -34,8 +44,6 @@ const createApp = async ({ appPath, useNpm, noGit = false, isStatic, example })
     }
   }
 
-  const root = path.resolve(appPath)
-  const appName = path.basename(root)
   const version = '0.1.0'
 
   await makeDir(root)
@@ -54,7 +62,6 @@ const createApp = async ({ appPath, useNpm, noGit = false, isStatic, example })
   await makeDir(root)
   process.chdir(root)
 
-  const gitRemote = `git+ssh://[email protected]/amclin/${appName}.git`
   const homepage = `https://github.com/amclin/${appName}`
   const author = userName()
   const year = new Date().getFullYear()
@@ -103,9 +110,7 @@ const createApp = async ({ appPath, useNpm, noGit = false, isStatic, example })
           url: `${homepage}/issues`
         }
       },
-      (isStatic) ?
-        staticTemplateSettings.package :
-        ssrTemplateSettings.package
+      isStatic ? staticTemplateSettings.package : ssrTemplateSettings.package
     )
 
     fs.writeFileSync(
@@ -142,11 +147,8 @@ const createApp = async ({ appPath, useNpm, noGit = false, isStatic, example })
     })
     log()
 
-    const copyTemplateFiles = (dir) => {
-      return cpy([
-        '**',
-        '.dependabot/**'
-      ], root, {
+    const copyTemplateFiles = dir => {
+      return cpy(['**', '.dependabot/**'], root, {
         parents: true,
         cwd: path.join(__dirname, 'templates', dir),
         rename: name => {
@@ -170,11 +172,7 @@ const createApp = async ({ appPath, useNpm, noGit = false, isStatic, example })
     // For sites with server-side React (not staticly generated)
     // We need a different docker file and different build
     // instructions
-    await copyTemplateFiles(
-      (isStatic) ?
-        'default-static' :
-        'default-ssr'
-    )
+    await copyTemplateFiles(isStatic ? 'default-static' : 'default-ssr')
 
     await populateProject({ root, appName, homepage, author, year })
   }

helpers/populate-project.test.js

@@ -55,4 +55,6 @@ describe('populate-project', () => {
     expect(result.includes('mockAppName'))
     expect(result.includes('http://example.com/mockHomepage'))
   })
+
+  it.skip('logs an error when it cannot replace variables', {})
 })

helpers/should-use-yarn.test.js

@@ -0,0 +1,15 @@
+const childProcess = require('child_process')
+const { shouldUseYarn } = require('./should-use-yarn')
+
+jest.mock('child_process')
+
+describe('should-use-yarn', () => {
+  it('returns true when the system has yarn installed', () => {
+    childProcess.execSync.mockImplementationOnce(() => true)
+    expect(shouldUseYarn()).toEqual(true)
+  })
+  it('returns false when the system has an error or yarn is not installed', () => {
+    childProcess.execSync.mockImplementationOnce(() => { throw new Error('mock error') })
+    expect(shouldUseYarn()).toEqual(false)
+  })
+})

index.js

@@ -22,7 +22,10 @@ const program = new Commander.Command(packageJson.name)
   })
   .option('--use-npm')
   .option('--no-git', 'skip git creation and commits')
-  .option('--with-ssr', 'the generated project will have React server-side rendering')
+  .option(
+    '--with-ssr',
+    'the generated project will have React server-side rendering'
+  )
   .option(
     '-e, --example <example-path>',
     'an example to bootstrap the app with'
@@ -56,11 +59,22 @@ async function run() {
     questions.push({
       type: 'confirm',
       name: 'isStatic',
-      message: 'Is this app a statically-generated site? (For server-side-rendering choose No)',
+      message:
+        'Is this app a statically-generated site? (For server-side-rendering choose No)',
       initial: true
     })
   }
 
+  const defaultGitUrl = 'git+ssh://[email protected]/example/example.git'
+  if (program.git) {
+    questions.push({
+      type: 'text',
+      name: 'gitUrl',
+      message: 'Please provide the full URL used to clone the git repo:',
+      initial: defaultGitUrl
+    })
+  }
+
   const res = await prompts(questions)
 
   if (typeof res.path === 'string') {
@@ -98,7 +112,8 @@ async function run() {
     appPath: resolvedProjectPath,
     useNpm: !!program.useNpm,
     noGit: !program.git,
-    isStatic: (program.withSsr) ? !program.withSsr : res.isStatic,
+    isStatic: program.withSsr ? !program.withSsr : res.isStatic,
+    gitRemote: program.git ? res.gitUrl : defaultGitUrl,
     example:
       typeof program.example === 'string' && program.example.trim()
         ? program.example.trim()
@@ -115,7 +130,11 @@ async function notifyUpdate() {
       const isYarn = shouldUseYarn()
 
       log()
-      log(chalk.yellow.bold('A new version of `create-amclin-nextjs-app` is available!'))
+      log(
+        chalk.yellow.bold(
+          'A new version of `create-amclin-nextjs-app` is available!'
+        )
+      )
       log(`
         You can update by running:
           ${chalk.cyan(
@@ -125,7 +144,9 @@ async function notifyUpdate() {
           )}
       `)
       log()
-      log(`But an even better option is to globally uninstall and in the future run:`)
+      log(
+        `But an even better option is to globally uninstall and in the future run:`
+      )
       log(chalk.cyan()` npx create-amclin-nextjs-app`)
       log(`That way you'll always have the latest.`)
     }