Pull in CLI updates (#708)

* redo1

* redo2

* redo3

* redo4

* version reporting updates

* updates

* corrections

Author: mbwhite

packages/composer-admin/index.js

@@ -40,3 +40,4 @@ module.exports.AdminConnection = require('./lib/adminconnection');
  */
 module.exports.BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
 module.exports.Logger = require('composer-common').Logger;
+module.exports.version = require('./package.json');

packages/composer-cli/cli.js

@@ -35,10 +35,10 @@ let results = yargs
     .epilogue('For more information on Fabric Composer: https://fabric-composer.github.io/')
     .alias('v', 'version')
     .version(function() {
-        return getInfo('composer-cli')+'\n'+
-          getInfo('composer-admin')+'\n'+getInfo('composer-client')+'\n'+
-          getInfo('composer-common')+'\n'+getInfo('composer-runtime-hlf')+
-          '\n'+getInfo('composer-connector-hlf')+'\n';
+        return getInfo('composer-cli')+
+          getInfo('composer-admin')+getInfo('composer-client')+
+          getInfo('composer-common')+getInfo('composer-runtime-hlf')+
+          getInfo('composer-connector-hlf');
     })
     .describe('v', 'show version information')
     .command(
@@ -58,10 +58,12 @@ let results = yargs
 
 if (typeof(results.thePromise) !== 'undefined'){
     results.thePromise.then( () => {
+
         console.log(chalk.green('\nCommand succeeded\n'));
         process.exit(0);
     }).catch((error) => {
         console.log(error+chalk.red('\nCommand failed\n'));
+
         process.exit(1);
     });
 } else {
@@ -74,6 +76,14 @@ if (typeof(results.thePromise) !== 'undefined'){
  * @return {[type]}            [description]
  */
 function getInfo(moduleName){
-    let pjson = require(moduleName+'/package.json');
-    return _.padEnd(pjson.name,30) + ' v'+pjson.version;
+
+    try{
+        let pjson = ((moduleName=== 'composer-cli') ? require('./package.json') : require(moduleName).version);
+        return _.padEnd(pjson.name,30) + ' v'+pjson.version+'\n';
+    }
+    catch (error){
+      // oh well - we'll just return a blank string
+        return '';
+    }
+
 }

packages/composer-cli/index.js

@@ -13,3 +13,5 @@
  */
 
 'use strict';
+
+module.exports.version = require('./package.json');

packages/composer-cli/lib/cmds/dev.js

@@ -18,6 +18,8 @@ exports.command = 'dev <subcommand>';
 exports.desc = 'Composer dev command to run local servers';
 exports.builder = function (yargs) {
    // apply commands in subdirectories
+
     return yargs.commandDir('dev').strict();
+
 };
 exports.handler = function (argv) {};

packages/composer-cli/lib/cmds/dev/hlf.js

@@ -29,6 +29,7 @@ module.exports.builder = function (yargs){
             .conflicts({'download':'stop','start':'stop','stop':'','delete':'start'})
             .usage('composer dev hlf --downloand --hlfversion 0.6  \n  composer dev hlf --start')
             ;
+
 };
 
 module.exports.handler = (argv) => {
@@ -44,4 +45,5 @@ module.exports.handler = (argv) => {
         return (1);
     });
     return argv.thePromise;
+
 };

packages/composer-cli/lib/cmds/dev/lib/hlf.js

@@ -14,10 +14,12 @@
 
 'use strict';
 
+
 const shell = require('shelljs');
 const path = require('path');
 /**
  * Composer dev hlf command
+
  * @private
  */
 class hlf {
@@ -32,18 +34,21 @@ class hlf {
 
         let hlfCmdPromise = new Promise(
         function (resolve, reject) {
+
             if (hlf.runCmd(argv)===0) {
                 resolve(0); // fulfilled
             } else {
                 reject(1); // reject
             }
+
         }
       );
 
         return hlfCmdPromise;
 
     }
 
+
     /** @private
      * @param {String} cmdString The command string to run
      * @return {int} error code
@@ -53,13 +58,13 @@ class hlf {
         return shell.exec(cmdString).code;
     }
 
+
     /**
     *  @param {Array} argv command arguments
     *  @return {int} error code
     */
     static runCmd(argv){
 
-
         if (argv.start === undefined && argv.stop === undefined && argv.download===undefined && argv.delete === undefined && argv.purgeProfiles === undefined){
             return this._cmd('docker ps');
         }
@@ -77,6 +82,7 @@ class hlf {
             console.log('Stopping Hyperledger Fabric');
             cmdString = 'docker-compose -f '+composeYML+' stop ';
             errorCode =  this._cmd(cmdString);
+
         } else if (argv.download){
           /*
           # Pull and tag the latest Hyperledger Fabric base image.
@@ -89,19 +95,24 @@ class hlf {
 
             cmdString = 'docker tag hyperledger/fabric-baseimage:x86_64-0.1.0 hyperledger/fabric-baseimage:latest';
             errorCode = this._cmd(cmdString);
+
         } else if (argv.delete){
           // todo put prompt here
           /*docker-compose kill && docker-compose down
           */
             console.log('Killing and stoping Hypledger Fabric docker containers');
             cmdString = ['docker-compose','-f',composeYML,'kill && docker-compose','-f',composeYML,'down'].join(' ');
+
             errorCode = this._cmd(cmdString);
+
         }
 
         if (argv.purgeProfiles && errorCode === 0){
             console.log('Deleting the default connection profile');
+
             errorCode = shell.rm('-rf','~/.composer-connection-profiles/defaultProfile').code;
             errorCode = (errorCode===0) ? shell.rm('-r','~/.composer-credentials/*').code : errorCode;
+
         }
 
         return errorCode;

packages/composer-cli/lib/cmds/dev/restserver.js

@@ -40,6 +40,7 @@ module.exports.handler = (argv) => {
     .then(() => {
         console.log ('Command completed successfully.');
         return;
+
     })
     .catch((error) => {
         console.log(error.stack);
@@ -48,4 +49,5 @@ module.exports.handler = (argv) => {
     });
 
     return argv.thePromise;
+
 };

packages/composer-cli/lib/cmds/generator/createCodeCommand.js

@@ -37,6 +37,7 @@ module.exports.handler = (argv) => {
         console.log(error.stack);
         console.log(error+ '\nCommand failed.');
         throw error;
+
     });
     return argv.thePromise;
 };

packages/composer-cli/lib/cmds/generator/testsCommand.js

@@ -31,11 +31,13 @@ module.exports.handler = (argv) => {
     .then(() => {
         console.log ('Command completed successfully.');
         return;
+
     })
     .catch((error) => {
         console.log(error);
         console.log('Command failed.');
         throw error;
+
     });
     return argv.thePromise;
 };

packages/composer-cli/lib/cmds/network/deployCommand.js

@@ -33,6 +33,7 @@ module.exports.handler = (argv) => {
     })
     .catch((error) => {
         throw error;
+
     });
 
     return argv.thePromise;