@newlogic-digital/cli 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlogic-digital/cli",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "main": "index.mjs",
   "bin": {
     "newlogic-cli": "index.mjs",

package/src/commands/init/cms.mjs

@@ -12,14 +12,34 @@ async function move(path, options = {}) {
     await fse.move(join(tempDir, path), resolve(process.cwd(), path), options).catch(err => console.log(`${pc.red(err)} - ${path}`))
 }
 
-function clone(path, { variant, branch }) {
+async function clone(path, { variant, branch }) {
     if (variant === 'cms-web') {
         variant = 'newlogic-cms-next-web'
     } else if (variant === 'cms-eshop') {
         variant = 'newlogic-cms-next-eshop'
     }
 
-    execSync(`git clone -b ${branch} --single-branch --depth 1 git@git.newlogic.cz:newlogic-dev/${variant}.git ${path}`)
+    const { clone } = await prompts([
+        {
+            type: 'select',
+            name: 'clone',
+            message: 'Clone with SSH or HTTPS?',
+            choices: [
+                { title: 'SSH', value: 'ssh' },
+                { title: 'HTTPS', value: 'https' }
+            ]
+        }
+    ])
+
+    let url = ''
+
+    if (clone === 'ssh') {
+        url = 'git@git.newlogic.cz:newlogic-digital'
+    } else if (clone === 'https') {
+        url = 'https://git.newlogic.cz/newlogic-digital'
+    }
+
+    execSync(`git clone -b ${branch} --single-branch --depth 1 ${url}/${variant}.git ${path}`)
 }
 
 async function install(name, branch) {
@@ -38,7 +58,7 @@ async function install(name, branch) {
     if (install === 'yes') {
         execSync(`cd ${name || '.'} && composer install`)
 
-        if (fs.existsSync(resolve(process.cwd(), 'Makefile'))) {
+        if (fs.existsSync(resolve(join(process.cwd(), name || ''), 'Makefile'))) {
             execSync(`cd ${name || '.'} && make install ${branch || ''}`)
         } else {
             execSync(`cd ${name || '.'} && composer install-${branch || ''}`)
@@ -73,7 +93,7 @@ async function migrations(name) {
         {
             type: 'select',
             name: 'install',
-            message: 'Init phinx migrations?',
+            message: 'Init phinx migrations and seed?',
             choices: [
                 { title: 'yes', value: 'yes' },
                 { title: 'no', value: 'no' }
@@ -106,7 +126,7 @@ async function prepare() {
 
 export default async function cms(name, { variant, branch }) {
     if (name) {
-        clone(name, { variant, branch })
+        await clone(name, { variant, branch })
         await install(name, branch)
         await prepare()
         await dev()
@@ -114,36 +134,42 @@ export default async function cms(name, { variant, branch }) {
         return
     }
 
-    if (fs.existsSync(tempDir)) {
+    if (!fs.existsSync(resolve(process.cwd(), 'composer.json'))) {
+        if (fs.existsSync(tempDir)) {
+            fse.removeSync(tempDir)
+        }
+
+        await clone(tempDir, { variant, branch })
+
+        await move('.docker')
+        await move('app')
+        await move('bin')
+        await move('config')
+        await move('log')
+        await move('public/index.php')
+        await move('src/views')
+        await move('storage')
+        await move('temp')
+        await move('tests')
+        await move('.gitignore', { overwrite: true })
+        await move('README.md', { overwrite: true })
+        await move('composer.json')
+        await move('composer.lock')
+        await move('docker-compose.yml')
+        await move('Makefile') // deprecated
+        await move('phpstan.neon')
+        await move('phpunit.xml')
+        await move('pint.json')
+        await move('rector.php')
+        await fse.move(join(tempDir, '.gitlab-ci.prod.yml'), resolve(process.cwd(), '.gitlab-ci.yml'), { overwrite: true }).catch(err => console.log(`${pc.red(err)} - .gitlab-ci.yml`))
+
         fse.removeSync(tempDir)
+    } else {
+        console.log(pc.yellow('Project files already exist in the directory, skipping copy step (delete composer.json to force)'))
     }
 
-    clone(tempDir, { variant, branch })
-
-    await move('.docker')
-    await move('app')
-    await move('bin')
-    await move('config')
-    await move('log')
-    await move('public/index.php')
-    await move('src/views')
-    await move('storage')
-    await move('temp')
-    await move('tests')
-    await move('.gitignore', { overwrite: true })
-    await move('README.md', { overwrite: true })
-    await move('composer.json')
-    await move('composer.lock')
-    await move('docker-compose.yml')
-    await move('Makefile') // deprecated
-    await move('phpstan.neon')
-    await move('phpunit.xml')
-    await move('pint.json')
-    await move('rector.php')
-    await fse.move(join(tempDir, '.gitlab-ci.prod.yml'), resolve(process.cwd(), '.gitlab-ci.yml'), { overwrite: true }).catch(err => console.log(`${pc.red(err)} - .gitlab-ci.yml`))
-
-    fse.removeSync(tempDir)
-
     await install(name, branch)
     await prepare()
+    await dev()
+    await migrations()
 }

package/src/commands/init/ui.mjs

@@ -4,7 +4,27 @@ import prompts from 'prompts'
 import { join, resolve } from 'path'
 
 export default async function ui(name, { branch }) {
-    execSync(`git clone -b ${branch} --single-branch --depth 1 git@git.newlogic.cz:newlogic-dev/newlogic-ui.git ${name || '.'}`)
+    const { clone } = await prompts([
+        {
+            type: 'select',
+            name: 'clone',
+            message: 'Clone with SSH or HTTPS?',
+            choices: [
+                { title: 'SSH', value: 'ssh' },
+                { title: 'HTTPS', value: 'https' }
+            ]
+        }
+    ])
+
+    let url = ''
+
+    if (clone === 'ssh') {
+        url = 'git@git.newlogic.cz:newlogic-digital'
+    } else if (clone === 'https') {
+        url = 'https://git.newlogic.cz/newlogic-digital'
+    }
+
+    execSync(`git clone -b ${branch} --single-branch --depth 1 ${url}/newlogic-ui.git ${name || '.'}`)
 
     const gitPath = name ? join(resolve(process.cwd(), name), '.git') : resolve(process.cwd(), '.git')