cli

mariusandra · Sep 26, 2019 · 7268d8a · 7268d8a
1 parent e146651
commit 7268d8a
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 128 deletions.
diff --git a/old-packages/insights-server/package.json b/old-packages/insights-server/package.json
diff --git a/old-packages/insights-server/yarn.lock b/old-packages/insights-server/yarn.lock
diff --git a/...es/insights-server/app/createsuperuser.js → packages/insights-cli/app/createsuperuser.js b/...es/insights-server/app/createsuperuser.js → packages/insights-cli/app/createsuperuser.js
@@ -2,9 +2,9 @@
 // - INSIGHTS_SUPERUSER_EMAIL
 // - INSIGHTS_SUPERUSER_PASSWORD
 
-const app = require('insights-core/src')
+const app = require('insights-api/src')
 const prompt = require('prompt-promise')
-const randomString = require('insights-core/src/lib/random-string')
+const randomString = require('../lib/random-string')
 
 const azAZ09 = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
 

diff --git a/old-packages/insights-server/app/index.js → packages/insights-cli/app/index.js b/old-packages/insights-server/app/index.js → packages/insights-cli/app/index.js
diff --git a/packages/insights-cli/bin/insights b/packages/insights-cli/bin/insights
@@ -7,11 +7,10 @@ var pkg = require(path.join(root, 'package.json'))
 
 program.version(pkg.version)
   .usage('<command> [options]')
-  .description('Run insights dekstop app, server or helper commands')
+  .description('Run insights server or helper commands')
 
 program
-  .command('desktop', 'run the desktop/electron app [default]', { isDefault: true })
-  .command('server', 'run as a server')
+  .command('start', 'run as a server')
   .command('createsecret', 'create a new authentication secret')
   .command('createsuperuser', 'create a new admin user')
 

diff --git a/...insights-server/bin/insights-createsecret → ...es/insights-cli/bin/insights-createsecret b/...insights-server/bin/insights-createsecret → ...es/insights-cli/bin/insights-createsecret
@@ -5,7 +5,7 @@ var path = require('path')
 var program = require('commander')
 var root = path.join(__dirname, '..')
 var pkg = require(path.join(root, 'package.json'))
-var randomString = require('insights-core/src/lib/random-string')
+var randomString = require('../lib/random-string')
 
 program.version(pkg.version)
   .usage('[options]')
@@ -15,6 +15,16 @@ program.version(pkg.version)
 
 const secretPath = program.secret || path.join(require('os').homedir(), '.insights', 'secret')
 
+let folder = secretPath.split(path.sep)
+folder.pop()
+const folderPath = folder.join(path.sep)
+try {
+  fs.mkdirSync(folderPath, { recursive: true })
+} catch (error) {
+  console.error(`Fatal Error! Could not create folder ${folderPath}`)
+  process.exit(1)
+}
+
 try {
   fs.writeFileSync(secretPath, randomString(64), 'utf8')
   console.log(`New authentication secret stored at ${secretPath}`)

diff --git a/...ights-server/bin/insights-createsuperuser → ...insights-cli/bin/insights-createsuperuser b/...ights-server/bin/insights-createsuperuser → ...insights-cli/bin/insights-createsuperuser
@@ -4,7 +4,7 @@ var path = require('path')
 var program = require('commander')
 var root = path.join(__dirname, '..')
 var pkg = require(path.join(root, 'package.json'))
-var randomString = require('insights-core/src/lib/random-string')
+var randomString = require('../lib/random-string')
 
 program.version(pkg.version)
   .usage('[options]')

diff --git a/...kages/insights-server/bin/insights-server → packages/insights-cli/bin/insights-start b/...kages/insights-server/bin/insights-server → packages/insights-cli/bin/insights-start
diff --git a/packages/insights-cli/lib/random-string.js b/packages/insights-cli/lib/random-string.js
@@ -0,0 +1,9 @@
+let az09 = 'abcdefghijklmnopqrstuvwxyz0123456789'
+
+module.exports = function randomString (len, charset = az09) {
+  let text = ''
+  for (let i = 0; i < len; i++) {
+    text += charset.charAt(Math.floor(Math.random() * charset.length))
+  }
+  return text
+}
diff --git a/packages/insights-cli/package.json b/packages/insights-cli/package.json
@@ -16,6 +16,12 @@
   "contributors": [],
   "repository": "mariusandra/insights",
   "bugs": {},
+  "bin": {
+    "insights": "./bin/insights",
+    "insights-start": "./bin/insights-start",
+    "insights-createsecret": "./bin/insights-createsecret",
+    "insights-createsuperuser": "./bin/insights-createsuperuser"
+  },
   "directories": {
     "lib": "app"
   },
@@ -24,9 +30,6 @@
     "yarn": ">= 0.18.0"
   },
   "scripts": {},
-  "bin": {
-    "insights": "./bin/insights"
-  },
   "files": [
     "bin"
   ],