start update to sling12

reusr1 · reusr1 · commit 0668bf0b08e4 · 2021-02-19T14:40:08.000-08:00
diff --git a/bin/percli b/bin/percli
@@ -3,8 +3,8 @@
 var args  = require('commander')
 var semver = require('semver')
 
-if(semver.satisfies(semver.clean(process.version), '>=7.10.0')) {
-    args.version('1.0.0')
+if(semver.satisfies(semver.clean(process.version), '>=14.0.0')) {
+    args.version(require('../package.json').version)
         .usage('<command> [options]')
         .command('check', 'hepful checks')
         .command('server', 'server specific commands')
@@ -17,7 +17,7 @@ if(semver.satisfies(semver.clean(process.version), '>=7.10.0')) {
 }
 else {
 	console.log()
-	console.log('[ERROR] percli requires nodejs version 7.10.0 or greater')
+	console.log('[ERROR] percli requires nodejs version 14.0.0 or greater')
     console.log()
 }
 
diff --git a/bin/percli-check b/bin/percli-check
@@ -3,7 +3,7 @@
 const args    = require('commander')
 const checkAvailable = require('../lib/available.js')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
     .usage('<technology>')
 	.parse(process.argv)
 
diff --git a/bin/percli-compile b/bin/percli-compile
@@ -8,7 +8,7 @@ const maven	  = require('maven')
 const watch   = require('node-watch');
 const ignore  = require('ignore')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.option('-w, --watch', 'watch project and recompile')
     .option('-d, --deploy', 'deploy to server')
 	.parse(process.argv)
diff --git a/bin/percli-create b/bin/percli-create
@@ -3,7 +3,7 @@
 var args    = require('commander')
 var asciify = require('asciify')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.command('project', 'create a peregrine sites project')
 	.command('component', 'create a component shell')
 	.command('object', 'create an object shell')
diff --git a/bin/percli-create-component b/bin/percli-create-component
@@ -9,7 +9,7 @@ const templates = require('../templates/index.js')
 const generator = require('../lib/generator.js')
 const functions = require('../lib/functions.js')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.usage('[options] <componentName>')
     .option('-c, --container', 'component is a container (may contain other components)')
     .option('-f, --force', 'force creation (deletes current stub)')
diff --git a/bin/percli-create-object b/bin/percli-create-object
@@ -9,7 +9,7 @@ const templates = require('../templates/index.js')
 const generator = require('../lib/generator.js')
 const functions = require('../lib/functions.js')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.usage('[options] <objectName>')
     .option('-c, --container', 'object is a container (may contain other objects)')
     .option('-f, --force', 'force creation (deletes current stub)')
diff --git a/bin/percli-create-project b/bin/percli-create-project
@@ -5,7 +5,7 @@ const maven = require('maven')
 const path  = require('path')
 const fileUrl = require('file-url')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.usage('[options] <projectname>')
 	.parse(process.argv)
 
diff --git a/bin/percli-hatch b/bin/percli-hatch
@@ -4,7 +4,7 @@ const args  = require('commander')
 
 const gen = require('../lib/htmltovue.js')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.option('-c, --compile', 'compile (build) the component')
     .option('-d, --deploy', 'deploy to server (note, if the model.json file has been changed a full build is necessary)')
 	.option('-f, --dialog', 'only convert the dialog')
diff --git a/bin/percli-hatchobject b/bin/percli-hatchobject
@@ -4,7 +4,7 @@ const args  = require('commander')
 
 const gen = require('../lib/htmltovue.js')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.usage('[options] <componentName>')
 	.parse(process.argv)
 
diff --git a/bin/percli-htmltovue b/bin/percli-htmltovue
@@ -4,7 +4,7 @@ const args  = require('commander')
 
 const gen = require('../lib/htmltovue.js')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.option('-c, --compile', 'compile (build) the component')
     .option('-d, --deploy', 'deploy to server (note, if the model.json file has been changed a full build is necessary)')
 	.option('-f, --dialog', 'only convert the dialog')
diff --git a/bin/percli-server b/bin/percli-server
@@ -3,7 +3,7 @@
 var args    = require('commander')
 var asciify = require('asciify')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
 	.command('install', 'install peregrine')
 	.command('register', 'register server')
 	.command('start', 'start peregrine')
diff --git a/bin/percli-server-install b/bin/percli-server-install
@@ -19,35 +19,29 @@ const {
   downloadFiles 
 } = require('../lib/fetch')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
   .option('-d, --download', 'only download')
   .option('-e, --existing', 'install on running server')
-  .option('-s, --sling [version]',  'force sling version')
+//  .option('-s, --sling [version]',  'force sling version')
   .option('-i, --install',  'only install')
   .option('-a, --author',  'install as author')
   .option('-p, --publish',  'install as publish')
   .option('-P, --port [port]',  'run on given port')
   .option('-n, --name [name]',  'register server with given name')
   .parse(process.argv)
 
-let port = 8080
-if(args.publish) {
-    port = 8180
-}
-
-if(args.port) {
-    port = args.port
-}
+// default
+let port = args.port ? args.port : (args.publish ? 8180: 8080)
 
-let sling = 9;
-if(args.sling) {
-  if(args.sling === '9' || args.sling === '11') {
-    sling = parseInt(args.sling);
-  } else {
-    console.log('only sling-9 and sling-11 are supported at this time - for other versions please log an enhancements request')
-    process.exit(-1);
-  }
-}
+let sling = 12;
+// if(args.sling) {
+//   if(args.sling === '9' || args.sling === '11') {
+//     sling = parseInt(args.sling);
+//   } else {
+//     console.log('only sling-9 and sling-11 are supported at this time - for other versions please log an enhancements request')
+//     process.exit(-1);
+//   }
+// }
 
 /* Flow Control ==========
 ========================== */
@@ -72,11 +66,9 @@ async function serverInstall() {
         // step 2
         var packagesList = await getPackageList(sling)
 
-        //step 3
-        await downloadFile(`https://vagrant.headwire.com/sling/9/org.apache.sling.launchpad-${sling}.jar`, `sling-${sling}.jar`)
-
         // step 4
         await downloadFiles(packagesList, sling)
+        process.exit(0)
     }
 
     setPort(port)
diff --git a/bin/percli-server-list b/bin/percli-server-list
@@ -4,7 +4,7 @@ const args = require('commander')
 const { listServers }  = require('../lib/tasks')
 const { peregrineBanner } = require('../lib/banner.js')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
     .parse(process.argv)
 
 listServers()
diff --git a/bin/percli-server-register b/bin/percli-server-register
@@ -18,7 +18,7 @@ const {
   downloadFiles 
 } = require('../lib/fetch')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
   .usage('[options] <componentName>')
   .parse(process.argv)
 
diff --git a/bin/percli-server-start b/bin/percli-server-start
@@ -6,7 +6,7 @@ const { peregrineBanner } = require('../lib/banner.js')
 const fs = require('fs')
 const path = require('path')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
     .option('-a, --author', 'start as author')
     .option('-s, --standalone', 'start as standalone')
     .option('-p, --publish', 'start as publish')
diff --git a/bin/percli-server-stop b/bin/percli-server-stop
@@ -7,7 +7,7 @@ const { peregrineBanner } = require('../lib/banner.js')
 const fs = require('fs')
 const path = require('path')
 
-args.version('1.0.0')
+args.version(require('../package.json').version)
     .option('-n, --name [name]', 'start server by name')
     .parse(process.argv)
 
diff --git a/lib/available.js b/lib/available.js
@@ -1,3 +1,8 @@
+/**
+ * check if java is avilable and what version of java we find
+ * 
+ * @param {*} callback 
+ */
 function javaversion(callback) {
     var spawn = require('child_process').spawn('java', ['-version']);
     spawn.on('error', function(err){
@@ -19,7 +24,11 @@ function javaversion(callback) {
     })
 }
 
-
+/**
+ * calls the callback with the java version we found
+ * 
+ * @param {*} reportStatus 
+ */
 const java = function(reportStatus) {
     javaversion(function(err,version){
         if(version) {
@@ -31,6 +40,11 @@ const java = function(reportStatus) {
     });
 }
 
+/**
+ * calls the callback with the maven version we found
+ * 
+ * @param {*} reportStatus 
+ */
 const maven = function(reportStatus) {
     try {
         require('maven').create({quiet: true}).execute(['--version']).then( () => {
@@ -41,21 +55,40 @@ const maven = function(reportStatus) {
     }
 }
 
+/**
+ * reports a failure to the callback
+ * 
+ * @param {*} reportStatus 
+ */
 const fail = function(reportStatus) {
     reportStatus('fail', false);
 }
 
+/**
+ * list of available version reporters
+ * 
+ */
 const available = {
     java: java,
     maven: maven,
     fail: fail
 }
 
+/**
+ * current status
+ * 
+ */
 const status = {
 
 }
 
-
+/**
+ * checks the given [<tech>,...] and reports back the version to the callback
+ * [<tech>] can be set to ['available'] to report on all
+ * 
+ * @param {String} tech 
+ * @param {function} cb 
+ */
 function checkAvailable(tech, cb) {
 
     function reportStatus(technology, techstatus, version = undefined) {
@@ -93,5 +126,5 @@ function checkAvailable(tech, cb) {
     }
 }
 
-module.exports = checkAvailable
-
+/* exports its checkAvailable method */
+module.exports = checkAvailable
diff --git a/lib/fetch.js b/lib/fetch.js
@@ -59,14 +59,15 @@ module.exports = {
     },
 
     /**
-        * Downloads all of the peregrine packages
+        * Downloads a list of files and writes them to the output folder
         * @param {array} packages - the packages
         * @return {download} the download
     */
     downloadFiles(packages, sling){
-        const prefix = sling === 9 ? '': 'sling11/';
         return axios.all(packages.map(package => {
-            return download(`https://vagrant.headwire.com/peregrine/${prefix}${package}`, package)
+            if(!package.startsWith('#')) {
+                return download(package, package.substring(package.lastIndexOf('/')+1))
+            }
         }))
     }
 }
diff --git a/lib/tasks.js b/lib/tasks.js
@@ -365,10 +365,8 @@ module.exports = {
         * @return {string} the package list
     */
     getPackageList(sling) {
-        const packagesUrl = sling === 9 ?   'https://vagrant.headwire.com/peregrine/packages.txt' :
-                                            'https://vagrant.headwire.com/peregrine/sling11/packages.txt'; 
         return new Promise( (resolve, reject) => {
-            fetch(packagesUrl)
+            fetch('https://raw.githubusercontent.com/wiki/headwirecom/percli/percli-server-install-script.md')
                 .then(res => { resolve(res.data.split('\n').filter(line => line.length > 0)) })
                 .catch(err => { reject(`failed to download ${packagesUrl}`) })
         })
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
