Enhance cli outputs on error

packages/cli/src/bin/errors.js

@@ -1,4 +1,4 @@
-import ErrorHandler from '../models/ErrorHandler'
+import ErrorHandler from '../models/errors/ErrorHandler'
 
 export default function registerErrorHandler(program) {
   process.on('unhandledRejection', reason => new ErrorHandler(reason, program).call())

packages/cli/src/models/ErrorHandler.js → packages/cli/src/models/errors/ErrorHandler.js

@@ -15,6 +15,8 @@ export default class ErrorHandler {
       log.error(errorMessage)
     }
     else log.error(this.error.stack)
+    if (this.error.cb) this.error.cb()
+
     process.exit(1)
   }
 }

packages/cli/src/models/errors/ScriptError.js

@@ -0,0 +1,8 @@
+'use strict'
+
+export default class ScriptError extends Error {
+  constructor(message, cb) {
+    super(message)
+    this.cb = cb
+  }
+}

packages/cli/src/models/files/ZosNetworkFile.js

@@ -273,7 +273,19 @@ export default class ZosNetworkFile {
   }
 
   write() {
-    fs.writeJson(this.fileName, this.data)
-    log.info(`Successfully written ${this.fileName}`)
+    if(this._hasChanged()) {
+      const exists = this._exists()
+      fs.writeJson(this.fileName, this.data)
+      exists ? log.info(`Updated ${this.fileName}`) : log.info(`Created ${this.fileName}`)
+    }
+  }
+
+  _hasChanged() {
+    const currentNetworkFile = fs.parseJsonIfExists(this.fileName)
+    return !_.isEqual(this.data, currentNetworkFile)
+  }
+
+  _exists() {
+    return !!fs.parseJsonIfExists(this.fileName)
   }
 }

packages/cli/src/models/network/NetworkBaseController.js

@@ -236,7 +236,8 @@ export default class NetworkBaseController {
     await Verifier.verifyAndPublish(remote, { contractName, compilerVersion, optimizer, optimizerRuns, contractSource, contractAddress })
   }
 
-  writeNetworkPackage() {
+  writeNetworkPackageIfNeeded() {
     this.networkFile.write()
   }
+
 }

packages/cli/src/scripts/create.js

@@ -1,16 +1,22 @@
 import stdout from '../utils/stdout';
 import ControllerFor from '../models/network/ControllerFor';
+import ScriptError from '../models/errors/ScriptError'
 
 export default async function createProxy({ packageName, contractAlias, initMethod, initArgs, network, txParams = {}, force = false, networkFile = undefined }) {
   if (!contractAlias) throw Error('A contract alias must be provided to create a new proxy.')
 
   const controller = ControllerFor(network, txParams, networkFile)
   if (controller.isLib) throw Error('Cannot create a proxy for a library project')
 
-  await controller.checkContractDeployed(packageName, contractAlias, !force);
-  const proxy = await controller.createProxy(packageName, contractAlias, initMethod, initArgs);
+  try {
+    await controller.checkContractDeployed(packageName, contractAlias, !force);
+    const proxy = await controller.createProxy(packageName, contractAlias, initMethod, initArgs);
+    stdout(proxy.address);
+    controller.writeNetworkPackageIfNeeded()
 
-  controller.writeNetworkPackage();
-  stdout(proxy.address);
-  return proxy;
+    return proxy;
+  } catch(error) {
+    const cb = () => controller.writeNetworkPackageIfNeeded()
+    throw new ScriptError(error.message, cb)
+  }
 }

packages/cli/src/scripts/freeze.js

@@ -1,7 +1,13 @@
 import ControllerFor from '../models/network/ControllerFor'
+import ScriptError from '../models/errors/ScriptError'
 
 export default async function freeze({ network, txParams = {}, networkFile = undefined}) {
   const controller = new ControllerFor(network, txParams, networkFile)
-  await controller.freeze();
-  controller.writeNetworkPackage();
+  try {
+    await controller.freeze();
+    controller.writeNetworkPackageIfNeeded()
+  } catch(error) {
+    const cb = () => controller.writeNetworkPackageIfNeeded()
+    throw new ScriptError(error.message, cb)
+  }
 }

packages/cli/src/scripts/pull.js

@@ -1,7 +1,13 @@
 import ControllerFor from '../models/network/ControllerFor'
+import ScriptError from '../models/errors/ScriptError'
 
 export default async function pull({ network, txParams = {}, networkFile = undefined }) {
   const controller = ControllerFor(network, txParams, networkFile)
-  await controller.pullRemoteStatus()
-  controller.writeNetworkPackage()
+  try {
+    await controller.pullRemoteStatus()
+    controller.writeNetworkPackageIfNeeded()
+  } catch(error) {
+    const cb = () => controller.writeNetworkPackageIfNeeded()
+    throw new ScriptError(error.message, cb)
+  }
 }

packages/cli/src/scripts/push.js

@@ -1,14 +1,17 @@
 import stdout from '../utils/stdout';
 import ControllerFor from "../models/network/ControllerFor";
+import ScriptError from '../models/errors/ScriptError'
 
 export default async function push({ network, deployLibs, reupload = false, force = false, txParams = {}, networkFile = undefined }) {
   const controller = ControllerFor(network, txParams, networkFile);
-  
+
   try {
     if (deployLibs && !controller.isLib) await controller.deployLibs();
     await controller.push(reupload, force);
     stdout(controller.isLib ? controller.packageAddress : controller.appAddress);
-  } finally {
-    controller.writeNetworkPackage();
+    controller.writeNetworkPackageIfNeeded()
+  } catch(error) {
+    const cb = () => controller.writeNetworkPackageIfNeeded()
+    throw new ScriptError(error.message, cb)
   }
 }

packages/cli/src/scripts/set-admin.js

@@ -1,5 +1,6 @@
 import stdout from '../utils/stdout';
 import ControllerFor from '../models/network/ControllerFor'
+import ScriptError from '../models/errors/ScriptError'
 
 export default async function setAdmin({ newAdmin, packageName, contractAlias, proxyAddress, network, txParams = {}, networkFile = undefined}) {
   if (!contractAlias && !proxyAddress) {
@@ -11,7 +12,9 @@ export default async function setAdmin({ newAdmin, packageName, contractAlias, p
   try {
     const proxies = await controller.setProxiesAdmin(packageName, contractAlias, proxyAddress, newAdmin);
     proxies.forEach(proxy => stdout(proxy.address));
-  } finally {
-    controller.writeNetworkPackage();
+    controller.writeNetworkPackageIfNeeded()
+  } catch(error) {
+    const cb = () => controller.writeNetworkPackageIfNeeded()
+    throw new ScriptError(error, cb)
   }
 }

packages/cli/src/scripts/update.js

@@ -1,5 +1,6 @@
 import stdout from '../utils/stdout';
 import ControllerFor from '../models/network/ControllerFor'
+import ScriptError from '../models/errors/ScriptError'
 
 export default async function update({ packageName, contractAlias, proxyAddress, initMethod, initArgs, all, network, force = false, txParams = {}, networkFile = undefined}) {
   if (!packageName && !contractAlias && !proxyAddress && !all) {
@@ -12,7 +13,9 @@ export default async function update({ packageName, contractAlias, proxyAddress,
     await controller.checkLocalContractsDeployed(!force);
     const proxies = await controller.upgradeProxies(packageName, contractAlias, proxyAddress, initMethod, initArgs);
     proxies.forEach(proxy => stdout(proxy.address));
-  } finally {
-    controller.writeNetworkPackage();
+    controller.writeNetworkPackageIfNeeded()
+  } catch(error) {
+    const cb = () => controller.writeNetworkPackageIfNeeded()
+    throw new ScriptError(error, cb)
   }
 }

packages/cli/test/commands/share.js

@@ -21,7 +21,7 @@ import * as setAdmin from '../../src/scripts/set-admin';
 
 import * as runWithTruffle from '../../src/utils/runWithTruffle';
 import Session from '../../src/models/network/Session';
-import ErrorHandler from '../../src/models/ErrorHandler';
+import ErrorHandler from '../../src/models/errors/ErrorHandler';
 import program from '../../src/bin/program';
 
 const assert = require('chai').assert