From 4a05ce3f53a5c3baa83171d13b54d5faa04664fe Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Mon, 25 Apr 2016 08:32:58 -0400 Subject: [PATCH] Attempt to infer the device uuid in `resin sync` This PR adds functionality to `resin sync` to try to infer what the device uuid is as follows: - If the argument to `resin sync` is an app, get all the devices from that application. If there is only one, auto-select it, otherwise show an interactive drive selection widget. - If the argument to `resin sync` is a uuid, use it directly, without trying to infer anything. - If no argument is passed to `resin sync`, display an interactive selection widget showing all your devices from all your applications. Signed-off-by: Juan Cruz Viotti --- build/actions/sync.js | 17 +++++++++++++---- build/utils/patterns.js | 26 ++++++++++++++++++++++++++ doc/cli.markdown | 7 +++++-- lib/actions/sync.coffee | 16 ++++++++++++++-- lib/utils/patterns.coffee | 21 +++++++++++++++++++++ 5 files changed, 79 insertions(+), 8 deletions(-) diff --git a/build/actions/sync.js b/build/actions/sync.js index 5457f3e0..1aa627f4 100644 --- a/build/actions/sync.js +++ b/build/actions/sync.js @@ -17,9 +17,9 @@ limitations under the License. (function() { module.exports = { - signature: 'sync ', + signature: 'sync [source]', description: '(beta) sync your changes with a device', - help: 'Use this command to sync your local changes to a certain device on the fly.\n\nYou can save all the options mentioned below in a `resin-sync.yml` file,\nby using the same option names as keys. For example:\n\n $ cat $PWD/resin-sync.yml\n source: src/\n before: \'echo Hello\'\n ignore:\n - .git\n - node_modules/\n progress: true\n\nNotice that explicitly passed command options override the ones set in the configuration file.\n\nExamples:\n\n $ resin sync 7cf02a6\n $ resin sync 7cf02a6 --port 8080\n $ resin sync 7cf02a6 --ignore foo,bar', + help: 'Use this command to sync your local changes to a certain device on the fly.\n\nThe `source` argument can be either a device uuid or an application name.\n\nYou can save all the options mentioned below in a `resin-sync.yml` file,\nby using the same option names as keys. For example:\n\n $ cat $PWD/resin-sync.yml\n source: src/\n before: \'echo Hello\'\n ignore:\n - .git\n - node_modules/\n progress: true\n\nNotice that explicitly passed command options override the ones set in the configuration file.\n\nExamples:\n\n $ resin sync MyApp\n $ resin sync 7cf02a6\n $ resin sync 7cf02a6 --port 8080\n $ resin sync 7cf02a6 --ignore foo,bar', permission: 'user', primary: true, options: [ @@ -51,12 +51,21 @@ limitations under the License. } ], action: function(params, options, done) { - var resinSync; + var patterns, resin, resinSync; + resin = require('resin-sdk'); resinSync = require('resin-sync'); + patterns = require('../utils/patterns'); if (options.ignore != null) { options.ignore = options.ignore.split(','); } - return resinSync.sync(params.uuid, options).nodeify(done); + return resin.models.device.has(params.source).then(function(isValidUUID) { + if (isValidUUID) { + return params.source; + } + return patterns.inferOrSelectDevice(params.source); + }).then(function(uuid) { + return resinSync.sync(uuid, options); + }).nodeify(done); } }; diff --git a/build/utils/patterns.js b/build/utils/patterns.js index 6a79100c..202e26d5 100644 --- a/build/utils/patterns.js +++ b/build/utils/patterns.js @@ -191,6 +191,32 @@ limitations under the License. }); }; + exports.inferOrSelectDevice = function(applicationName) { + return Promise["try"](function() { + if (applicationName != null) { + return resin.models.device.getAllByApplication(applicationName); + } + return resin.models.device.getAll(); + }).then(function(devices) { + if (_.isEmpty(devices)) { + throw new Error('You don\'t have any devices'); + } + if (devices.length === 1) { + return _.first(devices).uuid; + } + return form.ask({ + message: 'Select a device', + type: 'list', + choices: _.map(devices, function(device) { + return { + name: (device.name || 'Untitled') + " (" + (device.uuid.slice(0, 7)) + ")", + value: device.uuid + }; + }) + }); + }); + }; + exports.printErrorMessage = function(message) { console.error(chalk.red(message)); return console.error(chalk.red("\n" + messages.getHelp + "\n")); diff --git a/doc/cli.markdown b/doc/cli.markdown index f1a06bd4..317d3f59 100644 --- a/doc/cli.markdown +++ b/doc/cli.markdown @@ -69,7 +69,7 @@ Now you have access to all the commands referenced below. - Sync - - [sync <uuid>](#sync-60-uuid-62-) + - [sync [source]](#sync-source-) - Notes @@ -578,10 +578,12 @@ continuously stream output # Sync -## sync <uuid> +## sync [source] Use this command to sync your local changes to a certain device on the fly. +The `source` argument can be either a device uuid or an application name. + You can save all the options mentioned below in a `resin-sync.yml` file, by using the same option names as keys. For example: @@ -597,6 +599,7 @@ Notice that explicitly passed command options override the ones set in the confi Examples: + $ resin sync MyApp $ resin sync 7cf02a6 $ resin sync 7cf02a6 --port 8080 $ resin sync 7cf02a6 --ignore foo,bar diff --git a/lib/actions/sync.coffee b/lib/actions/sync.coffee index 166def69..06ea4da4 100644 --- a/lib/actions/sync.coffee +++ b/lib/actions/sync.coffee @@ -15,11 +15,13 @@ limitations under the License. ### module.exports = - signature: 'sync ' + signature: 'sync [source]' description: '(beta) sync your changes with a device' help: ''' Use this command to sync your local changes to a certain device on the fly. + The `source` argument can be either a device uuid or an application name. + You can save all the options mentioned below in a `resin-sync.yml` file, by using the same option names as keys. For example: @@ -35,6 +37,7 @@ module.exports = Examples: + $ resin sync MyApp $ resin sync 7cf02a6 $ resin sync 7cf02a6 --port 8080 $ resin sync 7cf02a6 --ignore foo,bar @@ -68,10 +71,19 @@ module.exports = alias: 't' ] action: (params, options, done) -> + resin = require('resin-sdk') resinSync = require('resin-sync') + patterns = require('../utils/patterns') # TODO: Add comma separated options to Capitano if options.ignore? options.ignore = options.ignore.split(',') - resinSync.sync(params.uuid, options).nodeify(done) + resin.models.device.has(params.source).then (isValidUUID) -> + if isValidUUID + return params.source + + return patterns.inferOrSelectDevice(params.source) + .then (uuid) -> + resinSync.sync(uuid, options) + .nodeify(done) diff --git a/lib/utils/patterns.coffee b/lib/utils/patterns.coffee index e83fce6d..ebbecf35 100644 --- a/lib/utils/patterns.coffee +++ b/lib/utils/patterns.coffee @@ -150,6 +150,27 @@ exports.awaitDevice = (uuid) -> console.info("Waiting for #{deviceName} to connect to resin...") poll().return(uuid) +exports.inferOrSelectDevice = (applicationName) -> + Promise.try -> + if applicationName? + return resin.models.device.getAllByApplication(applicationName) + return resin.models.device.getAll() + .then (devices) -> + if _.isEmpty(devices) + throw new Error('You don\'t have any devices') + + if devices.length is 1 + return _.first(devices).uuid + + return form.ask + message: 'Select a device' + type: 'list' + choices: _.map devices, (device) -> + return { + name: "#{device.name or 'Untitled'} (#{device.uuid.slice(0, 7)})" + value: device.uuid + } + exports.printErrorMessage = (message) -> console.error(chalk.red(message)) console.error(chalk.red("\n#{messages.getHelp}\n"))