From c758a5b9ea18886b3aa7bb1577328e1b228b0bf2 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <juanchiviotti@gmail.com>
Date: Tue, 5 May 2015 17:32:44 -0300
Subject: [PATCH] Make use of capitano.run() to run subcommands

---
 build/actions/device.js   | 7 ++++---
 build/actions/os.js       | 8 ++++----
 lib/actions/device.coffee | 8 ++++++--
 lib/actions/os.coffee     | 4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/build/actions/device.js b/build/actions/device.js
index 9b0e81c1..a0aa984a 100644
--- a/build/actions/device.js
+++ b/build/actions/device.js
@@ -1,5 +1,7 @@
 (function() {
-  var _, async, commandOptions, osAction, path, resin, tmp, vcs, visuals;
+  var _, async, capitano, commandOptions, osAction, path, resin, tmp, vcs, visuals;
+
+  capitano = require('capitano');
 
   _ = require('lodash-contrib');
 
@@ -160,8 +162,7 @@
             return callback(null, outputFile, cleanupCallback);
           });
         }, function(outputFile, cleanupCallback, callback) {
-          params.image = outputFile;
-          return osAction.install.action(params, options, function(error) {
+          return capitano.run("os install " + outputFile + " " + params.device, function(error) {
             if (error != null) {
               return callback(error);
             }
diff --git a/build/actions/os.js b/build/actions/os.js
index 91a2645b..a788d035 100644
--- a/build/actions/os.js
+++ b/build/actions/os.js
@@ -1,5 +1,7 @@
 (function() {
-  var _, async, commandOptions, elevate, mkdirp, npm, os, packageJSON, path, resin, umount, updateActions, visuals;
+  var _, async, capitano, commandOptions, elevate, mkdirp, npm, os, packageJSON, path, resin, umount, visuals;
+
+  capitano = require('capitano');
 
   _ = require('lodash-contrib');
 
@@ -23,8 +25,6 @@
 
   packageJSON = require('../../package.json');
 
-  updateActions = require('./update');
-
   elevate = require('../elevate');
 
   exports.download = {
@@ -113,7 +113,7 @@
             return callback();
           }
           console.info('Resin CLI is outdated.\n\nIn order to avoid device compatibility issues, this command\nrequires that you have the Resin CLI updated.\n\nUpdating now...');
-          return updateActions.update.action(params, options, _.unary(callback));
+          return capitano.run('update', _.unary(callback));
         }, function(callback) {
           if (params.device != null) {
             return callback(null, params.device);
diff --git a/lib/actions/device.coffee b/lib/actions/device.coffee
index 4f0625d6..ee11846e 100644
--- a/lib/actions/device.coffee
+++ b/lib/actions/device.coffee
@@ -1,3 +1,4 @@
+capitano = require('capitano')
 _ = require('lodash-contrib')
 path = require('path')
 async = require('async')
@@ -234,13 +235,16 @@ exports.init =
 
 			(tmpPath, tmpFd, cleanupCallback, callback) ->
 				options.output = tmpPath
+
+				# TODO: Figure out how to make use of capitano.run()
+				# here given the complexity of converting network
+				# params object to string options
 				osAction.download.action params, options, (error, outputFile) ->
 					return callback(error) if error?
 					return callback(null, outputFile, cleanupCallback)
 
 			(outputFile, cleanupCallback, callback) ->
-				params.image = outputFile
-				osAction.install.action params, options, (error) ->
+				capitano.run "os install #{outputFile} #{params.device}", (error) ->
 					return callback(error) if error?
 					cleanupCallback()
 					return callback()
diff --git a/lib/actions/os.coffee b/lib/actions/os.coffee
index b6e00f7c..af7dbe80 100644
--- a/lib/actions/os.coffee
+++ b/lib/actions/os.coffee
@@ -1,3 +1,4 @@
+capitano = require('capitano')
 _ = require('lodash-contrib')
 os = require('os')
 async = require('async')
@@ -9,7 +10,6 @@ umount = require('umount').umount
 commandOptions = require('./command-options')
 npm = require('../npm')
 packageJSON = require('../../package.json')
-updateActions = require('./update')
 elevate = require('../elevate')
 
 exports.download =
@@ -136,7 +136,7 @@ exports.install =
 					Updating now...
 				'''
 
-				updateActions.update.action(params, options, _.unary(callback))
+				capitano.run('update', _.unary(callback))
 
 			(callback) ->
 				return callback(null, params.device) if params.device?