Resin CLI v2.0.1

Refer to the correct waiting stream function

.gitignore

@@ -32,3 +32,5 @@ bin/node
 release/build
 
 npm-shrinkwrap.json
+.resinconf
+resinrc.yml

.hound.yml

@@ -0,0 +1,5 @@
+coffee_script:
+  config_file: coffeelint.json
+
+javascript:
+  enabled: false

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
 node_js:
+  - "0.12"
   - "0.11"
   - "0.10"

CHANGELOG.md

@@ -0,0 +1,74 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.0.1] - 2015-10-26
+
+### Changed
+
+- Fix critical error when elevating permissions.
+
+## [2.0.0] - 2015-10-26
+
+### Added
+
+- Add `drive` option to `os initialize`.
+- Add application name length validation.
+- Allow passing a custom uuid to `device register`.
+- Add `advanced` option in `device init`.
+- Implement user/password login form with 2FA support.
+
+### Changed
+
+- Clarify the need for admin privileges on update.
+- Fix non working `yes` option in `os initialize`.
+- Fix non working `type` option in `app create`.
+- Take device type as an option in `os initialize`.
+- Improve the way the update notifier is shown.
+- Ignore advanced configuration options by default.
+- Fix	`device info` shadowing other command help pages.
+
+### Removed
+
+- Remove login with token functionality.
+- Remove project directory creation logic in `device init`.
+- Remove `app associate` command.
+
+## [1.1.0] - 2015-10-13
+
+### Added
+
+- Implement `os download` command.
+- Implement `os configure` command.
+- Implement `os initialize` command.
+- Implement `device register` command.
+- Add TROUBLESHOOTING guide.
+- Add a dynamic widget for selecting connected drives.
+
+### Changed
+
+- Make sure temporary files are removed on failures in `device init`.
+- Prompt to select application if running `device init` with no arguments.
+- Only use admin privileges in `os initialize` to avoid the cache directory to belong to `root`.
+- Separate help output per relevance.
+- Only print primary command help by default.
+- Print plugin warnings in red as the rest of the errors.
+- Shorten the length of device await message.
+- Upgrade Resin SDK to v3.0.0.
+- Check that a directory is a `git` repository before attempting to run `git` operations on it.
+- Improve plugin scanning mechanism.
+- Fix `EPERM` issue in Windows after a successfull `device init`.
+- Fix SDCard burning issues in Windows 10.
+- Fix plugins not being loaded in Windows 10.
+- Fix bug when listing the available drives in Windows when the user name contains spaces.
+- Fix an edge case that caused drives to be scanned incorrectly in OS X.
+- Fix operating system not being detected correctly when initializing a device.
+
+### Removed
+
+- Remove outdated information from README.
+
+[2.0.1]: https://github.com/resin-io/resin-cli/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/resin-io/resin-cli/compare/v1.1.0...v2.0.0
+[1.1.0]: https://github.com/resin-io/resin-cli/compare/v1.0.0...v1.1.0

README.md

@@ -1,65 +1,56 @@
-# Resin CLI
+Resin CLI
+=========
 
 [![npm version](https://badge.fury.io/js/resin-cli.svg)](http://badge.fury.io/js/resin-cli)
 [![dependencies](https://david-dm.org/resin-io/resin-cli.png)](https://david-dm.org/resin-io/resin-cli.png)
 [![Build Status](https://travis-ci.org/resin-io/resin-cli.svg?branch=master)](https://travis-ci.org/resin-io/resin-cli)
+[![Build status](https://ci.appveyor.com/api/projects/status/45i7d0m0patxj420?svg=true)](https://ci.appveyor.com/project/jviotti/resin-cli)
 
 The official Resin CLI tool.
 
-## Installing
+Requisites
+----------
+
+- [NodeJS](https://nodejs.org) (at least v0.10)
+- [Git](https://git-scm.com)
+
+Getting Started
+---------------
+
+### Installing
+
+This might require elevated privileges in some environments.
 
 ```sh
 $ npm install -g resin-cli
 ```
 
-### Running locally
+### Login
 
 ```sh
-$ ./bin/resin
+$ resin login
 ```
 
-## Tests
-
-You can run the [Mocha](http://mochajs.org/) test suite, you can do:
+### List available commands
 
 ```sh
-$ gulp test
+$ resin help
 ```
 
-## Development mode
+### Run the quickstart wizard
 
-The following command will watch for any changes and will run a linter and the whole test suite:
+Run as `root` on UNIX based systems, and in an administrator command line prompt in Windows.
 
 ```sh
-$ gulp watch
+$ resin quickstart
 ```
 
-If you set `DEBUG` environment variable, errors will print with a stack trace:
+Support
+-------
 
-```sh
-$ DEBUG=true resin ...
-```
+If you're having any problem, check our [troubleshooting guide](https://github.com/resin-io/resin-cli/blob/master/TROUBLESHOOTING.md) and if your problem is not addressed there, please [raise an issue](https://github.com/resin-io/resin-cli/issues/new) on GitHub and the Resin.io team will be happy to help.
 
-## Documentation
+License
+-------
 
-You can renegerate the documentation with:
-
-```sh
-$ npm run-script doc
-```
-
-## Manual pages
-
-UNIX manual pages reside in `man/`
-
-You can regenerate UNIX `roff` manual pages from markdown with:
-
-```sh
-$ gulp man
-```
-
-If you add a new `man` page, remember to add the generated filename to the `man` array in `package.json`.
-
-## Caveats
-
-- Some interactive widgets don't work on [Cygwin](https://cygwin.com/). If you're running Windows, it's preferrable that you use `cmd.exe`, as `Cygwin` is [not official supported by Node.js](https://github.com/chjj/blessed/issues/56#issuecomment-42671945).
+The project is licensed under the MIT license.

TROUBLESHOOTING.md

@@ -0,0 +1,33 @@
+Troubleshooting
+===============
+
+This document contains common issues related to the Resin CLI, and how to fix them.
+
+### After burning to an sdcard, my device doesn't boot
+
+- The downloaded image is not complete (download was interrupted).
+
+Please clean the cache (`%HOME/.resin/cache` or `C:\Users\<user>\_resin\cache`) and run the command again. In the future, the CLI will check that the image is not complete and clean the cache for you.
+
+### I get a permission error when burning to an sdcard
+
+- The SDCard is locked.
+
+### I get EINVAL errors on Cygwin
+
+The errors look something like this:
+
+```
+net.js:156
+    this._handle.open(options.fd);
+                 ^
+Error: EINVAL, invalid argument
+  at new Socket (net.js:156:18)
+  at process.stdin (node.js:664:19)
+  at Object.Interface.createInterface (C:\cygwin\home\Juan Cruz Viotti\Projects\resin-cli\node_modules\inquirer\node_modules\readline2\index.js:31:43)
+  at PromptUI.UI (C:\cygwin\home\Juan Cruz Viotti\Projects\resin-cli\node_modules\inquirer\lib\ui\baseUI.js:23:40)
+  at new PromptUI (C:\cygwin\home\Juan Cruz Viotti\Projects\resin-cli\node_modules\inquirer\lib\ui\prompt.js:26:8)
+  at Object.promptModule [as prompt] (C:\cygwin\home\Juan Cruz Viotti\Projects\resin-cli\node_modules\inquirer\lib\inquirer.js:27:14)
+```
+
+- Some interactive widgets don't work on `Cygwin`. If you're running Windows, it's preferrable that you use `cmd.exe`, as `Cygwin` is [not official supported by Node.js](https://github.com/chjj/blessed/issues/56#issuecomment-42671945).

appveyor.yml

@@ -0,0 +1,31 @@
+# appveyor file
+# http://www.appveyor.com/docs/appveyor-yml
+
+init:
+  - git config --global core.autocrlf input
+
+cache:
+  - C:\Users\appveyor\.node-gyp
+  - '%AppData%\npm-cache'
+
+# what combinations to test
+environment:
+  matrix:
+    - nodejs_version: 0.10
+    - nodejs_version: 0.11
+    - nodejs_version: 0.12
+
+install:
+  - ps: Install-Product node $env:nodejs_version x64
+  - npm -g install npm@2.12.1
+  - set PATH=%APPDATA%\npm;%PATH%
+  - npm install -g gulp
+  - npm install
+
+build: off
+
+test_script:
+  - node --version
+  - npm --version
+  - ps: gulp test
+  - cmd: gulp test

bin/resin-write

@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-
-var os = require('../build/actions/os');
-var errors = require('../build/errors');
-
-// TODO: Do some error handling when image or device are incorrect
-
-os.install.action({
-	image: process.argv[2],
-	device: process.argv[3]
-}, {
-	yes: true,
-	fromScript: true
-}, function(error) {
-	return errors.handle(error);
-});

build/actions/app.js

@@ -1,9 +1,5 @@
 (function() {
-  var _, async, commandOptions, resin, visuals;
-
-  _ = require('lodash-contrib');
-
-  async = require('async');
+  var commandOptions, events, patterns, resin, visuals;
 
   resin = require('resin-sdk');
 
@@ -11,6 +7,10 @@
 
   commandOptions = require('./command-options');
 
+  events = require('resin-cli-events');
+
+  patterns = require('../utils/patterns');
+
   exports.create = {
     signature: 'app create <name>',
     description: 'create an application',
@@ -24,104 +24,80 @@
       }
     ],
     permission: 'user',
+    primary: true,
     action: function(params, options, done) {
-      return async.waterfall([
-        function(callback) {
-          if (options.type != null) {
-            return callback(null, options.type);
-          }
-          return resin.models.device.getSupportedDeviceTypes(function(error, deviceTypes) {
-            if (error != null) {
-              return callback(error);
-            }
-            return visuals.widgets.select('Select a type', deviceTypes, callback);
-          });
-        }, function(type, callback) {
-          return resin.models.application.create(params.name, type, callback);
+      return resin.models.application.has(params.name).then(function(hasApplication) {
+        if (hasApplication) {
+          throw new Error('You already have an application with that name!');
         }
-      ], done);
+      }).then(function() {
+        return options.type || patterns.selectDeviceType();
+      }).then(function(deviceType) {
+        return resin.models.application.create(params.name, deviceType);
+      }).then(function(application) {
+        console.info("Application created: " + application.app_name + " (" + application.device_type + ", id " + application.id + ")");
+        return events.send('application.create', {
+          application: application.id
+        });
+      }).nodeify(done);
     }
   };
 
   exports.list = {
     signature: 'apps',
     description: 'list all applications',
-    help: 'Use this command to list all your applications.\n\nNotice this command only shows the most important bits of information for each app.\nIf you want detailed information, use resin app <id> instead.\n\nExamples:\n\n	$ resin apps',
+    help: 'Use this command to list all your applications.\n\nNotice this command only shows the most important bits of information for each app.\nIf you want detailed information, use resin app <name> instead.\n\nExamples:\n\n	$ resin apps',
     permission: 'user',
+    primary: true,
     action: function(params, options, done) {
-      return resin.models.application.getAll(function(error, applications) {
-        if (error != null) {
-          return done(error);
-        }
-        console.log(visuals.widgets.table.horizontal(applications, ['id', 'app_name', 'device_type', 'online_devices', 'devices_length']));
-        return done();
-      });
+      return resin.models.application.getAll().then(function(applications) {
+        return console.log(visuals.table.horizontal(applications, ['id', 'app_name', 'device_type', 'online_devices', 'devices_length']));
+      }).nodeify(done);
     }
   };
 
   exports.info = {
-    signature: 'app <id>',
+    signature: 'app <name>',
     description: 'list a single application',
-    help: 'Use this command to show detailed information for a single application.\n\nExamples:\n\n	$ resin app 91',
+    help: 'Use this command to show detailed information for a single application.\n\nExamples:\n\n	$ resin app MyApp',
     permission: 'user',
+    primary: true,
     action: function(params, options, done) {
-      return resin.models.application.get(params.id, function(error, application) {
-        if (error != null) {
-          return done(error);
-        }
-        console.log(visuals.widgets.table.vertical(application, ['id', 'app_name', 'device_type', 'git_repository', 'commit']));
-        return done();
-      });
+      return resin.models.application.get(params.name).then(function(application) {
+        console.log(visuals.table.vertical(application, ["$" + application.app_name + "$", 'id', 'device_type', 'git_repository', 'commit']));
+        return events.send('application.open', {
+          application: application.id
+        });
+      }).nodeify(done);
     }
   };
 
   exports.restart = {
-    signature: 'app restart <id>',
+    signature: 'app restart <name>',
     description: 'restart an application',
-    help: 'Use this command to restart all devices that belongs to a certain application.\n\nExamples:\n\n	$ resin app restart 91',
+    help: 'Use this command to restart all devices that belongs to a certain application.\n\nExamples:\n\n	$ resin app restart MyApp',
     permission: 'user',
     action: function(params, options, done) {
-      return resin.models.application.restart(params.id, done);
+      return resin.models.application.restart(params.name).nodeify(done);
     }
   };
 
   exports.remove = {
-    signature: 'app rm <id>',
+    signature: 'app rm <name>',
     description: 'remove an application',
-    help: 'Use this command to remove a resin.io application.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nExamples:\n\n	$ resin app rm 91\n	$ resin app rm 91 --yes',
+    help: 'Use this command to remove a resin.io application.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nExamples:\n\n	$ resin app rm MyApp\n	$ resin app rm MyApp --yes',
     options: [commandOptions.yes],
     permission: 'user',
     action: function(params, options, done) {
-      return visuals.patterns.remove('application', options.yes, function(callback) {
-        return resin.models.application.remove(params.id, callback);
-      }, done);
-    }
-  };
-
-  exports.init = {
-    signature: 'init <id>',
-    description: 'init an application',
-    help: 'Use this command to associate a local project to an existing resin.io application.\n\nThe application should be a git repository before issuing this command.\nNotice this command adds a `resin` git remote to your application.\n\nExamples:\n\n	$ cd myApp && resin init 91',
-    permission: 'user',
-    action: function(params, options, done) {
-      var currentDirectory;
-      currentDirectory = process.cwd();
-      return async.waterfall([
-        function(callback) {
-          return resin.vcs.isResinProject(currentDirectory, callback);
-        }, function(isResinProject, callback) {
-          var error;
-          if (isResinProject) {
-            error = new Error('Project is already a resin application.');
-            return callback(error);
-          }
-          return callback();
-        }, function(callback) {
-          return resin.models.application.get(params.id, callback);
-        }, function(application, callback) {
-          return resin.vcs.initProjectWithApplication(application, currentDirectory, callback);
-        }
-      ], done);
+      return patterns.confirm(options.yes, 'Are you sure you want to delete the application?').then(function() {
+        return resin.models.application.remove(params.name);
+      }).tap(function() {
+        return resin.models.application.get(params.name).then(function(application) {
+          return events.send('application.delete', {
+            application: application.id
+          });
+        });
+      }).nodeify(done);
     }
   };
 

build/actions/auth.js

@@ -1,55 +1,69 @@
 (function() {
-  var _, async, resin, url, visuals;
+  var Promise, _, events, form, resin, validation, visuals;
 
-  _ = require('lodash-contrib');
+  Promise = require('bluebird');
 
-  url = require('url');
-
-  async = require('async');
+  _ = require('lodash');
 
   resin = require('resin-sdk');
 
+  form = require('resin-cli-form');
+
   visuals = require('resin-cli-visuals');
 
+  events = require('resin-cli-events');
+
+  validation = require('../utils/validation');
+
   exports.login = {
     signature: 'login',
     description: 'login to resin.io',
-    help: 'Use this command to login to your resin.io account.\nYou need to login before you can use most of the commands this tool provides.\n\nYou can pass your credentials as `--username` and `--password` options, or you can omit the\ncredentials, in which case the tool will present you with an interactive login form.\n\nExamples:\n\n	$ resin login --username <username> --password <password>\n	$ resin login',
+    help: 'Use this command to login to your resin.io account.\n\nExamples:\n\n	$ resin login',
     options: [
       {
-        signature: 'username',
-        parameter: 'username',
-        description: 'user name',
-        alias: 'u'
+        signature: 'email',
+        parameter: 'email',
+        description: 'email',
+        alias: ['e', 'u']
       }, {
         signature: 'password',
         parameter: 'password',
-        description: 'user password',
+        description: 'password',
         alias: 'p'
       }
     ],
+    primary: true,
     action: function(params, options, done) {
-      var hasOptionCredentials;
-      hasOptionCredentials = !_.isEmpty(options);
-      if (hasOptionCredentials) {
-        if (!options.username) {
-          return done(new Error('Missing username'));
+      return form.run([
+        {
+          message: 'Email:',
+          name: 'email',
+          type: 'input',
+          validate: validation.validateEmail
+        }, {
+          message: 'Password:',
+          name: 'password',
+          type: 'password'
         }
-        if (!options.password) {
-          return done(new Error('Missing password'));
+      ], {
+        override: options
+      }).then(resin.auth.login).then(resin.auth.twoFactor.isPassed).then(function(isTwoFactorAuthPassed) {
+        if (isTwoFactorAuthPassed) {
+          return;
         }
-      }
-      return async.waterfall([
-        function(callback) {
-          if (hasOptionCredentials) {
-            return callback(null, options);
-          } else {
-            return visuals.widgets.login(callback);
-          }
-        }, function(credentials, callback) {
-          return resin.auth.login(credentials, callback);
-        }
-      ], done);
+        return form.ask({
+          message: 'Two factor auth challenge:',
+          name: 'code',
+          type: 'input'
+        }).then(resin.auth.twoFactor.challenge)["catch"](function() {
+          return resin.auth.logout().then(function() {
+            throw new Error('Invalid two factor authentication code');
+          });
+        });
+      }).then(resin.auth.whoami).tap(function(username) {
+        console.info("Successfully logged in as: " + username);
+        return events.send('user.login');
+      }).nodeify(done);
     }
   };
 
@@ -59,75 +73,51 @@
     help: 'Use this command to logout from your resin.io account.o\n\nExamples:\n\n	$ resin logout',
     permission: 'user',
     action: function(params, options, done) {
-      return resin.auth.logout(done);
+      return resin.auth.logout().then(function() {
+        return events.send('user.logout');
+      }).nodeify(done);
     }
   };
 
   exports.signup = {
     signature: 'signup',
     description: 'signup to resin.io',
-    help: 'Use this command to signup for a resin.io account.\n\nIf signup is successful, you\'ll be logged in to your new user automatically.\n\nExamples:\n\n	$ resin signup\n	Email: me@mycompany.com\n	Username: johndoe\n	Password: ***********\n\n	$ resin signup --email me@mycompany.com --username johndoe --password ***********\n\n	$ resin whoami\n	johndoe',
-    options: [
-      {
-        signature: 'email',
-        parameter: 'email',
-        description: 'user email',
-        alias: 'e'
-      }, {
-        signature: 'username',
-        parameter: 'username',
-        description: 'user name',
-        alias: 'u'
-      }, {
-        signature: 'password',
-        parameter: 'user password',
-        description: 'user password',
-        alias: 'p'
-      }
-    ],
+    help: 'Use this command to signup for a resin.io account.\n\nIf signup is successful, you\'ll be logged in to your new user automatically.\n\nExamples:\n\n	$ resin signup\n	Email: me@mycompany.com\n	Username: johndoe\n	Password: ***********\n\n	$ resin whoami\n	johndoe',
     action: function(params, options, done) {
-      var hasOptionCredentials;
-      hasOptionCredentials = !_.isEmpty(options);
-      if (hasOptionCredentials) {
-        if (options.email == null) {
-          return done(new Error('Missing email'));
+      return form.run([
+        {
+          message: 'Email:',
+          name: 'email',
+          type: 'input',
+          validate: validation.validateEmail
+        }, {
+          message: 'Username:',
+          name: 'username',
+          type: 'input'
+        }, {
+          message: 'Password:',
+          name: 'password',
+          type: 'password',
+          validate: validation.validatePassword
         }
-        if (options.username == null) {
-          return done(new Error('Missing username'));
-        }
-        if (options.password == null) {
-          return done(new Error('Missing password'));
-        }
-      }
-      return async.waterfall([
-        function(callback) {
-          if (hasOptionCredentials) {
-            return callback(null, options);
-          }
-          return visuals.widgets.register(callback);
-        }, function(credentials, callback) {
-          return resin.auth.register(credentials, function(error, token) {
-            return callback(error, credentials);
-          });
-        }, function(credentials, callback) {
-          return resin.auth.login(credentials, callback);
-        }
-      ], done);
+      ]).then(resin.auth.register).then(resin.auth.loginWithToken).tap(function() {
+        return events.send('user.signup');
+      }).nodeify(done);
     }
   };
 
   exports.whoami = {
     signature: 'whoami',
-    description: 'get current username',
-    help: 'Use this command to find out the current logged in username.\n\nExamples:\n\n	$ resin whoami',
+    description: 'get current username and email address',
+    help: 'Use this command to find out the current logged in username and email address.\n\nExamples:\n\n	$ resin whoami',
     permission: 'user',
     action: function(params, options, done) {
-      return resin.auth.whoami(function(error, username) {
-        if (username == null) {
-          return done(new Error('Username not found'));
-        }
-        return console.log(username);
-      });
+      return Promise.props({
+        username: resin.auth.whoami(),
+        email: resin.auth.getEmail()
+      }).then(function(results) {
+        return console.log(visuals.table.vertical(results, ['$account information$', 'username', 'email']));
+      }).nodeify(done);
     }
   };
 

build/actions/command-options.js

@@ -1,4 +1,8 @@
 (function() {
+  var _;
+
+  _ = require('lodash');
+
   exports.yes = {
     signature: 'yes',
     description: 'confirm non interactively',
@@ -6,12 +10,29 @@
     alias: 'y'
   };
 
-  exports.application = {
+  exports.optionalApplication = {
     signature: 'application',
     parameter: 'application',
-    description: 'application id',
-    alias: ['a', 'app'],
+    description: 'application name',
+    alias: ['a', 'app']
+  };
+
+  exports.application = _.defaults({
     required: 'You have to specify an application'
+  }, exports.optionalApplication);
+
+  exports.optionalDevice = {
+    signature: 'device',
+    parameter: 'device',
+    description: 'device name',
+    alias: 'd'
+  };
+
+  exports.booleanDevice = {
+    signature: 'device',
+    description: 'device name',
+    boolean: true,
+    alias: 'd'
   };
 
   exports.network = {

build/actions/device.js

@@ -1,63 +1,109 @@
 (function() {
-  var _, async, commandOptions, osAction, path, resin, visuals;
+  var Promise, _, capitano, commandOptions, events, form, helpers, patterns, resin, rimraf, tmp, visuals;
 
-  _ = require('lodash-contrib');
+  Promise = require('bluebird');
 
-  path = require('path');
+  capitano = Promise.promisifyAll(require('capitano'));
 
-  async = require('async');
+  _ = require('lodash');
 
   resin = require('resin-sdk');
 
   visuals = require('resin-cli-visuals');
 
-  commandOptions = require('./command-options');
+  form = require('resin-cli-form');
 
-  osAction = require('./os');
+  events = require('resin-cli-events');
+
+  rimraf = Promise.promisify(require('rimraf'));
+
+  patterns = require('../utils/patterns');
+
+  helpers = require('../utils/helpers');
+
+  tmp = Promise.promisifyAll(require('tmp'));
+
+  tmp.setGracefulCleanup();
+
+  commandOptions = require('./command-options');
 
   exports.list = {
     signature: 'devices',
     description: 'list all devices',
-    help: 'Use this command to list all devices that belong to a certain application.\n\nExamples:\n\n	$ resin devices --application 91',
-    options: [commandOptions.application],
+    help: 'Use this command to list all devices that belong to you.\n\nYou can filter the devices by application by using the `--application` option.\n\nExamples:\n\n	$ resin devices\n	$ resin devices --application MyApp\n	$ resin devices --app MyApp\n	$ resin devices -a MyApp',
+    options: [commandOptions.optionalApplication],
     permission: 'user',
+    primary: true,
     action: function(params, options, done) {
-      return resin.models.device.getAllByApplication(options.application, function(error, devices) {
-        if (error != null) {
-          return done(error);
+      return Promise["try"](function() {
+        if (options.application != null) {
+          return resin.models.device.getAllByApplication(options.application);
         }
-        console.log(visuals.widgets.table.horizontal(devices, ['id', 'name', 'device_type', 'is_online', 'application_name', 'status', 'last_seen']));
-        return done();
-      });
+        return resin.models.device.getAll();
+      }).tap(function(devices) {
+        return console.log(visuals.table.horizontal(devices, ['id', 'name', 'device_type', 'is_online', 'application_name', 'status', 'last_seen']));
+      }).nodeify(done);
     }
   };
 
   exports.info = {
-    signature: 'device <id>',
+    signature: 'device <uuid>',
     description: 'list a single device',
-    help: 'Use this command to show information about a single device.\n\nExamples:\n\n	$ resin device 317',
+    help: 'Use this command to show information about a single device.\n\nExamples:\n\n	$ resin device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9',
     permission: 'user',
+    primary: true,
     action: function(params, options, done) {
-      return resin.models.device.get(params.id, function(error, device) {
-        if (error != null) {
-          return done(error);
+      return resin.models.device.get(params.uuid).then(function(device) {
+        if (device.last_seen == null) {
+          device.last_seen = 'Not seen';
         }
-        console.log(visuals.widgets.table.vertical(device, ['id', 'name', 'device_type', 'is_online', 'ip_address', 'application_name', 'status', 'last_seen', 'uuid', 'commit', 'supervisor_version', 'is_web_accessible', 'note']));
-        return done();
-      });
+        console.log(visuals.table.vertical(device, ["$" + device.name + "$", 'id', 'device_type', 'is_online', 'ip_address', 'application_name', 'status', 'last_seen', 'uuid', 'commit', 'supervisor_version', 'is_web_accessible', 'note']));
+        return events.send('device.open', {
+          device: device.uuid
+        });
+      }).nodeify(done);
+    }
+  };
+
+  exports.register = {
+    signature: 'device register <application>',
+    description: 'register a device',
+    help: 'Use this command to register a device to an application.\n\nExamples:\n\n	$ resin device register MyApp',
+    permission: 'user',
+    options: [
+      {
+        signature: 'uuid',
+        description: 'custom uuid',
+        parameter: 'uuid',
+        alias: 'u'
+      }
+    ],
+    action: function(params, options, done) {
+      return resin.models.application.get(params.application).then(function(application) {
+        return Promise["try"](function() {
+          return options.uuid || resin.models.device.generateUUID();
+        }).then(function(uuid) {
+          console.info("Registering to " + application.app_name + ": " + uuid);
+          return resin.models.device.register(application.app_name, uuid);
+        });
+      }).get('uuid').nodeify(done);
     }
   };
 
   exports.remove = {
-    signature: 'device rm <id>',
+    signature: 'device rm <uuid>',
     description: 'remove a device',
-    help: 'Use this command to remove a device from resin.io.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nExamples:\n\n	$ resin device rm 317\n	$ resin device rm 317 --yes',
+    help: 'Use this command to remove a device from resin.io.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nExamples:\n\n	$ resin device rm 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9\n	$ resin device rm 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9 --yes',
     options: [commandOptions.yes],
     permission: 'user',
     action: function(params, options, done) {
-      return visuals.patterns.remove('device', options.yes, function(callback) {
-        return resin.models.device.remove(params.id, callback);
-      }, done);
+      return patterns.confirm(options.yes, 'Are you sure you want to delete the device?').then(function() {
+        return resin.models.device.remove(params.uuid);
+      }).tap(function() {
+        return events.send('device.delete', {
+          device: params.uuid
+        });
+      }).nodeify(done);
     }
   };
 
@@ -67,73 +113,77 @@
     help: 'Use this command to identify a device.\n\nIn the Raspberry Pi, the ACT led is blinked several times.\n\nExamples:\n\n	$ resin device identify 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828',
     permission: 'user',
     action: function(params, options, done) {
-      return resin.models.device.identify(params.uuid, done);
+      return resin.models.device.identify(params.uuid).nodeify(done);
     }
   };
 
   exports.rename = {
-    signature: 'device rename <id> [name]',
+    signature: 'device rename <uuid> [newName]',
     description: 'rename a resin device',
-    help: 'Use this command to rename a device.\n\nIf you omit the name, you\'ll get asked for it interactively.\n\nExamples:\n\n	$ resin device rename 317 MyPi\n	$ resin device rename 317',
+    help: 'Use this command to rename a device.\n\nIf you omit the name, you\'ll get asked for it interactively.\n\nExamples:\n\n	$ resin device rename 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9 MyPi\n	$ resin device rename 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9',
     permission: 'user',
     action: function(params, options, done) {
-      return async.waterfall([
-        function(callback) {
-          if (!_.isEmpty(params.name)) {
-            return callback(null, params.name);
-          }
-          return visuals.widgets.ask('How do you want to name this device?', callback);
-        }, function(name, callback) {
-          return resin.models.device.rename(params.id, name, callback);
+      return Promise["try"](function() {
+        if (!_.isEmpty(params.newName)) {
+          return params.newName;
         }
-      ], done);
-    }
-  };
-
-  exports.supported = {
-    signature: 'devices supported',
-    description: 'list all supported devices',
-    help: 'Use this command to get the list of all supported devices\n\nExamples:\n\n	$ resin devices supported',
-    permission: 'user',
-    action: function(params, options, done) {
-      return resin.models.device.getSupportedDeviceTypes(function(error, devices) {
-        if (error != null) {
-          return done(error);
-        }
-        _.each(devices, _.unary(console.log));
-        return done();
-      });
+        return form.ask({
+          message: 'How do you want to name this device?',
+          type: 'input'
+        });
+      }).then(_.partial(resin.models.device.rename, params.uuid)).tap(function() {
+        return events.send('device.rename', {
+          device: params.uuid
+        });
+      }).nodeify(done);
     }
   };
 
   exports.init = {
-    signature: 'device init [device]',
+    signature: 'device init',
     description: 'initialise a device with resin os',
-    help: 'Use this command to download the OS image of a certain application and write it to an SD Card.\n\nNote that this command requires admin privileges.\n\nIf `device` is omitted, you will be prompted to select a device interactively.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nYou can quiet the progress bar by passing the `--quiet` boolean option.\n\nYou may have to unmount the device before attempting this operation.\n\nYou need to configure the network type and other settings:\n\nEthernet:\n  You can setup the device OS to use ethernet by setting the `--network` option to "ethernet".\n\nWifi:\n  You can setup the device OS to use wifi by setting the `--network` option to "wifi".\n  If you set "network" to "wifi", you will need to specify the `--ssid` and `--key` option as well.\n\nExamples:\n\n	$ resin device init --application 91 --network ethernet\n	$ resin device init /dev/disk2 --application 91 --network wifi --ssid MyNetwork --key secret',
-    options: [commandOptions.application, commandOptions.network, commandOptions.wifiSsid, commandOptions.wifiKey],
+    help: 'Use this command to download the OS image of a certain application and write it to an SD Card.\n\nNotice this command may ask for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nExamples:\n\n	$ resin device init\n	$ resin device init --application MyApp',
+    options: [
+      commandOptions.optionalApplication, commandOptions.yes, {
+        signature: 'advanced',
+        description: 'enable advanced configuration',
+        boolean: true,
+        alias: 'v'
+      }
+    ],
     permission: 'user',
+    primary: true,
     action: function(params, options, done) {
-      params.id = options.application;
-      return async.waterfall([
-        function(callback) {
-          if (params.device != null) {
-            return callback(null, params.device);
-          }
-          return visuals.patterns.selectDrive(callback);
-        }, function(device, callback) {
-          params.device = device;
-          return visuals.patterns.confirm(options.yes, "This will completely erase " + params.device + ". Are you sure you want to continue?", callback);
-        }, function(confirmed, callback) {
-          if (!confirmed) {
-            return done();
-          }
-          options.yes = confirmed;
-          return osAction.download.action(params, options, callback);
-        }, function(outputFile, callback) {
-          params.image = outputFile;
-          return osAction.install.action(params, options, callback);
+      return Promise["try"](function() {
+        if (options.application != null) {
+          return options.application;
         }
-      ], done);
+        return patterns.selectApplication();
+      }).then(resin.models.application.get).then(function(application) {
+        var download;
+        download = function() {
+          return tmp.tmpNameAsync().then(function(temporalPath) {
+            return capitano.runAsync("os download " + application.device_type + " --output " + temporalPath);
+          }).disposer(function(temporalPath) {
+            return rimraf(temporalPath);
+          });
+        };
+        return Promise.using(download(), function(temporalPath) {
+          return capitano.runAsync("device register " + application.app_name).then(resin.models.device.get).tap(function(device) {
+            var configure;
+            configure = "os configure " + temporalPath + " " + device.uuid;
+            if (options.advanced) {
+              configure += ' --advanced';
+            }
+            return capitano.runAsync(configure).then(function() {
+              return helpers.sudo(['os', 'initialize', temporalPath, '--type', application.device_type]);
+            });
+          });
+        }).then(function(device) {
+          console.log('Done');
+          return device.uuid;
+        });
+      }).nodeify(done);
     }
   };
 

build/actions/drive.js

@@ -1,33 +0,0 @@
-(function() {
-  var _, async, drivelist, visuals;
-
-  _ = require('lodash');
-
-  async = require('async');
-
-  visuals = require('resin-cli-visuals');
-
-  drivelist = require('drivelist');
-
-  exports.list = {
-    signature: 'drives',
-    description: 'list available drives',
-    help: 'Use this command to list all drives that are connected to your machine.\n\nExamples:\n\n	$ resin drives',
-    permission: 'user',
-    action: function(params, options, done) {
-      return drivelist.list(function(error, drives) {
-        if (error != null) {
-          return done(error);
-        }
-        return async.reject(drives, drivelist.isSystem, function(removableDrives) {
-          if (_.isEmpty(removableDrives)) {
-            return done(new Error('No removable devices available'));
-          }
-          console.log(visuals.widgets.table.horizontal(removableDrives, ['device', 'description', 'size']));
-          return done();
-        });
-      });
-    }
-  };
-
-}).call(this);

build/actions/environment-variables.js

@@ -1,20 +1,26 @@
 (function() {
-  var _, commandOptions, resin, visuals;
+  var Promise, _, commandOptions, events, patterns, resin, visuals;
 
-  _ = require('lodash-contrib');
+  Promise = require('bluebird');
+
+  _ = require('lodash');
 
   resin = require('resin-sdk');
 
   visuals = require('resin-cli-visuals');
 
+  events = require('resin-cli-events');
+
   commandOptions = require('./command-options');
 
+  patterns = require('../utils/patterns');
+
   exports.list = {
     signature: 'envs',
     description: 'list all environment variables',
-    help: 'Use this command to list all environment variables for a particular application.\nNotice we will support per-device environment variables soon.\n\nThis command lists all custom environment variables set on the devices running\nthe application. If you want to see all environment variables, including private\nones used by resin, use the verbose option.\n\nExample:\n\n	$ resin envs --application 91\n	$ resin envs --application 91 --verbose',
+    help: 'Use this command to list all environment variables for\na particular application or device.\n\nThis command lists all custom environment variables.\nIf you want to see all environment variables, including private\nones used by resin, use the verbose option.\n\nExample:\n\n	$ resin envs --application MyApp\n	$ resin envs --application MyApp --verbose\n	$ resin envs --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9',
     options: [
-      commandOptions.application, {
+      commandOptions.optionalApplication, commandOptions.optionalDevice, {
         signature: 'verbose',
         description: 'show private environment variables',
         boolean: true,
@@ -23,58 +29,110 @@
     ],
     permission: 'user',
     action: function(params, options, done) {
-      return resin.models.environmentVariables.getAllByApplication(options.application, function(error, environmentVariables) {
-        if (error != null) {
-          return done(error);
+      return Promise["try"](function() {
+        if (options.application != null) {
+          return resin.models.environmentVariables.getAllByApplication(options.application);
+        } else if (options.device != null) {
+          return resin.models.environmentVariables.device.getAll(options.device);
+        } else {
+          throw new Error('You must specify an application or device');
+        }
+      }).tap(function(environmentVariables) {
+        var isSystemVariable;
+        if (_.isEmpty(environmentVariables)) {
+          throw new Error('No environment variables found');
         }
         if (!options.verbose) {
-          environmentVariables = _.reject(environmentVariables, resin.models.environmentVariables.isSystemVariable);
+          isSystemVariable = resin.models.environmentVariables.isSystemVariable;
+          environmentVariables = _.reject(environmentVariables, isSystemVariable);
         }
-        console.log(visuals.widgets.table.horizontal(environmentVariables, ['id', 'name', 'value']));
-        return done();
-      });
+        return console.log(visuals.table.horizontal(environmentVariables, ['id', 'name', 'value']));
+      }).nodeify(done);
     }
   };
 
   exports.remove = {
     signature: 'env rm <id>',
     description: 'remove an environment variable',
-    help: 'Use this command to remove an environment variable from an application.\n\nDon\'t remove resin specific variables, as things might not work as expected.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nExamples:\n\n	$ resin env rm 215\n	$ resin env rm 215 --yes',
-    options: [commandOptions.yes],
+    help: 'Use this command to remove an environment variable from an application.\n\nDon\'t remove resin specific variables, as things might not work as expected.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nIf you want to eliminate a device environment variable, pass the `--device` boolean option.\n\nExamples:\n\n	$ resin env rm 215\n	$ resin env rm 215 --yes\n	$ resin env rm 215 --device',
+    options: [commandOptions.yes, commandOptions.booleanDevice],
     permission: 'user',
     action: function(params, options, done) {
-      return visuals.patterns.remove('environment variable', options.yes, function(callback) {
-        return resin.models.environmentVariables.remove(params.id, callback);
-      }, done);
+      return patterns.confirm(options.yes, 'Are you sure you want to delete the environment variable?').then(function() {
+        if (options.device) {
+          resin.models.environmentVariables.device.remove(params.id);
+          return events.send('deviceEnvironmentVariable.delete', {
+            id: params.id
+          });
+        } else {
+          resin.models.environmentVariables.remove(params.id);
+          return events.send('environmentVariable.delete', {
+            id: params.id
+          });
+        }
+      }).nodeify(done);
     }
   };
 
   exports.add = {
     signature: 'env add <key> [value]',
     description: 'add an environment variable',
-    help: 'Use this command to add an enviroment variable to an application.\n\nYou need to pass the `--application` option.\n\nIf value is omitted, the tool will attempt to use the variable\'s value\nas defined in your host machine.\n\nIf the value is grabbed from the environment, a warning message will be printed.\nUse `--quiet` to remove it.\n\nExamples:\n\n	$ resin env add EDITOR vim -a 91\n	$ resin env add TERM -a 91',
-    options: [commandOptions.application],
+    help: 'Use this command to add an enviroment variable to an application.\n\nIf value is omitted, the tool will attempt to use the variable\'s value\nas defined in your host machine.\n\nUse the `--device` option if you want to assign the environment variable\nto a specific device.\n\nIf the value is grabbed from the environment, a warning message will be printed.\nUse `--quiet` to remove it.\n\nExamples:\n\n	$ resin env add EDITOR vim --application MyApp\n	$ resin env add TERM --application MyApp\n	$ resin env add EDITOR vim --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9',
+    options: [commandOptions.optionalApplication, commandOptions.optionalDevice],
     permission: 'user',
     action: function(params, options, done) {
-      if (params.value == null) {
-        params.value = process.env[params.key];
+      return Promise["try"](function() {
         if (params.value == null) {
-          return done(new Error("Environment value not found for key: " + params.key));
-        } else {
-          console.info("Warning: using " + params.key + "=" + params.value + " from host environment");
+          params.value = process.env[params.key];
+          if (params.value == null) {
+            throw new Error("Environment value not found for key: " + params.key);
+          } else {
+            console.info("Warning: using " + params.key + "=" + params.value + " from host environment");
+          }
         }
-      }
-      return resin.models.environmentVariables.create(options.application, params.key, params.value, done);
+        if (options.application != null) {
+          return resin.models.environmentVariables.create(options.application, params.key, params.value).then(function() {
+            return resin.models.application.get(options.application).then(function(application) {
+              return events.send('environmentVariable.create', {
+                application: application.id
+              });
+            });
+          });
+        } else if (options.device != null) {
+          return resin.models.environmentVariables.device.create(options.device, params.key, params.value).then(function() {
+            return events.send('deviceEnvironmentVariable.create', {
+              device: options.device
+            });
+          });
+        } else {
+          throw new Error('You must specify an application or device');
+        }
+      }).nodeify(done);
     }
   };
 
   exports.rename = {
     signature: 'env rename <id> <value>',
     description: 'rename an environment variable',
-    help: 'Use this command to rename an enviroment variable from an application.\n\nExamples:\n\n	$ resin env rename 376 emacs',
+    help: 'Use this command to rename an enviroment variable from an application.\n\nPass the `--device` boolean option if you want to rename a device environment variable.\n\nExamples:\n\n	$ resin env rename 376 emacs\n	$ resin env rename 376 emacs --device',
     permission: 'user',
+    options: [commandOptions.booleanDevice],
     action: function(params, options, done) {
-      return resin.models.environmentVariables.update(params.id, params.value, done);
+      return Promise["try"](function() {
+        if (options.device) {
+          return resin.models.environmentVariables.device.update(params.id, params.value).then(function() {
+            return events.send('deviceEnvironmentVariable.edit', {
+              id: params.id
+            });
+          });
+        } else {
+          return resin.models.environmentVariables.update(params.id, params.value).then(function() {
+            return events.send('environmentVariable.edit', {
+              id: params.id
+            });
+          });
+        }
+      }).nodeify(done);
     }
   };
 

build/actions/examples.js

@@ -1,92 +0,0 @@
-(function() {
-  var _, async, examplesData, fs, gitCli, path, resin, visuals;
-
-  async = require('async');
-
-  fs = require('fs');
-
-  path = require('path');
-
-  _ = require('lodash');
-
-  gitCli = require('git-cli');
-
-  resin = require('resin-sdk');
-
-  visuals = require('resin-cli-visuals');
-
-  examplesData = require('../data/examples.json');
-
-  exports.list = {
-    signature: 'examples',
-    description: 'list all example applications',
-    help: 'Use this command to list available example applications from resin.io\n\nExample:\n\n	$ resin examples',
-    permission: 'user',
-    action: function() {
-      examplesData = _.map(examplesData, function(example, index) {
-        example.id = index + 1;
-        return example;
-      });
-      examplesData = _.map(examplesData, function(example) {
-        if (example.author == null) {
-          example.author = 'Unknown';
-        }
-        return example;
-      });
-      return console.log(visuals.widgets.table.horizontal(examplesData, ['id', 'display_name', 'repository', 'author']));
-    }
-  };
-
-  exports.info = {
-    signature: 'example <id>',
-    description: 'list a single example application',
-    help: 'Use this command to show information of a single example application\n\nExample:\n\n	$ resin example 3',
-    permission: 'user',
-    action: function(params, options, done) {
-      var example, id;
-      id = params.id - 1;
-      example = examplesData[id];
-      if (example == null) {
-        return done(new Error("Unknown example: " + id));
-      }
-      example.id = id;
-      if (example.author == null) {
-        example.author = 'Unknown';
-      }
-      console.log(visuals.widgets.table.vertical(example, ['id', 'display_name', 'description', 'author', 'repository']));
-      return done();
-    }
-  };
-
-  exports.clone = {
-    signature: 'example clone <id>',
-    description: 'clone an example application',
-    help: 'Use this command to clone an example application to the current directory\n\nThis command outputs information about the cloning process.\nUse `--quiet` to remove that output.\n\nExample:\n\n	$ resin example clone 3',
-    permission: 'user',
-    action: function(params, options, done) {
-      var example;
-      example = examplesData[params.id - 1];
-      if (example == null) {
-        return done(new Error("Unknown example: " + id));
-      }
-      return async.waterfall([
-        function(callback) {
-          var exampleAbsolutePath;
-          exampleAbsolutePath = path.join(process.cwd(), example.name);
-          return fs.exists(exampleAbsolutePath, function(exists) {
-            var error;
-            if (!exists) {
-              return callback();
-            }
-            error = new Error("Directory exists: " + example.name);
-            return callback(error);
-          });
-        }, function(callback) {
-          console.info("Cloning " + example.display_name + " to " + example.name);
-          return gitCli.Repository.clone(example.repository, example.name, callback);
-        }
-      ], done);
-    }
-  };
-
-}).call(this);

build/actions/help.js

@@ -1,125 +1,80 @@
 (function() {
-  var PADDING_INITIAL, PADDING_MIDDLE, _, addAlias, addOptionPrefix, buildHelpString, buildOptionSignatureHelp, capitano, command, general, getCommandHelp, getFieldMaxLength, getOptionHelp, getOptionsParsedSignatures, resin;
+  var _, capitano, columnify, command, general, indent, parse, print;
 
   _ = require('lodash');
 
   _.str = require('underscore.string');
 
-  resin = require('resin-sdk');
-
   capitano = require('capitano');
 
-  PADDING_INITIAL = '    ';
+  columnify = require('columnify');
 
-  PADDING_MIDDLE = '\t';
-
-  getFieldMaxLength = function(array, field) {
-    return _.max(_.map(array, function(item) {
-      return item[field].toString().length;
-    }));
-  };
-
-  buildHelpString = function(firstColumn, secondColumn) {
-    var result;
-    result = "" + PADDING_INITIAL + firstColumn;
-    result += "" + PADDING_MIDDLE + secondColumn;
-    return result;
-  };
-
-  addOptionPrefix = function(option) {
-    if (option.length <= 0) {
-      return;
-    }
-    if (option.length === 1) {
-      return "-" + option;
-    } else {
-      return "--" + option;
-    }
-  };
-
-  addAlias = function(alias) {
-    return ", " + (addOptionPrefix(alias));
-  };
-
-  buildOptionSignatureHelp = function(option) {
-    var alias, i, len, ref, result;
-    result = addOptionPrefix(option.signature.toString());
-    if (_.isString(option.alias)) {
-      result += addAlias(option.alias);
-    } else if (_.isArray(option.alias)) {
-      ref = option.alias;
-      for (i = 0, len = ref.length; i < len; i++) {
-        alias = ref[i];
-        result += addAlias(alias);
+  parse = function(object) {
+    return _.object(_.map(object, function(item) {
+      var signature;
+      if (item.alias != null) {
+        signature = item.toString();
+      } else {
+        signature = item.signature.toString();
       }
-    }
-    if (option.parameter != null) {
-      result += " <" + option.parameter + ">";
-    }
-    return result;
-  };
-
-  getCommandHelp = function(command) {
-    var commandSignature, maxSignatureLength;
-    maxSignatureLength = getFieldMaxLength(capitano.state.commands, 'signature');
-    commandSignature = _.str.rpad(command.signature.toString(), maxSignatureLength, ' ');
-    return buildHelpString(commandSignature, command.description);
-  };
-
-  getOptionsParsedSignatures = function(optionsHelp) {
-    var maxLength;
-    maxLength = _.max(_.map(optionsHelp, function(signature) {
-      return signature.length;
+      return [signature, item.description];
     }));
-    return _.map(optionsHelp, function(signature) {
-      return _.str.rpad(signature, maxLength, ' ');
+  };
+
+  indent = function(text) {
+    text = _.map(_.str.lines(text), function(line) {
+      return '    ' + line;
     });
+    return text.join('\n');
   };
 
-  getOptionHelp = function(option, maxLength) {
-    var result;
-    result = PADDING_INITIAL;
-    result += _.str.rpad(option.signature, maxLength, ' ');
-    result += PADDING_MIDDLE;
-    result += option.description;
-    return result;
+  print = function(data) {
+    return console.log(indent(columnify(data, {
+      showHeaders: false,
+      minWidth: 35
+    })));
   };
 
-  general = function() {
-    var command, i, j, len, len1, option, optionSignatureMaxLength, options, ref;
+  general = function(params, options, done) {
+    var commands, groupedCommands;
     console.log('Usage: resin [COMMAND] [OPTIONS]\n');
-    console.log('Commands:\n');
-    ref = capitano.state.commands;
-    for (i = 0, len = ref.length; i < len; i++) {
-      command = ref[i];
-      if (command.isWildcard()) {
-        continue;
-      }
-      console.log(getCommandHelp(command));
-    }
-    console.log('\nGlobal Options:\n');
-    options = _.map(capitano.state.globalOptions, function(option) {
-      option.signature = buildOptionSignatureHelp(option);
-      return option;
+    console.log('Primary commands:\n');
+    commands = _.reject(capitano.state.commands, function(command) {
+      return command.isWildcard();
     });
-    optionSignatureMaxLength = _.max(_.map(options, function(option) {
-      return option.signature.length;
-    }));
-    for (j = 0, len1 = options.length; j < len1; j++) {
-      option = options[j];
-      console.log(getOptionHelp(option, optionSignatureMaxLength));
+    groupedCommands = _.groupBy(commands, function(command) {
+      if (command.plugin) {
+        return 'plugins';
+      } else if (command.primary) {
+        return 'primary';
+      }
+      return 'secondary';
+    });
+    print(parse(groupedCommands.primary));
+    if (options.verbose) {
+      if (!_.isEmpty(groupedCommands.plugins)) {
+        console.log('\nInstalled plugins:\n');
+        print(parse(groupedCommands.plugins));
+      }
+      console.log('\nAdditional commands:\n');
+      print(parse(groupedCommands.secondary));
+    } else {
+      console.log('\nRun `resin help --verbose` to list additional commands');
     }
-    return console.log();
+    if (!_.isEmpty(capitano.state.globalOptions)) {
+      console.log('\nGlobal Options:\n');
+      print(parse(capitano.state.globalOptions));
+    }
+    return done();
   };
 
   command = function(params, options, done) {
     return capitano.state.getMatchCommand(params.command, function(error, command) {
-      var i, len, option, optionSignatureMaxLength;
       if (error != null) {
         return done(error);
       }
       if ((command == null) || command.isWildcard()) {
-        return capitano.defaults.actions.commandNotFound(params.command);
+        return done(new Error("Command not found: " + params.command));
       }
       console.log("Usage: " + command.signature);
       if (command.help != null) {
@@ -129,18 +84,7 @@
       }
       if (!_.isEmpty(command.options)) {
         console.log('\nOptions:\n');
-        options = _.map(command.options, function(option) {
-          option.signature = buildOptionSignatureHelp(option);
-          return option;
-        });
-        optionSignatureMaxLength = _.max(_.map(options, function(option) {
-          return option.signature.toString().length;
-        }));
-        for (i = 0, len = options.length; i < len; i++) {
-          option = options[i];
-          console.log(getOptionHelp(option, optionSignatureMaxLength));
-        }
-        console.log();
+        print(parse(command.options));
       }
       return done();
     });
@@ -150,6 +94,15 @@
     signature: 'help [command...]',
     description: 'show help',
     help: 'Get detailed help for an specific command.\n\nExamples:\n\n	$ resin help apps\n	$ resin help os download',
+    primary: true,
+    options: [
+      {
+        signature: 'verbose',
+        description: 'show additional commands',
+        boolean: true,
+        alias: 'v'
+      }
+    ],
     action: function(params, options, done) {
       if (params.command != null) {
         return command(params, options, done);

build/actions/index.js

@@ -1,20 +1,16 @@
 (function() {
   module.exports = {
+    wizard: require('./wizard'),
     app: require('./app'),
     info: require('./info'),
     auth: require('./auth'),
-    drive: require('./drive'),
     device: require('./device'),
     env: require('./environment-variables'),
     keys: require('./keys'),
     logs: require('./logs'),
     notes: require('./notes'),
-    preferences: require('./preferences'),
-    os: require('./os'),
     help: require('./help'),
-    examples: require('./examples'),
-    plugin: require('./plugin'),
-    update: require('./update')
+    os: require('./os')
   };
 
 }).call(this);

build/actions/info.js

@@ -6,10 +6,10 @@
   exports.version = {
     signature: 'version',
     description: 'output the version number',
-    help: 'Display the Resin CLI, as well as the bundled NodeJS version.',
-    action: function() {
-      console.log(packageJSON.name + ": " + packageJSON.version);
-      return console.log("node: " + process.version);
+    help: 'Display the Resin CLI version.',
+    action: function(params, options, done) {
+      console.log(packageJSON.version);
+      return done();
     }
   };
 

build/actions/keys.js

@@ -1,35 +1,33 @@
 (function() {
-  var _, async, capitano, commandOptions, fs, resin, visuals;
+  var Promise, _, capitano, commandOptions, events, fs, patterns, resin, visuals;
+
+  Promise = require('bluebird');
+
+  fs = Promise.promisifyAll(require('fs'));
 
   _ = require('lodash');
 
-  _.str = require('underscore.string');
-
-  async = require('async');
-
-  fs = require('fs');
-
   resin = require('resin-sdk');
 
   capitano = require('capitano');
 
   visuals = require('resin-cli-visuals');
 
+  events = require('resin-cli-events');
+
   commandOptions = require('./command-options');
 
+  patterns = require('../utils/patterns');
+
   exports.list = {
     signature: 'keys',
     description: 'list all ssh keys',
     help: 'Use this command to list all your SSH keys.\n\nExamples:\n\n	$ resin keys',
     permission: 'user',
     action: function(params, options, done) {
-      return resin.models.key.getAll(function(error, keys) {
-        if (error != null) {
-          return done(error);
-        }
-        console.log(visuals.widgets.table.horizontal(keys, ['id', 'title']));
-        return done();
-      });
+      return resin.models.key.getAll().then(function(keys) {
+        return console.log(visuals.table.horizontal(keys, ['id', 'title']));
+      }).nodeify(done);
     }
   };
 
@@ -39,16 +37,10 @@
     help: 'Use this command to show information about a single SSH key.\n\nExamples:\n\n	$ resin key 17',
     permission: 'user',
     action: function(params, options, done) {
-      return resin.models.key.get(params.id, function(error, key) {
-        var sshKeyWidth;
-        if (error != null) {
-          return done(error);
-        }
-        sshKeyWidth = resin.settings.get('sshKeyWidth');
-        key.public_key = '\n' + visuals.helpers.chop(key.public_key, sshKeyWidth);
-        console.log(visuals.widgets.table.vertical(key, ['id', 'title', 'public_key']));
-        return done();
-      });
+      return resin.models.key.get(params.id).then(function(key) {
+        console.log(visuals.table.vertical(key, ['id', 'title']));
+        return console.log('\n' + key.public_key);
+      }).nodeify(done);
     }
   };
 
@@ -59,9 +51,13 @@
     options: [commandOptions.yes],
     permission: 'user',
     action: function(params, options, done) {
-      return visuals.patterns.remove('key', options.yes, function(callback) {
-        return resin.models.key.remove(params.id, callback);
-      }, done);
+      return patterns.confirm(options.yes, 'Are you sure you want to delete the key?').then(function() {
+        return resin.models.key.remove(params.id);
+      }).tap(function() {
+        return events.send('publicKey.delete', {
+          id: params.id
+        });
+      }).nodeify(done);
     }
   };
 
@@ -71,21 +67,20 @@
     help: 'Use this command to associate a new SSH key with your account.\n\nIf `path` is omitted, the command will attempt\nto read the SSH key from stdin.\n\nExamples:\n\n	$ resin key add Main ~/.ssh/id_rsa.pub\n	$ cat ~/.ssh/id_rsa.pub | resin key add Main',
     permission: 'user',
     action: function(params, options, done) {
-      return async.waterfall([
-        function(callback) {
-          if (params.path != null) {
-            return fs.readFile(params.path, {
-              encoding: 'utf8'
-            }, callback);
-          } else {
-            return capitano.utils.getStdin(function(data) {
-              return callback(null, data);
-            });
-          }
-        }, function(key, callback) {
-          return resin.models.key.create(params.name, key, callback);
+      return Promise["try"](function() {
+        if (params.path != null) {
+          return fs.readFileAsync(params.path, {
+            encoding: 'utf8'
+          });
         }
-      ], done);
+        return Promise.fromNode(function(callback) {
+          return capitano.utils.getStdin(function(data) {
+            return callback(null, data);
+          });
+        });
+      }).then(_.partial(resin.models.key.create, params.name)).tap(function() {
+        return events.send('publicKey.create');
+      }).nodeify(done);
     }
   };
 

build/actions/logs.js

@@ -1,23 +1,16 @@
 (function() {
-  var LOGS_HISTORY_COUNT, _, resin;
+  var _, resin;
 
   _ = require('lodash');
 
   resin = require('resin-sdk');
 
-  LOGS_HISTORY_COUNT = 200;
-
-  exports.logs = {
+  module.exports = {
     signature: 'logs <uuid>',
     description: 'show device logs',
-    help: 'Use this command to show logs for a specific device.\n\nBy default, the command prints all log messages and exit.\n\nTo limit the output to the n last lines, use the `--num` option along with a number.\nThis is similar to doing `resin logs <uuid> | tail -n X`.\n\nTo continuously stream output, and see new logs in real time, use the `--tail` option.\n\nNote that for now you need to provide the whole UUID for this command to work correctly,\nand the tool won\'t notice if you\'re using an invalid UUID.\n\nThis is due to some technical limitations that we plan to address soon.\n\nExamples:\n\n	$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828\n	$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828 --num 20\n	$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828 --tail',
+    help: 'Use this command to show logs for a specific device.\n\nBy default, the command prints all log messages and exit.\n\nTo continuously stream output, and see new logs in real time, use the `--tail` option.\n\nNote that for now you need to provide the whole UUID for this command to work correctly.\n\nThis is due to some technical limitations that we plan to address soon.\n\nExamples:\n\n	$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828\n	$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828 --tail',
     options: [
       {
-        signature: 'num',
-        parameter: 'num',
-        description: 'number of lines to display',
-        alias: 'n'
-      }, {
         signature: 'tail',
         description: 'continuously stream output',
         boolean: true,
@@ -25,23 +18,25 @@
       }
     ],
     permission: 'user',
+    primary: true,
     action: function(params, options, done) {
-      return resin.logs.subscribe(params.uuid, {
-        history: options.num || LOGS_HISTORY_COUNT,
-        tail: options.tail
-      }, function(error, message) {
-        if (error != null) {
-          return done(error);
-        }
-        if (_.isArray(message)) {
-          _.each(message, function(line) {
-            return console.log(line);
-          });
-        } else {
-          console.log(message);
-        }
-        return done();
+      var promise;
+      promise = resin.logs.history(params.uuid).each(function(line) {
+        return console.log(line.message);
       });
+      if (!options.tail) {
+        return promise["catch"](done)["finally"](function() {
+          return process.exit(0);
+        });
+      }
+      return promise.then(function() {
+        return resin.logs.subscribe(params.uuid).then(function(logs) {
+          logs.on('line', function(line) {
+            return console.log(line.message);
+          });
+          return logs.on('error', done);
+        });
+      })["catch"](done);
     }
   };
 

build/actions/notes.js

@@ -1,26 +1,33 @@
 (function() {
-  var async, resin;
+  var Promise, _, resin;
 
-  async = require('async');
+  Promise = require('bluebird');
+
+  _ = require('lodash');
 
   resin = require('resin-sdk');
 
   exports.set = {
     signature: 'note <|note>',
     description: 'set a device note',
-    help: 'Use this command to set or update a device note.\n\nIf note command isn\'t passed, the tool attempts to read from `stdin`.\n\nTo view the notes, use $ resin device <id>.\n\nExamples:\n\n	$ resin note "My useful note" --device 317\n	$ cat note.txt | resin note --device 317',
+    help: 'Use this command to set or update a device note.\n\nIf note command isn\'t passed, the tool attempts to read from `stdin`.\n\nTo view the notes, use $ resin device <uuid>.\n\nExamples:\n\n	$ resin note "My useful note" --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9\n	$ cat note.txt | resin note --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9',
     options: [
       {
         signature: 'device',
         parameter: 'device',
-        description: 'device id',
+        description: 'device uuid',
         alias: ['d', 'dev'],
         required: 'You have to specify a device'
       }
     ],
     permission: 'user',
     action: function(params, options, done) {
-      return resin.models.device.note(options.device, params.note, done);
+      return Promise["try"](function() {
+        if (_.isEmpty(params.note)) {
+          throw new Error('Missing note content');
+        }
+        return resin.models.device.note(options.device, params.note);
+      }).nodeify(done);
     }
   };
 

build/actions/os.js

@@ -1,136 +1,176 @@
 (function() {
-  var _, async, commandOptions, diskio, fs, mkdirp, os, path, progressStream, resin, visuals;
-
-  _ = require('lodash-contrib');
+  var Promise, _, commandOptions, form, fs, helpers, init, manager, patterns, resin, rindle, stepHandler, umount, unzip, visuals;
 
   fs = require('fs');
 
-  os = require('os');
+  _ = require('lodash');
 
-  async = require('async');
+  Promise = require('bluebird');
 
-  path = require('path');
+  umount = Promise.promisifyAll(require('umount'));
 
-  mkdirp = require('mkdirp');
+  unzip = require('unzip2');
+
+  rindle = require('rindle');
 
   resin = require('resin-sdk');
 
+  manager = require('resin-image-manager');
+
   visuals = require('resin-cli-visuals');
 
-  progressStream = require('progress-stream');
+  form = require('resin-cli-form');
 
-  diskio = require('diskio');
+  init = require('resin-device-init');
 
   commandOptions = require('./command-options');
 
+  helpers = require('../utils/helpers');
+
+  patterns = require('../utils/patterns');
+
   exports.download = {
-    signature: 'os download <id>',
-    description: 'download device OS',
-    help: 'Use this command to download the device OS configured to a specific network.\n\nEthernet:\n	You can setup the device OS to use ethernet by setting the `--network` option to "ethernet".\n\nWifi:\n	You can setup the device OS to use wifi by setting the `--network` option to "wifi".\n	If you set "network" to "wifi", you will need to specify the `--ssid` and `--key` option as well.\n\nBy default, this command saved the downloaded image into a resin specific directory.\nYou can save it to a custom location by specifying the `--output` option.\n\nExamples:\n\n	$ resin os download 91 --network ethernet\n	$ resin os download 91 --network wifi --ssid MyNetwork --key secreykey123\n	$ resin os download 91 --network ethernet --output ~/MyResinOS.zip',
+    signature: 'os download <type>',
+    description: 'download an unconfigured os image',
+    help: 'Use this command to download an unconfigured os image for a certain device type.\n\nExamples:\n\n	$ resin os download parallella -o ../foo/bar/parallella.img',
+    permission: 'user',
     options: [
-      commandOptions.network, commandOptions.wifiSsid, commandOptions.wifiKey, {
+      {
         signature: 'output',
+        description: 'output path',
         parameter: 'output',
-        description: 'output file',
-        alias: 'o'
+        alias: 'o',
+        required: 'You have to specify an output location'
       }
     ],
-    permission: 'user',
     action: function(params, options, done) {
-      var fileName, osParams;
-      osParams = {
-        network: options.network,
-        wifiSsid: options.ssid,
-        wifiKey: options.key,
-        appId: params.id
-      };
-      fileName = resin.models.os.generateCacheName(osParams);
-      if (options.output == null) {
-        options.output = path.join(resin.settings.get('directories.os'), fileName);
-      }
-      return async.waterfall([
-        function(callback) {
-          return mkdirp(path.dirname(options.output), _.unary(callback));
-        }, function(callback) {
-          var bar;
-          console.info("Destination file: " + options.output + "\n");
-          bar = new visuals.widgets.Progress('Downloading Device OS');
-          return resin.models.os.download(osParams, options.output, callback, function(state) {
+      console.info("Getting device operating system for " + params.type);
+      return manager.get(params.type).then(function(stream) {
+        var bar, output, spinner;
+        bar = new visuals.Progress('Downloading Device OS');
+        spinner = new visuals.Spinner('Downloading Device OS (size unknown)');
+        stream.on('progress', function(state) {
+          if (state != null) {
             return bar.update(state);
+          } else {
+            return spinner.start();
+          }
+        });
+        stream.on('end', function() {
+          return spinner.stop();
+        });
+        if (stream.mime === 'application/zip') {
+          output = unzip.Extract({
+            path: options.output
           });
+        } else {
+          output = fs.createWriteStream(options.output);
         }
-      ], function(error) {
-        if (error != null) {
-          return done(error);
-        }
-        console.info("\nFinished downloading " + options.output);
-        return done(null, options.output);
-      });
+        return rindle.wait(stream.pipe(output))["return"](options.output);
+      }).tap(function(output) {
+        return console.info("The image was downloaded to " + output);
+      }).nodeify(done);
     }
   };
 
-  exports.install = {
-    signature: 'os install <image> [device]',
-    description: 'write an operating system image to a device',
-    help: 'Use this command to write an operating system image to a device.\n\nNote that this command requires admin privileges.\n\nIf `device` is omitted, you will be prompted to select a device interactively.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nYou can quiet the progress bar by passing the `--quiet` boolean option.\n\nYou may have to unmount the device before attempting this operation.\n\nSee the `drives` command to get a list of all connected devices to your machine and their respective ids.\n\nIn Mac OS X:\n\n	$ sudo diskutil unmountDisk /dev/xxx\n\nIn GNU/Linux:\n\n	$ sudo umount /dev/xxx\n\nExamples:\n\n	$ resin os install rpi.iso /dev/disk2',
-    options: [commandOptions.yes],
+  stepHandler = function(step) {
+    var bar;
+    step.on('stdout', _.bind(process.stdout.write, process.stdout));
+    step.on('stderr', _.bind(process.stderr.write, process.stderr));
+    step.on('state', function(state) {
+      if (state.operation.command === 'burn') {
+        return;
+      }
+      return console.log(helpers.stateToString(state));
+    });
+    bar = new visuals.Progress('Writing Device OS');
+    step.on('burn', _.bind(bar.update, bar));
+    return rindle.wait(step);
+  };
+
+  exports.configure = {
+    signature: 'os configure <image> <uuid>',
+    description: 'configure an os image',
+    help: 'Use this command to configure a previously download operating system image with a device.\n\nExamples:\n\n	$ resin os configure ../path/rpi.img 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9',
     permission: 'user',
+    options: [
+      {
+        signature: 'advanced',
+        description: 'show advanced commands',
+        boolean: true,
+        alias: 'v'
+      }
+    ],
     action: function(params, options, done) {
-      return async.waterfall([
-        function(callback) {
-          if (params.device != null) {
-            return callback(null, params.device);
-          }
-          return visuals.patterns.selectDrive(function(error, device) {
-            if (error != null) {
-              return callback(error);
-            }
-            if (device == null) {
-              return callback(new Error('No removable devices available'));
-            }
-            return callback(null, device);
+      console.info('Configuring operating system image');
+      return resin.models.device.get(params.uuid).get('device_type').then(resin.models.device.getManifestBySlug).get('options').then(function(questions) {
+        var advancedGroup, override;
+        if (!options.advanced) {
+          advancedGroup = _.findWhere(questions, {
+            name: 'advanced',
+            isGroup: true
           });
-        }, function(device, callback) {
-          var message;
-          params.device = device;
-          message = "This will completely erase " + params.device + ". Are you sure you want to continue?";
-          return visuals.patterns.confirm(options.yes, message, callback);
-        }, function(confirmed, callback) {
-          var bar, error, imageFileSize, imageFileStream, progress;
-          if (!confirmed) {
-            return done();
+          if (advancedGroup != null) {
+            override = helpers.getGroupDefaults(advancedGroup);
           }
-          imageFileSize = fs.statSync(params.image).size;
-          if (imageFileSize === 0) {
-            error = new Error("Invalid OS image: " + params.image + ". The image is 0 bytes.");
-            return callback(error);
+        }
+        return form.run(questions, {
+          override: override
+        });
+      }).then(function(answers) {
+        return init.configure(params.image, params.uuid, answers).then(stepHandler);
+      }).nodeify(done);
+    }
+  };
+
+  exports.initialize = {
+    signature: 'os initialize <image>',
+    description: 'initialize an os image',
+    help: 'Use this command to initialize a previously configured operating system image.\n\nExamples:\n\n	$ resin os initialize ../path/rpi.img --type \'raspberry-pi\'',
+    permission: 'user',
+    options: [
+      commandOptions.yes, {
+        signature: 'type',
+        description: 'device type',
+        parameter: 'type',
+        alias: 't',
+        required: 'You have to specify a device type'
+      }, {
+        signature: 'drive',
+        description: 'drive',
+        parameter: 'drive',
+        alias: 'd'
+      }
+    ],
+    root: true,
+    action: function(params, options, done) {
+      console.info('Initializing device');
+      return resin.models.device.getManifestBySlug(options.type).then(function(manifest) {
+        var ref;
+        return (ref = manifest.initialization) != null ? ref.options : void 0;
+      }).then(function(questions) {
+        return form.run(questions, {
+          override: {
+            drive: options.drive
           }
-          progress = progressStream({
-            length: imageFileSize,
-            time: 500
-          });
-          if (!options.quiet) {
-            bar = new visuals.widgets.Progress('Writing Device OS');
-            progress.on('progress', function(status) {
-              return bar.update(status);
-            });
-          }
-          imageFileStream = fs.createReadStream(params.image).pipe(progress);
-          return diskio.writeStream(params.device, imageFileStream, callback);
+        });
+      }).tap(function(answers) {
+        var message;
+        if (answers.drive == null) {
+          return;
         }
-      ], function(error) {
-        var resinWritePath, windosu;
-        if (error == null) {
-          return done();
+        message = "This will erase " + answers.drive + ". Are you sure?";
+        return patterns.confirm(options.yes, message)["return"](answers.drive).then(umount.umountAsync);
+      }).tap(function(answers) {
+        return init.initialize(params.image, options.type, answers).then(stepHandler);
+      }).then(function(answers) {
+        if (answers.drive == null) {
+          return;
         }
-        if (_.all([os.platform() === 'win32', error.code === 'EPERM' || error.code === 'EACCES', !options.fromScript])) {
-          windosu = require('windosu');
-          resinWritePath = "\"" + (path.join(__dirname, '..', '..', 'bin', 'resin-write')) + "\"";
-          return windosu.exec("\"" + process.argv[0] + "\" " + resinWritePath + " \"" + params.image + "\" \"" + params.device + "\"");
-        } else {
-          return done(error);
-        }
-      });
+        return umount.umountAsync(answers.drive).tap(function() {
+          return console.info("You can safely remove " + answers.drive + " now");
+        });
+      }).nodeify(done);
     }
   };
 

build/actions/plugin.js

@@ -1,83 +0,0 @@
-(function() {
-  var _, commandOptions, plugins, visuals;
-
-  _ = require('lodash');
-
-  visuals = require('resin-cli-visuals');
-
-  commandOptions = require('./command-options');
-
-  plugins = require('../plugins');
-
-  exports.list = {
-    signature: 'plugins',
-    description: 'list all plugins',
-    help: 'Use this command to list all the installed resin plugins.\n\nExamples:\n\n	$ resin plugins',
-    permission: 'user',
-    action: function(params, options, done) {
-      return plugins.list(function(error, resinPlugins) {
-        if (error != null) {
-          return done(error);
-        }
-        if (_.isEmpty(resinPlugins)) {
-          console.log('You don\'t have any plugins yet');
-          return done();
-        }
-        console.log(visuals.widgets.table.horizontal(resinPlugins, ['name', 'version', 'description', 'license']));
-        return done();
-      });
-    }
-  };
-
-  exports.install = {
-    signature: 'plugin install <name>',
-    description: 'install a plugin',
-    help: 'Use this command to install a resin plugin\n\nUse `--quiet` to prevent information logging.\n\nExamples:\n\n	$ resin plugin install hello',
-    permission: 'user',
-    action: function(params, options, done) {
-      return plugins.install(params.name, function(error) {
-        if (error != null) {
-          return done(error);
-        }
-        console.info("Plugin installed: " + params.name);
-        return done();
-      });
-    }
-  };
-
-  exports.update = {
-    signature: 'plugin update <name>',
-    description: 'update a plugin',
-    help: 'Use this command to update a resin plugin\n\nUse `--quiet` to prevent information logging.\n\nExamples:\n\n	$ resin plugin update hello',
-    permission: 'user',
-    action: function(params, options, done) {
-      return plugins.update(params.name, function(error, version) {
-        if (error != null) {
-          return done(error);
-        }
-        console.info("Plugin updated: " + params.name + "@" + version);
-        return done();
-      });
-    }
-  };
-
-  exports.remove = {
-    signature: 'plugin rm <name>',
-    description: 'remove a plugin',
-    help: 'Use this command to remove a resin.io plugin.\n\nNotice this command asks for confirmation interactively.\nYou can avoid this by passing the `--yes` boolean option.\n\nExamples:\n\n	$ resin plugin rm hello\n	$ resin plugin rm hello --yes',
-    options: [commandOptions.yes],
-    permission: 'user',
-    action: function(params, options, done) {
-      return visuals.patterns.remove('plugin', options.yes, function(callback) {
-        return plugins.remove(params.name, callback);
-      }, function(error) {
-        if (error != null) {
-          return done(error);
-        }
-        console.info("Plugin removed: " + params.name);
-        return done();
-      });
-    }
-  };
-
-}).call(this);

build/actions/preferences.js

@@ -1,23 +0,0 @@
-(function() {
-  var open, resin, url;
-
-  open = require('open');
-
-  url = require('url');
-
-  resin = require('resin-sdk');
-
-  exports.preferences = {
-    signature: 'preferences',
-    description: 'open preferences form',
-    help: 'Use this command to open the preferences form.\n\nIn the future, we will allow changing all preferences directly from the terminal.\nFor now, we open your default web browser and point it to the web based preferences form.\n\nExamples:\n\n	$ resin preferences',
-    permission: 'user',
-    action: function() {
-      var absUrl, preferencesUrl;
-      preferencesUrl = resin.settings.get('urls.preferences');
-      absUrl = url.resolve(resin.settings.get('remoteUrl'), preferencesUrl);
-      return open(absUrl);
-    }
-  };
-
-}).call(this);

build/actions/update.js

@@ -1,41 +0,0 @@
-(function() {
-  var _, async, npm, packageJSON;
-
-  async = require('async');
-
-  _ = require('lodash-contrib');
-
-  npm = require('npm');
-
-  packageJSON = require('../../package.json');
-
-  exports.update = {
-    signature: 'update',
-    description: 'update the resin cli',
-    help: 'Use this command to update the Resin CLI\n\nThis command outputs information about the update process.\nUse `--quiet` to remove that output.\n\nThe Resin CLI checks for updates once per day.\n\nMajor updates require a manual update with this update command,\nwhile minor updates are applied automatically.\n\nExamples:\n\n	$ resin update',
-    action: function(params, options, done) {
-      return async.waterfall([
-        function(callback) {
-          options = {
-            loglevel: 'silent',
-            global: true
-          };
-          return npm.load(options, _.unary(callback));
-        }, function(callback) {
-          return npm.commands.update([packageJSON.name], function(error, data) {
-            return callback(error, data);
-          });
-        }, function(data, callback) {
-          var newVersion;
-          if (_.isEmpty(data)) {
-            return callback(new Error('You are already running the latest version'));
-          }
-          newVersion = _.last(_.first(_.last(data)).split('@'));
-          console.info("Upgraded " + packageJSON.name + " to v" + newVersion + ".");
-          return callback();
-        }
-      ], done);
-    }
-  };
-
-}).call(this);

build/actions/wizard.js

@@ -0,0 +1,43 @@
+(function() {
+  var Promise, capitano, patterns, resin;
+
+  Promise = require('bluebird');
+
+  capitano = Promise.promisifyAll(require('capitano'));
+
+  resin = require('resin-sdk');
+
+  patterns = require('../utils/patterns');
+
+  exports.wizard = {
+    signature: 'quickstart [name]',
+    description: 'getting started with resin.io',
+    help: 'Use this command to run a friendly wizard to get started with resin.io.\n\nThe wizard will guide you through:\n\n	- Create an application.\n	- Initialise an SDCard with the resin.io operating system.\n	- Associate an existing project directory with your resin.io application.\n	- Push your project to your devices.\n\nExamples:\n\n	$ sudo resin quickstart\n	$ sudo resin quickstart MyApp',
+    permission: 'user',
+    primary: true,
+    action: function(params, options, done) {
+      return Promise["try"](function() {
+        if (params.name != null) {
+          return;
+        }
+        return patterns.selectOrCreateApplication().tap(function(applicationName) {
+          return resin.models.application.has(applicationName).then(function(hasApplication) {
+            if (hasApplication) {
+              return applicationName;
+            }
+            return capitano.runAsync("app create " + applicationName);
+          });
+        }).then(function(applicationName) {
+          return params.name = applicationName;
+        });
+      }).then(function() {
+        return capitano.runAsync("device init --application " + params.name);
+      }).tap(patterns.awaitDevice).then(function(uuid) {
+        return capitano.runAsync("device " + uuid);
+      }).then(function() {
+        return console.log('Your device is ready, start pushing some code!');
+      }).nodeify(done);
+    }
+  };
+
+}).call(this);

build/app.js

@@ -1,11 +1,11 @@
 (function() {
-  var _, actions, async, capitano, changeProjectDirectory, errors, plugins, resin, update;
+  var Promise, _, actions, capitano, errors, plugins, resin, update;
 
   _ = require('lodash');
 
-  async = require('async');
+  Promise = require('bluebird');
 
-  capitano = require('capitano');
+  capitano = Promise.promisifyAll(require('capitano'));
 
   resin = require('resin-sdk');
 
@@ -13,17 +13,16 @@
 
   errors = require('./errors');
 
-  plugins = require('./plugins');
+  plugins = require('./utils/plugins');
 
-  update = require('./update');
+  update = require('./utils/update');
 
   capitano.permission('user', function(done) {
-    return resin.auth.isLoggedIn(function(isLoggedIn) {
+    return resin.auth.isLoggedIn().then(function(isLoggedIn) {
       if (!isLoggedIn) {
-        return done(new Error('You have to log in'));
+        throw new Error('You have to log in');
       }
-      return done();
-    });
+    }).nodeify(done);
   });
 
   capitano.command({
@@ -35,30 +34,12 @@
     }
   });
 
-  capitano.globalOption({
-    signature: 'quiet',
-    description: 'quiet (no output)',
-    boolean: true,
-    alias: 'q'
-  });
-
-  capitano.globalOption({
-    signature: 'project',
-    parameter: 'path',
-    description: 'project path',
-    alias: 'j'
-  });
-
-  capitano.globalOption({
-    signature: 'no-color',
-    description: 'disable colour highlighting',
-    boolean: true
-  });
-
   capitano.command(actions.info.version);
 
   capitano.command(actions.help.help);
 
+  capitano.command(actions.wizard.wizard);
+
   capitano.command(actions.auth.login);
 
   capitano.command(actions.auth.logout);
@@ -71,34 +52,28 @@
 
   capitano.command(actions.app.list);
 
-  capitano.command(actions.app.info);
-
   capitano.command(actions.app.remove);
 
   capitano.command(actions.app.restart);
 
-  capitano.command(actions.app.init);
+  capitano.command(actions.app.info);
 
   capitano.command(actions.device.list);
 
-  capitano.command(actions.device.supported);
-
   capitano.command(actions.device.rename);
 
   capitano.command(actions.device.init);
 
-  capitano.command(actions.device.info);
-
   capitano.command(actions.device.remove);
 
   capitano.command(actions.device.identify);
 
-  capitano.command(actions.drive.list);
+  capitano.command(actions.device.register);
+
+  capitano.command(actions.device.info);
 
   capitano.command(actions.notes.set);
 
-  capitano.command(actions.preferences.preferences);
-
   capitano.command(actions.keys.list);
 
   capitano.command(actions.keys.add);
@@ -115,56 +90,20 @@
 
   capitano.command(actions.env.remove);
 
-  capitano.command(actions.logs.logs);
-
   capitano.command(actions.os.download);
 
-  capitano.command(actions.os.install);
+  capitano.command(actions.os.configure);
 
-  capitano.command(actions.examples.list);
+  capitano.command(actions.os.initialize);
 
-  capitano.command(actions.examples.clone);
+  capitano.command(actions.logs);
 
-  capitano.command(actions.examples.info);
+  update.notify();
 
-  capitano.command(actions.plugin.list);
-
-  capitano.command(actions.plugin.install);
-
-  capitano.command(actions.plugin.update);
-
-  capitano.command(actions.plugin.remove);
-
-  capitano.command(actions.update.update);
-
-  changeProjectDirectory = function(directory) {
-    try {
-      return process.chdir(directory);
-    } catch (_error) {
-      return errors.handle(new Error("Invalid project: " + directory));
-    }
-  };
-
-  async.waterfall([
-    function(callback) {
-      return update.check(callback);
-    }, function(callback) {
-      return plugins.register('resin-plugin-', callback);
-    }, function(callback) {
-      var dataPrefix;
-      dataPrefix = resin.settings.get('dataPrefix');
-      return resin.data.prefix.set(dataPrefix, callback);
-    }, function(callback) {
-      var cli;
-      cli = capitano.parse(process.argv);
-      if (cli.global.quiet) {
-        console.info = _.noop;
-      }
-      if (cli.global.project != null) {
-        changeProjectDirectory(cli.global.project);
-      }
-      return capitano.execute(cli, callback);
-    }
-  ], errors.handle);
+  plugins.register(/^resin-plugin-(.+)$/).then(function() {
+    var cli;
+    cli = capitano.parse(process.argv);
+    return capitano.executeAsync(cli);
+  })["catch"](errors.handle);
 
 }).call(this);

build/data/examples.json

@@ -1,96 +0,0 @@
-[
-	{
-		"name": "basic-resin-node-project",
-		"display_name": "Node.js Starter Project",
-		"repository": "https://github.com/resin-io/basic-resin-node-project",
-		"description": "This is a simple Hello, World project for node.js designed to act as a basis for future work. It demonstrates how to install native Linux packages and configure your application."
-	},
-	{
-		"name": "cimon",
-		"display_name": "Cimon",
-		"repository": "https://bitbucket.org/efwe/cimon",
-		"description": "A simple tool for reading temperatures from a USB-enabled thermometer. This project is used as the backend to efwe's awesome temperature visualisation at 123k.de.",
-		"author": "efwe"
-	},
-	{
-		"name": "firebaseDTL",
-		"display_name": "Digital Temperature Logger",
-		"repository": "https://github.com/shaunmulligan/firebaseDTL",
-		"description": "A Firebase-backed Digital Temperature Logger allowing you to connect devices with multiple temperature sensors to a central cloud-based datastore.",
-		"author": "Shaun Mulligan"
-	},
-	{
-		"name": "digitiser",
-		"display_name": "Digitiser",
-		"repository": "https://github.com/shaunmulligan/digitiser",
-		"description": "A tool for displaying integer values from a JSON endpoint on a MAX7219 7-segment display.",
-		"author": "Shaun Mulligan"
-	},
-	{
-		"name": "basic-gpio",
-		"display_name": "Example Pi Pins Application",
-		"repository": "https://github.com/shaunmulligan/basic-gpio",
-		"description": "A simple application which demonstrates the use of the Pi Pins library to interface with GPIO.",
-		"author": "Shaun Mulligan"
-	},
-	{
-		"name": "coder",
-		"display_name": "Google Coder",
-		"repository": "https://github.com/resin-io/coder",
-		"description": "Resin.io-enabled version of Google's excellent Coder project which makes it easy to develop web projects on your device."
-	},
-	{
-		"name": "hoversnap",
-		"display_name": "Hoversnap",
-		"repository": "https://github.com/resin-io/hoversnap",
-		"description": "A tool for controlling a camera using a foot switch in order to capture shots in which people appear to be flying."
-	},
-	{
-		"name": "resin-piminer",
-		"display_name": "Pi Miner",
-		"repository": "https://github.com/csquared/resin-piminer",
-		"description": "A bitcoin miner for the Raspberry Pi.",
-		"author": "Chris Continanza"
-	},
-	{
-		"name": "resin-cctv",
-		"display_name": "Resin CCTV",
-		"repository": "https://github.com/abresas/resin-cctv",
-		"description": "A project which allows you to use your devices as a CCTV camera system which hooks into Dropbox.",
-		"author": "Aleksis Brezas"
-	},
-	{
-		"name": "resin_player",
-		"display_name": "Resin Player",
-		"repository": "https://bitbucket.org/lifeeth/resin_player/",
-		"description": "A project which allows you to play squeezebox media through your devices.",
-		"author": "Praneeth Bodduluri"
-	},
-	{
-		"name": "salesforceTemp",
-		"display_name": "Salesforce Temperature Probe",
-		"repository": "https://github.com/shaunmulligan/salesforceTemp",
-		"description": "Example application for interfacing with a temperature probe using Salesforce.com.",
-		"author": "Shaun Mulligan"
-	},
-	{
-		"name": "sms2speech",
-		"display_name": "SMS to Speech",
-		"repository": "https://github.com/alexandrosm/sms2speech",
-		"description": "A simple tool which uses Twillio to read out incoming SMS messages.",
-		"author": "Alexandros Marinos"
-	},
-	{
-		"name": "resin-kiosk",
-		"display_name": "Simple Digitiser Kiosk",
-		"repository": "https://bitbucket.org/lifeeth/resin-kiosk",
-		"description": "Displays values from a JSON endpoint on your browser in kiosk mode",
-		"author": "Praneeth Bodduluri"
-	},
-	{
-		"name": "text2speech",
-		"display_name": "Text to Speech Converter",
-		"repository": "https://github.com/resin-io/text2speech",
-		"description": "A simple application that makes your device speak out loud."
-	}
-]

build/errors.js

@@ -1,45 +1,23 @@
 (function() {
-  var _, os;
+  var chalk, errors, patterns;
 
-  _ = require('lodash');
+  chalk = require('chalk');
 
-  os = require('os');
+  errors = require('resin-cli-errors');
 
-  exports.handle = function(error, exit) {
-    var errorCode, message;
-    if (exit == null) {
-      exit = true;
-    }
-    if ((error == null) || !(error instanceof Error)) {
+  patterns = require('./utils/patterns');
+
+  exports.handle = function(error) {
+    var message;
+    message = errors.interpret(error);
+    if (message == null) {
       return;
     }
     if (process.env.DEBUG) {
-      console.error(error.stack);
-    } else {
-      if (error.code === 'EISDIR') {
-        console.error("File is a directory: " + error.path);
-      } else if (error.code === 'ENOENT') {
-        console.error("No such file or directory: " + error.path);
-      } else if (error.code === 'EACCES' || error.code === 'EPERM') {
-        message = 'You don\'t have enough privileges to run this operation.\n';
-        if (os.platform() === 'win32') {
-          message += 'Run a new Command Prompt as administrator and try running this command again.';
-        } else {
-          message += 'Try running this command again prefixing it with `sudo`.';
-        }
-        console.error(message);
-      } else if (error.message != null) {
-        console.error(error.message);
-      }
-    }
-    if (_.isNumber(error.exitCode)) {
-      errorCode = error.exitCode;
-    } else {
-      errorCode = 1;
-    }
-    if (exit) {
-      return process.exit(errorCode);
+      message = error.stack;
     }
+    patterns.printErrorMessage(message);
+    return process.exit(error.exitCode || 1);
   };
 
 }).call(this);

build/package.json

@@ -1,68 +0,0 @@
-{
-  "name": "resin-cli",
-  "version": "0.0.1",
-  "description": "Git Push to your devices",
-  "main": "./lib/actions/index.coffee",
-  "repository": {
-    "type": "git",
-    "url": "git@bitbucket.org:rulemotion/resin-cli.git"
-  },
-  "preferGlobal": true,
-  "bundled_engine": "v0.12.0",
-  "man": [
-    "./man/resin.1",
-    "./man/resin-completion.1",
-    "./man/resin-plugins.1"
-  ],
-  "bin": {
-    "resin": "./bin/resin"
-  },
-  "scripts": {
-    "prepublish": "gulp build",
-    "test": "gult test",
-    "install": "node build/install-node.js bin/node"
-  },
-  "keywords": [
-    "resin",
-    "git"
-  ],
-  "author": "Juan Cruz Viotti <juanchiviotti@gmail.com>",
-  "license": "MIT",
-  "optionalDependencies": {
-    "windosu": "^0.1.3"
-  },
-  "devDependencies": {
-    "chai": "~1.9.2",
-    "gulp": "~3.8.9",
-    "gulp-coffee": "^2.2.0",
-    "gulp-coffeelint": "~0.4.0",
-    "gulp-marked-man": "~0.3.1",
-    "gulp-mocha": "~1.1.1",
-    "gulp-shell": "^0.2.11",
-    "gulp-util": "~3.0.1",
-    "mocha": "~2.0.1",
-    "mocha-notifier-reporter": "~0.1.0",
-    "run-sequence": "~1.0.2",
-    "sinon": "~1.12.1",
-    "sinon-chai": "~2.6.0"
-  },
-  "dependencies": {
-    "async": "~0.9.0",
-    "capitano": "~1.5.0",
-    "coffee-script": "~1.8.0",
-    "conf.js": "^0.1.1",
-    "diskio": "^1.0.0",
-    "drivelist": "^1.2.0",
-    "git-cli": "~0.8.2",
-    "lodash": "~2.4.1",
-    "lodash-contrib": "~241.4.14",
-    "mkdirp": "~0.5.0",
-    "node-binary": "^1.0.1",
-    "nplugm": "^2.0.0",
-    "open": "0.0.5",
-    "progress-stream": "^0.5.0",
-    "resin-cli-visuals": "resin-io/resin-cli-visuals",
-    "resin-sdk": "resin-io/resin-sdk",
-    "underscore.string": "~2.4.0"
-  }
-}

build/plugins.js

@@ -1,55 +0,0 @@
-(function() {
-  var Nplugm, _, capitano, nplugm, registerPlugin;
-
-  Nplugm = require('nplugm');
-
-  _ = require('lodash');
-
-  capitano = require('capitano');
-
-  nplugm = null;
-
-  registerPlugin = function(plugin) {
-    if (!_.isArray(plugin)) {
-      return capitano.command(plugin);
-    }
-    return _.each(plugin, capitano.command);
-  };
-
-  exports.register = function(prefix, callback) {
-    nplugm = new Nplugm(prefix);
-    return nplugm.list(function(error, plugins) {
-      var i, len, plugin;
-      if (error != null) {
-        return callback(error);
-      }
-      for (i = 0, len = plugins.length; i < len; i++) {
-        plugin = plugins[i];
-        try {
-          registerPlugin(nplugm.require(plugin));
-        } catch (_error) {
-          error = _error;
-          console.error(error.message);
-        }
-      }
-      return callback();
-    });
-  };
-
-  exports.list = function() {
-    return nplugm.list.apply(nplugm, arguments);
-  };
-
-  exports.install = function() {
-    return nplugm.install.apply(nplugm, arguments);
-  };
-
-  exports.update = function() {
-    return nplugm.update.apply(nplugm, arguments);
-  };
-
-  exports.remove = function() {
-    return nplugm.remove.apply(nplugm, arguments);
-  };
-
-}).call(this);

build/update.js

@@ -1,37 +0,0 @@
-(function() {
-  var packageJSON, updateAction, updateNotifier;
-
-  updateNotifier = require('update-notifier');
-
-  packageJSON = require('../package.json');
-
-  updateAction = require('./actions/update');
-
-  exports.perform = function(callback) {
-    return updateAction.update.action(null, null, callback);
-  };
-
-  exports.notify = function(update) {
-    if (!process.stdout.isTTY) {
-      return;
-    }
-    return console.log("> Major update available: " + update.current + " -> " + update.latest + "\n> Run resin update to update.\n> Beware that a major release might introduce breaking changes.\n");
-  };
-
-  exports.check = function(callback) {
-    var notifier;
-    notifier = updateNotifier({
-      pkg: packageJSON
-    });
-    if (notifier.update == null) {
-      return callback();
-    }
-    if (notifier.update.type === 'major') {
-      exports.notify(notifier.update);
-      return callback();
-    }
-    console.log("Performing " + notifier.update.type + " update, hold tight...");
-    return exports.perform(callback);
-  };
-
-}).call(this);

build/utils/helpers.js

@@ -0,0 +1,54 @@
+(function() {
+  var Promise, _, capitano, chalk, child_process, os, rindle;
+
+  Promise = require('bluebird');
+
+  capitano = Promise.promisifyAll(require('capitano'));
+
+  _ = require('lodash');
+
+  _.str = require('underscore.string');
+
+  child_process = require('child_process');
+
+  rindle = require('rindle');
+
+  os = require('os');
+
+  chalk = require('chalk');
+
+  exports.getGroupDefaults = function(group) {
+    return _.chain(group).get('options').map(function(question) {
+      return [question.name, question["default"]];
+    }).object().value();
+  };
+
+  exports.stateToString = function(state) {
+    var percentage, result;
+    percentage = _.str.lpad(state.percentage, 3, '0') + '%';
+    result = (chalk.blue(percentage)) + " " + (chalk.cyan(state.operation.command));
+    switch (state.operation.command) {
+      case 'copy':
+        return result + " " + state.operation.from.path + " -> " + state.operation.to.path;
+      case 'replace':
+        return result + " " + state.operation.file.path + ", " + state.operation.copy + " -> " + state.operation.replace;
+      case 'run-script':
+        return result + " " + state.operation.script;
+      default:
+        throw new Error("Unsupported operation: " + state.operation.type);
+    }
+  };
+
+  exports.sudo = function(command) {
+    var spawn;
+    if (os.platform() === 'win32') {
+      return capitano.runAsync(command.join(' '));
+    }
+    command = _.union(_.take(process.argv, 2), command);
+    spawn = child_process.spawn('sudo', command, {
+      stdio: 'inherit'
+    });
+    return rindle.wait(spawn);
+  };
+
+}).call(this);

build/utils/patterns.js

@@ -0,0 +1,113 @@
+(function() {
+  var Promise, _, chalk, form, resin, validation, visuals;
+
+  _ = require('lodash');
+
+  Promise = require('bluebird');
+
+  form = require('resin-cli-form');
+
+  visuals = require('resin-cli-visuals');
+
+  resin = require('resin-sdk');
+
+  chalk = require('chalk');
+
+  validation = require('./validation');
+
+  exports.selectDeviceType = function() {
+    return resin.models.device.getSupportedDeviceTypes().then(function(deviceTypes) {
+      return form.ask({
+        message: 'Device Type',
+        type: 'list',
+        choices: deviceTypes
+      });
+    });
+  };
+
+  exports.confirm = function(yesOption, message) {
+    return Promise["try"](function() {
+      if (yesOption) {
+        return true;
+      }
+      return form.ask({
+        message: message,
+        type: 'confirm',
+        "default": false
+      });
+    }).then(function(confirmed) {
+      if (!confirmed) {
+        throw new Error('Aborted');
+      }
+    });
+  };
+
+  exports.selectApplication = function() {
+    return resin.models.application.hasAny().then(function(hasAnyApplications) {
+      if (!hasAnyApplications) {
+        throw new Error('You don\'t have any applications');
+      }
+      return resin.models.application.getAll().then(function(applications) {
+        return form.ask({
+          message: 'Select an application',
+          type: 'list',
+          choices: _.pluck(applications, 'app_name')
+        });
+      });
+    });
+  };
+
+  exports.selectOrCreateApplication = function() {
+    return resin.models.application.hasAny().then(function(hasAnyApplications) {
+      if (!hasAnyApplications) {
+        return;
+      }
+      return resin.models.application.getAll().then(function(applications) {
+        applications = _.pluck(applications, 'app_name');
+        applications.unshift({
+          name: 'Create a new application',
+          value: null
+        });
+        return form.ask({
+          message: 'Select an application',
+          type: 'list',
+          choices: applications
+        });
+      });
+    }).then(function(application) {
+      if (application != null) {
+        return application;
+      }
+      return form.ask({
+        message: 'Choose a Name for your new application',
+        type: 'input',
+        validate: validation.validateApplicationName
+      });
+    });
+  };
+
+  exports.awaitDevice = function(uuid) {
+    return resin.models.device.getName(uuid).then(function(deviceName) {
+      var poll, spinner;
+      spinner = new visuals.Spinner("Waiting for " + deviceName + " to come online");
+      poll = function() {
+        return resin.models.device.isOnline(uuid).then(function(isOnline) {
+          if (isOnline) {
+            spinner.stop();
+            console.info("Device became online: " + deviceName);
+          } else {
+            spinner.start();
+            return Promise.delay(3000).then(poll);
+          }
+        });
+      };
+      console.info("Waiting for " + deviceName + " to connect to resin...");
+      return poll()["return"](uuid);
+    });
+  };
+
+  exports.printErrorMessage = function(message) {
+    return console.error(chalk.red(message));
+  };
+
+}).call(this);

build/utils/plugins.js

@@ -0,0 +1,26 @@
+(function() {
+  var _, capitano, nplugm, patterns;
+
+  nplugm = require('nplugm');
+
+  _ = require('lodash');
+
+  capitano = require('capitano');
+
+  patterns = require('./patterns');
+
+  exports.register = function(regex) {
+    return nplugm.list(regex).map(function(plugin) {
+      var command;
+      command = require(plugin);
+      command.plugin = true;
+      if (!_.isArray(command)) {
+        return capitano.command(command);
+      }
+      return _.each(command, capitano.command);
+    })["catch"](function(error) {
+      return patterns.printErrorMessage(error.message);
+    });
+  };
+
+}).call(this);

build/utils/update.js

@@ -0,0 +1,32 @@
+(function() {
+  var isRoot, notifier, packageJSON, updateNotifier;
+
+  updateNotifier = require('update-notifier');
+
+  isRoot = require('is-root');
+
+  packageJSON = require('../../package.json');
+
+  if (!isRoot()) {
+    notifier = updateNotifier({
+      pkg: packageJSON
+    });
+  }
+
+  exports.hasAvailableUpdate = function() {
+    return notifier != null;
+  };
+
+  exports.notify = function() {
+    if (!exports.hasAvailableUpdate()) {
+      return;
+    }
+    notifier.notify({
+      defer: false
+    });
+    if (notifier.update != null) {
+      return console.log('Notice that you might need administrator privileges depending on your setup\n');
+    }
+  };
+
+}).call(this);

build/utils/validation.js

@@ -0,0 +1,27 @@
+(function() {
+  var validEmail;
+
+  validEmail = require('valid-email');
+
+  exports.validateEmail = function(input) {
+    if (!validEmail(input)) {
+      return 'Email is not valid';
+    }
+    return true;
+  };
+
+  exports.validatePassword = function(input) {
+    if (input.length < 8) {
+      return 'Password should be 8 characters long';
+    }
+    return true;
+  };
+
+  exports.validateApplicationName = function(input) {
+    if (input.length < 4) {
+      return 'The application name should be at least 4 characters';
+    }
+    return true;
+  };
+
+}).call(this);

capitanodoc.json

@@ -0,0 +1,72 @@
+{
+	"title": "Resin CLI Documentation",
+	"introduction": "This tool allows you to interact with the resin.io api from the comfort of your command line.\n\nTo get started download the CLI from npm.\n\n\t$ npm install resin-cli -g\n\nThen authenticate yourself:\n\n\t$ resin login\n\nNow you have access to all the commands referenced below.",
+	"categories": [
+		{
+			"title": "Application",
+			"files": [
+				"lib/actions/app.coffee"
+			]
+		},
+		{
+			"title": "Authentication",
+			"files": [
+				"lib/actions/auth.coffee"
+			]
+		},
+		{
+			"title": "Device",
+			"files": [
+				"lib/actions/device.coffee"
+			]
+		},
+		{
+			"title": "Environment Variables",
+			"files": [
+				"lib/actions/environment-variables.coffee"
+			]
+		},
+		{
+			"title": "Help",
+			"files": [
+				"lib/actions/help.coffee"
+			]
+		},
+		{
+			"title": "Information",
+			"files": [
+				"lib/actions/info.coffee"
+			]
+		},
+		{
+			"title": "Keys",
+			"files": [
+				"lib/actions/keys.coffee"
+			]
+		},
+		{
+			"title": "Logs",
+			"files": [
+				"lib/actions/logs.coffee"
+			]
+		},
+		{
+			"title": "Notes",
+			"files": [
+				"lib/actions/notes.coffee"
+			]
+		},
+		{
+			"title": "OS",
+			"files": [
+				"lib/actions/os.coffee"
+			]
+		},
+		{
+			"title": "Wizard",
+			"files": [
+				"lib/actions/wizard.coffee"
+			]
+		}
+	]
+}

completion/resin.sh

@@ -1,49 +0,0 @@
-_resin() {
-	COMPREPLY=()
-
-	local current="${COMP_WORDS[COMP_CWORD]}"
-	local previous="${COMP_WORDS[COMP_CWORD-1]}"
-	local options="version help login logout signup drive whoami app apps init devices device note preferences keys key envs env logs os examples example"
-
-	case "${previous}" in
-		app)
-			local subcommands="create rm restart"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		drive)
-			local subcommands="list"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		devices)
-			local subcommands="supported"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		device)
-			local subcommands="rename rm identify init"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		key)
-			local subcommands="add rm"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		env)
-			local subcommands="add rename rm"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		os)
-			local subcommands="download install"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		example)
-			local subcommands="clone"
-			COMPREPLY=( $(compgen -W "${subcommands}" -- ${current}) )
-			return 0 ;;
-		*)
-			;;
-	esac
-
-	COMPREPLY=( $(compgen -W "${options}" -- ${current}) )
-	return 0
-}
-
-complete -F _resin resin

doc/app/create.md

@@ -1,21 +0,0 @@
-# app create <name>
-
-Use this command to create a new resin.io application.
-
-You can specify the application type with the `--type` option.
-Otherwise, an interactive dropdown will be shown for you to select from.
-
-You can see a list of supported device types with
-
-	$ resin devices supported
-
-Examples:
-
-	$ resin app create MyApp
-	$ resin app create MyApp --type raspberry-pi
-
-## Options
-
-### --type, -t <type>
-
-application type

doc/app/info.md

@@ -1,7 +0,0 @@
-# app <id>
-
-Use this command to show detailed information for a single application.
-
-Examples:
-
-	$ resin app 91

doc/app/init.md

@@ -1,10 +0,0 @@
-# init <id>
-
-Use this command to associate a local project to an existing resin.io application.
-
-The application should be a git repository before issuing this command.
-Notice this command adds a `resin` git remote to your application.
-
-Examples:
-
-	$ cd myApp && resin init 91

doc/app/list.md

@@ -1,10 +0,0 @@
-# apps
-
-Use this command to list all your applications.
-
-Notice this command only shows the most important bits of information for each app.
-If you want detailed information, use resin app <id> instead.
-
-Examples:
-
-	$ resin apps

doc/app/remove.md

@@ -1,17 +0,0 @@
-# app rm <id>
-
-Use this command to remove a resin.io application.
-
-Notice this command asks for confirmation interactively.
-You can avoid this by passing the `--yes` boolean option.
-
-Examples:
-
-	$ resin app rm 91
-	$ resin app rm 91 --yes
-
-## Options
-
-### --yes, -y
-
-confirm non interactively

doc/app/restart.md

@@ -1,7 +0,0 @@
-# app restart <id>
-
-Use this command to restart all devices that belongs to a certain application.
-
-Examples:
-
-	$ resin app restart 91

doc/auth/login.md

@@ -1,22 +0,0 @@
-# login
-
-Use this command to login to your resin.io account.
-You need to login before you can use most of the commands this tool provides.
-
-You can pass your credentials as `--username` and `--password` options, or you can omit the
-credentials, in which case the tool will present you with an interactive login form.
-
-Examples:
-
-	$ resin login --username <username> --password <password>
-	$ resin login
-
-## Options
-
-### --username, -u <username>
-
-user name
-
-### --password, -p <password>
-
-user password

doc/auth/logout.md

@@ -1,7 +0,0 @@
-# logout
-
-Use this command to logout from your resin.io account.o
-
-Examples:
-
-	$ resin logout

doc/auth/signup.md

@@ -1,31 +0,0 @@
-# signup
-
-Use this command to signup for a resin.io account.
-
-If signup is successful, you'll be logged in to your new user automatically.
-
-Examples:
-
-	$ resin signup
-	Email: me@mycompany.com
-	Username: johndoe
-	Password: ***********
-
-	$ resin signup --email me@mycompany.com --username johndoe --password ***********
-
-	$ resin whoami
-	johndoe
-
-## Options
-
-### --email, -e <email>
-
-user email
-
-### --username, -u <username>
-
-user name
-
-### --password, -p <user password>
-
-user password

doc/auth/whoami.md

@@ -1,7 +0,0 @@
-# whoami
-
-Use this command to find out the current logged in username.
-
-Examples:
-
-	$ resin whoami

doc/cli.markdown

@@ -0,0 +1,614 @@
+# Resin CLI Documentation
+
+This tool allows you to interact with the resin.io api from the comfort of your command line.
+
+To get started download the CLI from npm.
+
+	$ npm install resin-cli -g
+
+Then authenticate yourself:
+
+	$ resin login
+
+Now you have access to all the commands referenced below.
+
+# Table of contents
+
+- Application
+
+	- [app create <name>](#app-create-60-name-62-)
+	- [apps](#apps)
+	- [app <name>](#app-60-name-62-)
+	- [app restart <name>](#app-restart-60-name-62-)
+	- [app rm <name>](#app-rm-60-name-62-)
+	- [app associate <name>](#app-associate-60-name-62-)
+
+- Authentication
+
+	- [login [token]](#login-token-)
+	- [logout](#logout)
+	- [signup](#signup)
+	- [whoami](#whoami)
+
+- Device
+
+	- [devices](#devices)
+	- [device <uuid>](#device-60-uuid-62-)
+	- [device register <application>](#device-register-60-application-62-)
+	- [device rm <uuid>](#device-rm-60-uuid-62-)
+	- [device identify <uuid>](#device-identify-60-uuid-62-)
+	- [device rename <uuid> [newName]](#device-rename-60-uuid-62-newname-)
+	- [device init](#device-init)
+
+- Environment Variables
+
+	- [envs](#envs)
+	- [env rm <id>](#env-rm-60-id-62-)
+	- [env add <key> [value]](#env-add-60-key-62-value-)
+	- [env rename <id> <value>](#env-rename-60-id-62-60-value-62-)
+
+- Help
+
+	- [help [command...]](#help-command-)
+
+- Information
+
+	- [version](#version)
+
+- Keys
+
+	- [keys](#keys)
+	- [key <id>](#key-60-id-62-)
+	- [key rm <id>](#key-rm-60-id-62-)
+	- [key add <name> [path]](#key-add-60-name-62-path-)
+
+- Logs
+
+	- [logs <uuid>](#logs-60-uuid-62-)
+
+- Notes
+
+	- [note <|note>](#note-60-note-62-)
+
+- OS
+
+	- [os download <type>](#os-download-60-type-62-)
+	- [os configure <image> <uuid>](#os-configure-60-image-62-60-uuid-62-)
+	- [os initialize <image>](#os-initialize-60-image-62-)
+
+- Wizard
+
+	- [quickstart [name]](#quickstart-name-)
+
+# Application
+
+## app create <name>
+
+Use this command to create a new resin.io application.
+
+You can specify the application type with the `--type` option.
+Otherwise, an interactive dropdown will be shown for you to select from.
+
+You can see a list of supported device types with
+
+	$ resin devices supported
+
+Examples:
+
+	$ resin app create MyApp
+	$ resin app create MyApp --type raspberry-pi
+
+### Options
+
+#### --type, -t <type>
+
+application type
+
+## apps
+
+Use this command to list all your applications.
+
+Notice this command only shows the most important bits of information for each app.
+If you want detailed information, use resin app <name> instead.
+
+Examples:
+
+	$ resin apps
+
+## app &#60;name&#62;
+
+Use this command to show detailed information for a single application.
+
+Examples:
+
+	$ resin app MyApp
+
+## app restart &#60;name&#62;
+
+Use this command to restart all devices that belongs to a certain application.
+
+Examples:
+
+	$ resin app restart MyApp
+
+## app rm &#60;name&#62;
+
+Use this command to remove a resin.io application.
+
+Notice this command asks for confirmation interactively.
+You can avoid this by passing the `--yes` boolean option.
+
+Examples:
+
+	$ resin app rm MyApp
+	$ resin app rm MyApp --yes
+
+### Options
+
+#### --yes, -y
+
+confirm non interactively
+
+## app associate &#60;name&#62;
+
+Use this command to associate a project directory with a resin application.
+
+This command adds a 'resin' git remote to the directory and runs git init if necessary.
+
+Notice this command asks for confirmation interactively.
+You can avoid this by passing the `--yes` boolean option.
+
+Examples:
+
+	$ resin app associate MyApp
+
+### Options
+
+#### --yes, -y
+
+confirm non interactively
+
+# Authentication
+
+## login [token]
+
+Use this command to login to your resin.io account.
+
+To login, you need your token, which is accesible from the preferences page.
+
+Examples:
+
+	$ resin login
+	$ resin login "eyJ0eXAiOiJKV1Qi..."
+
+## logout
+
+Use this command to logout from your resin.io account.o
+
+Examples:
+
+	$ resin logout
+
+## signup
+
+Use this command to signup for a resin.io account.
+
+If signup is successful, you'll be logged in to your new user automatically.
+
+Examples:
+
+	$ resin signup
+	Email: me@mycompany.com
+	Username: johndoe
+	Password: ***********
+
+	$ resin whoami
+	johndoe
+
+## whoami
+
+Use this command to find out the current logged in username and email address.
+
+Examples:
+
+	$ resin whoami
+
+# Device
+
+## devices
+
+Use this command to list all devices that belong to you.
+
+You can filter the devices by application by using the `--application` option.
+
+Examples:
+
+	$ resin devices
+	$ resin devices --application MyApp
+	$ resin devices --app MyApp
+	$ resin devices -a MyApp
+
+### Options
+
+#### --application, --a,app, --a,app &#60;application&#62;
+
+application name
+
+## device &#60;uuid&#62;
+
+Use this command to show information about a single device.
+
+Examples:
+
+	$ resin device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+
+## device register &#60;application&#62;
+
+Use this command to register a device to an application.
+
+Examples:
+
+	$ resin device register MyApp
+
+### Options
+
+#### --uuid, -u &#60;uuid&#62;
+
+custom uuid
+
+## device rm &#60;uuid&#62;
+
+Use this command to remove a device from resin.io.
+
+Notice this command asks for confirmation interactively.
+You can avoid this by passing the `--yes` boolean option.
+
+Examples:
+
+	$ resin device rm 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+	$ resin device rm 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9 --yes
+
+### Options
+
+#### --yes, -y
+
+confirm non interactively
+
+## device identify &#60;uuid&#62;
+
+Use this command to identify a device.
+
+In the Raspberry Pi, the ACT led is blinked several times.
+
+Examples:
+
+	$ resin device identify 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828
+
+## device rename &#60;uuid&#62; [newName]
+
+Use this command to rename a device.
+
+If you omit the name, you'll get asked for it interactively.
+
+Examples:
+
+	$ resin device rename 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9 MyPi
+	$ resin device rename 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+
+## device init
+
+Use this command to download the OS image of a certain application and write it to an SD Card.
+
+Notice this command may ask for confirmation interactively.
+You can avoid this by passing the `--yes` boolean option.
+
+Examples:
+
+	$ resin device init
+	$ resin device init --application MyApp
+
+### Options
+
+#### --application, --a,app, --a,app &#60;application&#62;
+
+application name
+
+#### --yes, -y
+
+confirm non interactively
+
+#### --advanced, -v
+
+enable advanced configuration
+
+# Environment Variables
+
+## envs
+
+Use this command to list all environment variables for
+a particular application or device.
+
+This command lists all custom environment variables.
+If you want to see all environment variables, including private
+ones used by resin, use the verbose option.
+
+Example:
+
+	$ resin envs --application MyApp
+	$ resin envs --application MyApp --verbose
+	$ resin envs --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+
+### Options
+
+#### --application, --a,app, --a,app &#60;application&#62;
+
+application name
+
+#### --device, -d &#60;device&#62;
+
+device name
+
+#### --verbose, -v
+
+show private environment variables
+
+## env rm &#60;id&#62;
+
+Use this command to remove an environment variable from an application.
+
+Don't remove resin specific variables, as things might not work as expected.
+
+Notice this command asks for confirmation interactively.
+You can avoid this by passing the `--yes` boolean option.
+
+If you want to eliminate a device environment variable, pass the `--device` boolean option.
+
+Examples:
+
+	$ resin env rm 215
+	$ resin env rm 215 --yes
+	$ resin env rm 215 --device
+
+### Options
+
+#### --yes, -y
+
+confirm non interactively
+
+#### --device, -d
+
+device name
+
+## env add &#60;key&#62; [value]
+
+Use this command to add an enviroment variable to an application.
+
+If value is omitted, the tool will attempt to use the variable's value
+as defined in your host machine.
+
+Use the `--device` option if you want to assign the environment variable
+to a specific device.
+
+If the value is grabbed from the environment, a warning message will be printed.
+Use `--quiet` to remove it.
+
+Examples:
+
+	$ resin env add EDITOR vim --application MyApp
+	$ resin env add TERM --application MyApp
+	$ resin env add EDITOR vim --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+
+### Options
+
+#### --application, --a,app, --a,app &#60;application&#62;
+
+application name
+
+#### --device, -d &#60;device&#62;
+
+device name
+
+## env rename &#60;id&#62; &#60;value&#62;
+
+Use this command to rename an enviroment variable from an application.
+
+Pass the `--device` boolean option if you want to rename a device environment variable.
+
+Examples:
+
+	$ resin env rename 376 emacs
+	$ resin env rename 376 emacs --device
+
+### Options
+
+#### --device, -d
+
+device name
+
+# Help
+
+## help [command...]
+
+Get detailed help for an specific command.
+
+Examples:
+
+	$ resin help apps
+	$ resin help os download
+
+### Options
+
+#### --verbose, -v
+
+show additional commands
+
+# Information
+
+## version
+
+Display the Resin CLI version.
+
+# Keys
+
+## keys
+
+Use this command to list all your SSH keys.
+
+Examples:
+
+	$ resin keys
+
+## key &#60;id&#62;
+
+Use this command to show information about a single SSH key.
+
+Examples:
+
+	$ resin key 17
+
+## key rm &#60;id&#62;
+
+Use this command to remove a SSH key from resin.io.
+
+Notice this command asks for confirmation interactively.
+You can avoid this by passing the `--yes` boolean option.
+
+Examples:
+
+	$ resin key rm 17
+	$ resin key rm 17 --yes
+
+### Options
+
+#### --yes, -y
+
+confirm non interactively
+
+## key add &#60;name&#62; [path]
+
+Use this command to associate a new SSH key with your account.
+
+If `path` is omitted, the command will attempt
+to read the SSH key from stdin.
+
+Examples:
+
+	$ resin key add Main ~/.ssh/id_rsa.pub
+	$ cat ~/.ssh/id_rsa.pub | resin key add Main
+
+# Logs
+
+## logs &#60;uuid&#62;
+
+Use this command to show logs for a specific device.
+
+By default, the command prints all log messages and exit.
+
+To continuously stream output, and see new logs in real time, use the `--tail` option.
+
+Note that for now you need to provide the whole UUID for this command to work correctly.
+
+This is due to some technical limitations that we plan to address soon.
+
+Examples:
+
+	$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828
+	$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828 --tail
+
+### Options
+
+#### --tail, -t
+
+continuously stream output
+
+# Notes
+
+## note &#60;|note&#62;
+
+Use this command to set or update a device note.
+
+If note command isn't passed, the tool attempts to read from `stdin`.
+
+To view the notes, use $ resin device <uuid>.
+
+Examples:
+
+	$ resin note "My useful note" --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+	$ cat note.txt | resin note --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+
+### Options
+
+#### --device, --d,dev, --d,dev &#60;device&#62;
+
+device uuid
+
+# OS
+
+## os download &#60;type&#62;
+
+Use this command to download an unconfigured os image for a certain device type.
+
+Examples:
+
+	$ resin os download parallella -o ../foo/bar/parallella.img
+
+### Options
+
+#### --output, -o &#60;output&#62;
+
+output path
+
+## os configure &#60;image&#62; &#60;uuid&#62;
+
+Use this command to configure a previously download operating system image with a device.
+
+Examples:
+
+	$ resin os configure ../path/rpi.img 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+
+### Options
+
+#### --advanced, -v
+
+show advanced commands
+
+## os initialize &#60;image&#62;
+
+Use this command to initialize a previously configured operating system image.
+
+Examples:
+
+	$ resin os initialize ../path/rpi.img --type 'raspberry-pi'
+
+### Options
+
+#### --yes, -y
+
+confirm non interactively
+
+#### --type, -t &#60;type&#62;
+
+device type
+
+#### --drive, -d &#60;drive&#62;
+
+drive
+
+# Wizard
+
+## quickstart [name]
+
+Use this command to run a friendly wizard to get started with resin.io.
+
+The wizard will guide you through:
+
+	- Create an application.
+	- Initialise an SDCard with the resin.io operating system.
+	- Associate an existing project directory with your resin.io application.
+	- Push your project to your devices.
+
+Examples:
+
+	$ sudo resin quickstart
+	$ sudo resin quickstart MyApp
+

doc/device/identify.md

@@ -1,9 +0,0 @@
-# device identify <uuid>
-
-Use this command to identify a device.
-
-In the Raspberry Pi, the ACT led is blinked several times.
-
-Examples:
-
-	$ resin device identify 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828

doc/device/info.md

@@ -1,7 +0,0 @@
-# device <id>
-
-Use this command to show information about a single device.
-
-Examples:
-
-	$ resin device 317

doc/device/init.md

@@ -1,46 +0,0 @@
-# device init [device]
-
-Use this command to download the OS image of a certain application and write it to an SD Card.
-
-Note that this command requires admin privileges.
-
-If `device` is omitted, you will be prompted to select a device interactively.
-
-Notice this command asks for confirmation interactively.
-You can avoid this by passing the `--yes` boolean option.
-
-You can quiet the progress bar by passing the `--quiet` boolean option.
-
-You may have to unmount the device before attempting this operation.
-
-You need to configure the network type and other settings:
-
-Ethernet:
-  You can setup the device OS to use ethernet by setting the `--network` option to "ethernet".
-
-Wifi:
-  You can setup the device OS to use wifi by setting the `--network` option to "wifi".
-  If you set "network" to "wifi", you will need to specify the `--ssid` and `--key` option as well.
-
-Examples:
-
-	$ resin device init --application 91 --network ethernet
-	$ resin device init /dev/disk2 --application 91 --network wifi --ssid MyNetwork --key secret
-
-## Options
-
-### --application, --a,app, --a,app <application>
-
-application id
-
-### --network, -n <network>
-
-network type
-
-### --ssid, -s <ssid>
-
-wifi ssid, if network is wifi
-
-### --key, -k <key>
-
-wifi key, if network is wifi

doc/device/list.md

@@ -1,13 +0,0 @@
-# devices
-
-Use this command to list all devices that belong to a certain application.
-
-Examples:
-
-	$ resin devices --application 91
-
-## Options
-
-### --application, --a,app, --a,app <application>
-
-application id

doc/device/remove.md

@@ -1,17 +0,0 @@
-# device rm <id>
-
-Use this command to remove a device from resin.io.
-
-Notice this command asks for confirmation interactively.
-You can avoid this by passing the `--yes` boolean option.
-
-Examples:
-
-	$ resin device rm 317
-	$ resin device rm 317 --yes
-
-## Options
-
-### --yes, -y
-
-confirm non interactively

doc/device/rename.md

@@ -1,10 +0,0 @@
-# device rename <id> [name]
-
-Use this command to rename a device.
-
-If you omit the name, you'll get asked for it interactively.
-
-Examples:
-
-	$ resin device rename 317 MyPi
-	$ resin device rename 317

doc/device/supported.md

@@ -1,7 +0,0 @@
-# devices supported
-
-Use this command to get the list of all supported devices
-
-Examples:
-
-	$ resin devices supported

doc/drive/list.md

@@ -1,7 +0,0 @@
-# drives
-
-Use this command to list all drives that are connected to your machine.
-
-Examples:
-
-	$ resin drives

doc/environment-variables/add.md

@@ -1,22 +0,0 @@
-# env add <key> [value]
-
-Use this command to add an enviroment variable to an application.
-
-You need to pass the `--application` option.
-
-If value is omitted, the tool will attempt to use the variable's value
-as defined in your host machine.
-
-If the value is grabbed from the environment, a warning message will be printed.
-Use `--quiet` to remove it.
-
-Examples:
-
-	$ resin env add EDITOR vim -a 91
-	$ resin env add TERM -a 91
-
-## Options
-
-### --application, --a,app, --a,app <application>
-
-application id

doc/environment-variables/list.md

@@ -1,23 +0,0 @@
-# envs
-
-Use this command to list all environment variables for a particular application.
-Notice we will support per-device environment variables soon.
-
-This command lists all custom environment variables set on the devices running
-the application. If you want to see all environment variables, including private
-ones used by resin, use the verbose option.
-
-Example:
-
-	$ resin envs --application 91
-	$ resin envs --application 91 --verbose
-
-## Options
-
-### --application, --a,app, --a,app <application>
-
-application id
-
-### --verbose, -v
-
-show private environment variables

doc/environment-variables/remove.md

@@ -1,19 +0,0 @@
-# env rm <id>
-
-Use this command to remove an environment variable from an application.
-
-Don't remove resin specific variables, as things might not work as expected.
-
-Notice this command asks for confirmation interactively.
-You can avoid this by passing the `--yes` boolean option.
-
-Examples:
-
-	$ resin env rm 215
-	$ resin env rm 215 --yes
-
-## Options
-
-### --yes, -y
-
-confirm non interactively

doc/environment-variables/rename.md

@@ -1,7 +0,0 @@
-# env rename <id> <value>
-
-Use this command to rename an enviroment variable from an application.
-
-Examples:
-
-	$ resin env rename 376 emacs

doc/examples/clone.md

@@ -1,10 +0,0 @@
-# example clone <id>
-
-Use this command to clone an example application to the current directory
-
-This command outputs information about the cloning process.
-Use `--quiet` to remove that output.
-
-Example:
-
-	$ resin example clone 3

doc/examples/info.md

@@ -1,7 +0,0 @@
-# example <id>
-
-Use this command to show information of a single example application
-
-Example:
-
-	$ resin example 3

doc/examples/list.md

@@ -1,7 +0,0 @@
-# examples
-
-Use this command to list available example applications from resin.io
-
-Example:
-
-	$ resin examples

doc/help/help.md

@@ -1,8 +0,0 @@
-# help [command...]
-
-Get detailed help for an specific command.
-
-Examples:
-
-	$ resin help apps
-	$ resin help os download

doc/info/version.md

@@ -1,3 +0,0 @@
-# version
-
-Display the Resin CLI, as well as the bundled NodeJS version.

doc/keys/add.md

@@ -1,11 +0,0 @@
-# key add <name> [path]
-
-Use this command to associate a new SSH key with your account.
-
-If `path` is omitted, the command will attempt
-to read the SSH key from stdin.
-
-Examples:
-
-	$ resin key add Main ~/.ssh/id_rsa.pub
-	$ cat ~/.ssh/id_rsa.pub | resin key add Main

doc/keys/info.md

@@ -1,7 +0,0 @@
-# key <id>
-
-Use this command to show information about a single SSH key.
-
-Examples:
-
-	$ resin key 17

doc/keys/list.md

@@ -1,7 +0,0 @@
-# keys
-
-Use this command to list all your SSH keys.
-
-Examples:
-
-	$ resin keys

doc/keys/remove.md

@@ -1,17 +0,0 @@
-# key rm <id>
-
-Use this command to remove a SSH key from resin.io.
-
-Notice this command asks for confirmation interactively.
-You can avoid this by passing the `--yes` boolean option.
-
-Examples:
-
-	$ resin key rm 17
-	$ resin key rm 17 --yes
-
-## Options
-
-### --yes, -y
-
-confirm non interactively

doc/notes/set.md

@@ -1,18 +0,0 @@
-# note <|note>
-
-Use this command to set or update a device note.
-
-If note command isn't passed, the tool attempts to read from `stdin`.
-
-To view the notes, use $ resin device <id>.
-
-Examples:
-
-	$ resin note "My useful note" --device 317
-	$ cat note.txt | resin note --device 317
-
-## Options
-
-### --device, --d,dev, --d,dev <device>
-
-device id

doc/os/download.md

@@ -1,37 +0,0 @@
-# os download <id>
-
-Use this command to download the device OS configured to a specific network.
-
-Ethernet:
-	You can setup the device OS to use ethernet by setting the `--network` option to "ethernet".
-
-Wifi:
-	You can setup the device OS to use wifi by setting the `--network` option to "wifi".
-	If you set "network" to "wifi", you will need to specify the `--ssid` and `--key` option as well.
-
-By default, this command saved the downloaded image into a resin specific directory.
-You can save it to a custom location by specifying the `--output` option.
-
-Examples:
-
-	$ resin os download 91 --network ethernet
-	$ resin os download 91 --network wifi --ssid MyNetwork --key secreykey123
-	$ resin os download 91 --network ethernet --output ~/MyResinOS.zip
-
-## Options
-
-### --network, -n <network>
-
-network type
-
-### --ssid, -s <ssid>
-
-wifi ssid, if network is wifi
-
-### --key, -k <key>
-
-wifi key, if network is wifi
-
-### --output, -o <output>
-
-output file

doc/os/install.md

@@ -1,34 +0,0 @@
-# os install <image> [device]
-
-Use this command to write an operating system image to a device.
-
-Note that this command requires admin privileges.
-
-If `device` is omitted, you will be prompted to select a device interactively.
-
-Notice this command asks for confirmation interactively.
-You can avoid this by passing the `--yes` boolean option.
-
-You can quiet the progress bar by passing the `--quiet` boolean option.
-
-You may have to unmount the device before attempting this operation.
-
-See the `drives` command to get a list of all connected devices to your machine and their respective ids.
-
-In Mac OS X:
-
-	$ sudo diskutil unmountDisk /dev/xxx
-
-In GNU/Linux:
-
-	$ sudo umount /dev/xxx
-
-Examples:
-
-	$ resin os install rpi.iso /dev/disk2
-
-## Options
-
-### --yes, -y
-
-confirm non interactively

doc/plugin/install.md

@@ -1,9 +0,0 @@
-# plugin install <name>
-
-Use this command to install a resin plugin
-
-Use `--quiet` to prevent information logging.
-
-Examples:
-
-	$ resin plugin install hello

doc/plugin/list.md

@@ -1,7 +0,0 @@
-# plugins
-
-Use this command to list all the installed resin plugins.
-
-Examples:
-
-	$ resin plugins

doc/plugin/remove.md

@@ -1,17 +0,0 @@
-# plugin rm <name>
-
-Use this command to remove a resin.io plugin.
-
-Notice this command asks for confirmation interactively.
-You can avoid this by passing the `--yes` boolean option.
-
-Examples:
-
-	$ resin plugin rm hello
-	$ resin plugin rm hello --yes
-
-## Options
-
-### --yes, -y
-
-confirm non interactively

doc/plugin/update.md

@@ -1,9 +0,0 @@
-# plugin update <name>
-
-Use this command to update a resin plugin
-
-Use `--quiet` to prevent information logging.
-
-Examples:
-
-	$ resin plugin update hello

doc/preferences/preferences.md

@@ -1,10 +0,0 @@
-# preferences
-
-Use this command to open the preferences form.
-
-In the future, we will allow changing all preferences directly from the terminal.
-For now, we open your default web browser and point it to the web based preferences form.
-
-Examples:
-
-	$ resin preferences

doc/update/update.md

@@ -1,15 +0,0 @@
-# update
-
-Use this command to update the Resin CLI
-
-This command outputs information about the update process.
-Use `--quiet` to remove that output.
-
-The Resin CLI checks for updates once per day.
-
-Major updates require a manual update with this update command,
-while minor updates are applied automatically.
-
-Examples:
-
-	$ resin update

extras/capitano-doc/index.coffee

@@ -1,20 +0,0 @@
-mkdirp = require('mkdirp')
-fs = require('fs')
-path = require('path')
-capitano = require('capitano')
-markdown = require('./markdown')
-
-capitano.command
-	signature: 'markdown <file> <output>'
-	description: 'file to markdown'
-	action: (params, options, done) ->
-		mkdirp.sync(params.output)
-		action = require(params.file)
-
-		for actionName, actionCommand of action
-			output = path.join(params.output, "#{actionName}.md")
-			fs.writeFileSync(output, markdown.command(actionCommand))
-
-		return done()
-
-capitano.run(process.argv)

extras/capitano-doc/markdown.coffee

@@ -1,23 +0,0 @@
-_ = require('lodash')
-utils = require('./utils')
-
-exports.option = (option) ->
-	result = utils.parseSignature(option)
-
-exports.command = (command) ->
-	result = """
-		# #{command.signature}
-
-		#{command.help}\n
-	"""
-
-	if not _.isEmpty(command.options)
-		result += '\n## Options'
-
-		for option in command.options
-			result += """
-				\n\n### #{utils.parseSignature(option)}
-
-				#{option.description}
-			"""
-	return result

extras/capitanodoc/index.coffee

@@ -0,0 +1,46 @@
+_ = require('lodash')
+path = require('path')
+capitanodoc = require('../../capitanodoc.json')
+markdown = require('./markdown')
+
+result = {}
+result.title = capitanodoc.title
+result.introduction = capitanodoc.introduction
+result.categories = []
+
+for commandCategory in capitanodoc.categories
+	category = {}
+	category.title = commandCategory.title
+	category.commands = []
+
+	for file in commandCategory.files
+		actions = require(path.join(process.cwd(), file))
+
+		if actions.signature?
+			category.commands.push(_.omit(actions, 'action'))
+		else
+			for actionName, actionCommand of actions
+				category.commands.push(_.omit(actionCommand, 'action'))
+
+	result.categories.push(category)
+
+result.toc = _.cloneDeep(result.categories)
+result.toc = _.map result.toc, (category) ->
+	category.commands = _.map category.commands, (command) ->
+		return {
+			signature: command.signature
+			anchor: '#' + command.signature
+								.replace(/\s/g,'-')
+								.replace(/</g, '60-')
+								.replace(/>/g, '-62-')
+								.replace(/\[/g, '')
+								.replace(/\]/g, '-')
+								.replace(/--/g, '-')
+								.replace(/\.\.\./g, '')
+								.replace(/\|/g, '')
+								.toLowerCase()
+		}
+
+	return category
+
+console.log(markdown.display(result))

extras/capitanodoc/markdown.coffee

@@ -0,0 +1,66 @@
+_ = require('lodash')
+ent = require('ent')
+utils = require('./utils')
+
+exports.command = (command) ->
+	result = """
+		## #{ent.encode(command.signature)}
+
+		#{command.help}\n
+	"""
+
+	if not _.isEmpty(command.options)
+		result += '\n### Options'
+
+		for option in command.options
+			result += """
+				\n\n#### #{utils.parseSignature(option)}
+
+				#{option.description}
+			"""
+
+		result += '\n'
+
+	return result
+
+exports.category = (category) ->
+	result = """
+		# #{category.title}\n
+	"""
+
+	for command in category.commands
+		result += '\n' + exports.command(command)
+
+	return result
+
+exports.toc = (toc) ->
+	result = '''
+		# Table of contents\n
+	'''
+
+	for category in toc
+
+		result += """
+			\n- #{category.title}\n\n
+		"""
+
+		for command in category.commands
+			result += """
+				\t- [#{ent.encode(command.signature)}](#{command.anchor})\n
+			"""
+
+	return result
+
+exports.display = (doc) ->
+	result = """
+		# #{doc.title}
+
+		#{doc.introduction}
+
+		#{exports.toc(doc.toc)}
+	"""
+
+	for category in doc.categories
+		result += '\n' + exports.category(category)
+
+	return result

extras/capitanodoc/utils.coffee

@@ -1,4 +1,5 @@
 _ = require('lodash')
+ent = require('ent')
 
 exports.getOptionPrefix = (signature) ->
 	if signature.length > 1
@@ -22,4 +23,4 @@ exports.parseSignature = (option) ->
 	if option.parameter?
 		result += " <#{option.parameter}>"
 
-	return result
+	return ent.encode(result)

gulpfile.coffee

@@ -1,12 +1,9 @@
-mkdirp = require('mkdirp')
 path = require('path')
 gulp = require('gulp')
 mocha = require('gulp-mocha')
 coffee = require('gulp-coffee')
-markedMan = require('gulp-marked-man')
 coffeelint = require('gulp-coffeelint')
 shell = require('gulp-shell')
-mochaNotifierReporter = require('mocha-notifier-reporter')
 packageJSON = require('./package.json')
 
 OPTIONS =
@@ -16,32 +13,20 @@ OPTIONS =
 		coffee: [ 'lib/**/*.coffee', 'gulpfile.coffee' ]
 		app: [ 'lib/**/*.coffee', '!lib/**/*.spec.coffee' ]
 		tests: 'tests/**/*.spec.coffee'
-		json: [ 'lib/**/*.json' ]
-		man: 'man/**/*.md'
 	directories:
-		man: 'man/'
 		build: 'build/'
 
-gulp.task 'man', ->
-	gulp.src(OPTIONS.files.man)
-		.pipe(markedMan())
-		.pipe(gulp.dest(OPTIONS.directories.man))
-
 gulp.task 'test', ->
 	gulp.src(OPTIONS.files.tests, read: false)
 		.pipe(mocha({
-			reporter: mochaNotifierReporter.decorate('landing')
+			reporter: 'min'
 		}))
 
-gulp.task 'coffee', [ 'test', 'lint', 'json' ], ->
+gulp.task 'coffee', [ 'test', 'lint' ], ->
 	gulp.src(OPTIONS.files.app)
 		.pipe(coffee())
 		.pipe(gulp.dest(OPTIONS.directories.build))
 
-gulp.task 'json', ->
-	gulp.src(OPTIONS.files.json)
-		.pipe(gulp.dest(OPTIONS.directories.build))
-
 gulp.task 'lint', ->
 	gulp.src(OPTIONS.files.coffee)
 		.pipe(coffeelint({
@@ -51,9 +36,7 @@ gulp.task 'lint', ->
 
 gulp.task 'build', [
 	'coffee'
-	'man'
 ]
 
-gulp.task 'watch', [ 'test', 'lint' ], ->
-	gulp.watch([ OPTIONS.files.coffee, OPTIONS.files.json ], [ 'coffee' ])
-	gulp.watch([ OPTIONS.files.man ], [ 'man' ])
+gulp.task 'watch', [ 'test', 'lint', 'coffee' ], ->
+	gulp.watch([ OPTIONS.files.coffee ], [ 'coffee' ])

lib/actions/app.coffee

@@ -1,8 +1,8 @@
-_ = require('lodash-contrib')
-async = require('async')
 resin = require('resin-sdk')
 visuals = require('resin-cli-visuals')
 commandOptions = require('./command-options')
+events = require('resin-cli-events')
+patterns = require('../utils/patterns')
 
 exports.create =
 	signature: 'app create <name>'
@@ -31,20 +31,24 @@ exports.create =
 		}
 	]
 	permission: 'user'
+	primary: true
 	action: (params, options, done) ->
-		async.waterfall([
 
-			(callback) ->
-				return callback(null, options.type) if options.type?
+		# Validate the the application name is available
+		# before asking the device type.
+		# https://github.com/resin-io/resin-cli/issues/30
+		resin.models.application.has(params.name).then (hasApplication) ->
+			if hasApplication
+				throw new Error('You already have an application with that name!')
 
-				resin.models.device.getSupportedDeviceTypes (error, deviceTypes) ->
-					return callback(error) if error?
-					visuals.widgets.select('Select a type', deviceTypes, callback)
-
-			(type, callback) ->
-				resin.models.application.create(params.name, type, callback)
-
-		], done)
+		.then ->
+			return options.type or patterns.selectDeviceType()
+		.then (deviceType) ->
+			return resin.models.application.create(params.name, deviceType)
+		.then (application) ->
+			console.info("Application created: #{application.app_name} (#{application.device_type}, id #{application.id})")
+			events.send('application.create', application: application.id)
+		.nodeify(done)
 
 exports.list =
 	signature: 'apps'
@@ -53,64 +57,65 @@ exports.list =
 		Use this command to list all your applications.
 
 		Notice this command only shows the most important bits of information for each app.
-		If you want detailed information, use resin app <id> instead.
+		If you want detailed information, use resin app <name> instead.
 
 		Examples:
 
 			$ resin apps
 	'''
 	permission: 'user'
+	primary: true
 	action: (params, options, done) ->
-		resin.models.application.getAll (error, applications) ->
-			return done(error) if error?
-			console.log visuals.widgets.table.horizontal applications, [
+		resin.models.application.getAll().then (applications) ->
+			console.log visuals.table.horizontal applications, [
 				'id'
 				'app_name'
 				'device_type'
 				'online_devices'
 				'devices_length'
 			]
-			return done()
+		.nodeify(done)
 
 exports.info =
-	signature: 'app <id>'
+	signature: 'app <name>'
 	description: 'list a single application'
 	help: '''
 		Use this command to show detailed information for a single application.
 
 		Examples:
 
-			$ resin app 91
+			$ resin app MyApp
 	'''
 	permission: 'user'
+	primary: true
 	action: (params, options, done) ->
-		resin.models.application.get params.id, (error, application) ->
-			return done(error) if error?
-			console.log visuals.widgets.table.vertical application, [
+		resin.models.application.get(params.name).then (application) ->
+			console.log visuals.table.vertical application, [
+				"$#{application.app_name}$"
 				'id'
-				'app_name'
 				'device_type'
 				'git_repository'
 				'commit'
 			]
-			return done()
+			events.send('application.open', application: application.id)
+		.nodeify(done)
 
 exports.restart =
-	signature: 'app restart <id>'
+	signature: 'app restart <name>'
 	description: 'restart an application'
 	help: '''
 		Use this command to restart all devices that belongs to a certain application.
 
 		Examples:
 
-			$ resin app restart 91
+			$ resin app restart MyApp
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.models.application.restart(params.id, done)
+		resin.models.application.restart(params.name).nodeify(done)
 
 exports.remove =
-	signature: 'app rm <id>'
+	signature: 'app rm <name>'
 	description: 'remove an application'
 	help: '''
 		Use this command to remove a resin.io application.
@@ -120,48 +125,15 @@ exports.remove =
 
 		Examples:
 
-			$ resin app rm 91
-			$ resin app rm 91 --yes
+			$ resin app rm MyApp
+			$ resin app rm MyApp --yes
 	'''
 	options: [ commandOptions.yes ]
 	permission: 'user'
 	action: (params, options, done) ->
-		visuals.patterns.remove 'application', options.yes, (callback) ->
-			resin.models.application.remove(params.id, callback)
-		, done
-
-exports.init =
-	signature: 'init <id>'
-	description: 'init an application'
-	help: '''
-		Use this command to associate a local project to an existing resin.io application.
-
-		The application should be a git repository before issuing this command.
-		Notice this command adds a `resin` git remote to your application.
-
-		Examples:
-
-			$ cd myApp && resin init 91
-	'''
-	permission: 'user'
-	action: (params, options, done) ->
-		currentDirectory = process.cwd()
-
-		async.waterfall [
-
-			(callback) ->
-				resin.vcs.isResinProject(currentDirectory, callback)
-
-			(isResinProject, callback) ->
-				if isResinProject
-					error = new Error('Project is already a resin application.')
-					return callback(error)
-				return callback()
-
-			(callback) ->
-				resin.models.application.get(params.id, callback)
-
-			(application, callback) ->
-				resin.vcs.initProjectWithApplication(application, currentDirectory, callback)
-
-		], done
+		patterns.confirm(options.yes, 'Are you sure you want to delete the application?').then ->
+			resin.models.application.remove(params.name)
+		.tap ->
+			resin.models.application.get(params.name).then (application) ->
+				events.send('application.delete', application: application.id)
+		.nodeify(done)

lib/actions/auth.coffee

@@ -1,62 +1,65 @@
-_ = require('lodash-contrib')
-url = require('url')
-async = require('async')
+Promise = require('bluebird')
+_ = require('lodash')
 resin = require('resin-sdk')
+form = require('resin-cli-form')
 visuals = require('resin-cli-visuals')
+events = require('resin-cli-events')
+validation = require('../utils/validation')
 
 exports.login	=
 	signature: 'login'
 	description: 'login to resin.io'
 	help: '''
 		Use this command to login to your resin.io account.
-		You need to login before you can use most of the commands this tool provides.
-
-		You can pass your credentials as `--username` and `--password` options, or you can omit the
-		credentials, in which case the tool will present you with an interactive login form.
 
 		Examples:
 
-			$ resin login --username <username> --password <password>
 			$ resin login
 	'''
 	options: [
 		{
-			signature: 'username'
-			parameter: 'username'
-			description: 'user name'
-			alias: 'u'
+			signature: 'email'
+			parameter: 'email'
+			description: 'email'
+			alias: [ 'e', 'u' ]
 		}
 		{
 			signature: 'password'
 			parameter: 'password'
-			description: 'user password'
+			description: 'password'
 			alias: 'p'
 		}
 	]
+	primary: true
 	action: (params, options, done) ->
-
-		hasOptionCredentials = not _.isEmpty(options)
-
-		if hasOptionCredentials
-
-			if not options.username
-				return done(new Error('Missing username'))
-
-			if not options.password
-				return done(new Error('Missing password'))
-
-		async.waterfall [
-
-			(callback) ->
-				if hasOptionCredentials
-					return callback(null, options)
-				else
-					return visuals.widgets.login(callback)
-
-			(credentials, callback) ->
-				resin.auth.login(credentials, callback)
-
-		], done
+		form.run [
+				message: 'Email:'
+				name: 'email'
+				type: 'input'
+				validate: validation.validateEmail
+			,
+				message: 'Password:'
+				name: 'password'
+				type: 'password'
+		],
+			override: options
+		.then(resin.auth.login)
+		.then(resin.auth.twoFactor.isPassed)
+		.then (isTwoFactorAuthPassed) ->
+			return if isTwoFactorAuthPassed
+			return form.ask
+				message: 'Two factor auth challenge:'
+				name: 'code'
+				type: 'input'
+			.then(resin.auth.twoFactor.challenge)
+			.catch ->
+				resin.auth.logout().then ->
+					throw new Error('Invalid two factor authentication code')
+		.then(resin.auth.whoami)
+		.tap (username) ->
+			console.info("Successfully logged in as: #{username}")
+			events.send('user.login')
+		.nodeify(done)
 
 exports.logout =
 	signature: 'logout'
@@ -70,7 +73,9 @@ exports.logout =
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.auth.logout(done)
+		resin.auth.logout().then ->
+			events.send('user.logout')
+		.nodeify(done)
 
 exports.signup =
 	signature: 'signup'
@@ -87,66 +92,37 @@ exports.signup =
 			Username: johndoe
 			Password: ***********
 
-			$ resin signup --email me@mycompany.com --username johndoe --password ***********
-
 			$ resin whoami
 			johndoe
 	'''
-	options: [
-		{
-			signature: 'email'
-			parameter: 'email'
-			description: 'user email'
-			alias: 'e'
-		}
-		{
-			signature: 'username'
-			parameter: 'username'
-			description: 'user name'
-			alias: 'u'
-		}
-		{
-			signature: 'password'
-			parameter: 'user password'
-			description: 'user password'
-			alias: 'p'
-		}
-	]
 	action: (params, options, done) ->
+		form.run [
+			message: 'Email:'
+			name: 'email'
+			type: 'input'
+			validate: validation.validateEmail
+		,
+			message: 'Username:'
+			name: 'username'
+			type: 'input'
+		,
+			message: 'Password:'
+			name: 'password'
+			type: 'password',
+			validate: validation.validatePassword
+		]
 
-		hasOptionCredentials = not _.isEmpty(options)
-
-		if hasOptionCredentials
-
-			if not options.email?
-				return done(new Error('Missing email'))
-
-			if not options.username?
-				return done(new Error('Missing username'))
-
-			if not options.password?
-				return done(new Error('Missing password'))
-
-		async.waterfall([
-
-			(callback) ->
-				return callback(null, options) if hasOptionCredentials
-				visuals.widgets.register(callback)
-
-			(credentials, callback) ->
-				resin.auth.register credentials, (error, token) ->
-					return callback(error, credentials)
-
-			(credentials, callback) ->
-				resin.auth.login(credentials, callback)
-
-		], done)
+		.then(resin.auth.register)
+		.then(resin.auth.loginWithToken)
+		.tap ->
+			events.send('user.signup')
+		.nodeify(done)
 
 exports.whoami =
 	signature: 'whoami'
-	description: 'get current username'
+	description: 'get current username and email address'
 	help: '''
-		Use this command to find out the current logged in username.
+		Use this command to find out the current logged in username and email address.
 
 		Examples:
 
@@ -154,9 +130,13 @@ exports.whoami =
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.auth.whoami (error, username) ->
-
-			if not username?
-				return done(new Error('Username not found'))
-
-			console.log(username)
+		Promise.props
+			username: resin.auth.whoami()
+			email: resin.auth.getEmail()
+		.then (results) ->
+			console.log visuals.table.vertical results, [
+				'$account information$'
+				'username'
+				'email'
+			]
+		.nodeify(done)

lib/actions/command-options.coffee

@@ -1,15 +1,32 @@
+_ = require('lodash')
+
 exports.yes =
 	signature: 'yes'
 	description: 'confirm non interactively'
 	boolean: true
 	alias: 'y'
 
-exports.application =
+exports.optionalApplication =
 	signature: 'application'
 	parameter: 'application'
-	description: 'application id'
+	description: 'application name'
 	alias: [ 'a', 'app' ]
+
+exports.application = _.defaults
 	required: 'You have to specify an application'
+, exports.optionalApplication
+
+exports.optionalDevice =
+	signature: 'device'
+	parameter: 'device'
+	description: 'device name'
+	alias: 'd'
+
+exports.booleanDevice =
+	signature: 'device'
+	description: 'device name'
+	boolean: true
+	alias: 'd'
 
 exports.network =
 	signature: 'network'

lib/actions/device.coffee

@@ -1,27 +1,44 @@
-_ = require('lodash-contrib')
-path = require('path')
-async = require('async')
+Promise = require('bluebird')
+capitano = Promise.promisifyAll(require('capitano'))
+_ = require('lodash')
 resin = require('resin-sdk')
 visuals = require('resin-cli-visuals')
+form = require('resin-cli-form')
+events = require('resin-cli-events')
+rimraf = Promise.promisify(require('rimraf'))
+patterns = require('../utils/patterns')
+helpers = require('../utils/helpers')
+tmp = Promise.promisifyAll(require('tmp'))
+tmp.setGracefulCleanup()
+
 commandOptions = require('./command-options')
-osAction = require('./os')
 
 exports.list =
 	signature: 'devices'
 	description: 'list all devices'
 	help: '''
-		Use this command to list all devices that belong to a certain application.
+		Use this command to list all devices that belong to you.
+
+		You can filter the devices by application by using the `--application` option.
 
 		Examples:
 
-			$ resin devices --application 91
+			$ resin devices
+			$ resin devices --application MyApp
+			$ resin devices --app MyApp
+			$ resin devices -a MyApp
 	'''
-	options: [ commandOptions.application ]
+	options: [ commandOptions.optionalApplication ]
 	permission: 'user'
+	primary: true
 	action: (params, options, done) ->
-		resin.models.device.getAllByApplication options.application, (error, devices) ->
-			return done(error) if error?
-			console.log visuals.widgets.table.horizontal devices, [
+		Promise.try ->
+			if options.application?
+				return resin.models.device.getAllByApplication(options.application)
+			return resin.models.device.getAll()
+
+		.tap (devices) ->
+			console.log visuals.table.horizontal devices, [
 				'id'
 				'name'
 				'device_type'
@@ -30,26 +47,31 @@ exports.list =
 				'status'
 				'last_seen'
 			]
-
-			return done()
+		.nodeify(done)
 
 exports.info =
-	signature: 'device <id>'
+	signature: 'device <uuid>'
 	description: 'list a single device'
 	help: '''
 		Use this command to show information about a single device.
 
 		Examples:
 
-			$ resin device 317
+			$ resin device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
 	'''
 	permission: 'user'
+	primary: true
 	action: (params, options, done) ->
-		resin.models.device.get params.id, (error, device) ->
-			return done(error) if error?
-			console.log visuals.widgets.table.vertical device, [
+		resin.models.device.get(params.uuid).then (device) ->
+
+			# TODO: We should outsource this logic and probably
+			# other last_seen edge cases to either Resin CLI Visuals
+			# or have it parsed appropriately in the SDK.
+			device.last_seen ?= 'Not seen'
+
+			console.log visuals.table.vertical device, [
+				"$#{device.name}$"
 				'id'
-				'name'
 				'device_type'
 				'is_online'
 				'ip_address'
@@ -62,11 +84,39 @@ exports.info =
 				'is_web_accessible'
 				'note'
 			]
+			events.send('device.open', device: device.uuid)
+		.nodeify(done)
 
-			return done()
+exports.register =
+	signature: 'device register <application>'
+	description: 'register a device'
+	help: '''
+		Use this command to register a device to an application.
+
+		Examples:
+
+			$ resin device register MyApp
+	'''
+	permission: 'user'
+	options: [
+		signature: 'uuid'
+		description: 'custom uuid'
+		parameter: 'uuid'
+		alias: 'u'
+	]
+	action: (params, options, done) ->
+		resin.models.application.get(params.application).then (application) ->
+
+			Promise.try ->
+				return options.uuid or resin.models.device.generateUUID()
+			.then (uuid) ->
+				console.info("Registering to #{application.app_name}: #{uuid}")
+				return resin.models.device.register(application.app_name, uuid)
+		.get('uuid')
+		.nodeify(done)
 
 exports.remove =
-	signature: 'device rm <id>'
+	signature: 'device rm <uuid>'
 	description: 'remove a device'
 	help: '''
 		Use this command to remove a device from resin.io.
@@ -76,15 +126,17 @@ exports.remove =
 
 		Examples:
 
-			$ resin device rm 317
-			$ resin device rm 317 --yes
+			$ resin device rm 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+			$ resin device rm 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9 --yes
 	'''
 	options: [ commandOptions.yes ]
 	permission: 'user'
 	action: (params, options, done) ->
-		visuals.patterns.remove 'device', options.yes, (callback) ->
-			resin.models.device.remove(params.id, callback)
-		, done
+		patterns.confirm(options.yes, 'Are you sure you want to delete the device?').then ->
+			resin.models.device.remove(params.uuid)
+		.tap ->
+			events.send('device.delete', device: params.uuid)
+		.nodeify(done)
 
 exports.identify =
 	signature: 'device identify <uuid>'
@@ -100,10 +152,10 @@ exports.identify =
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.models.device.identify(params.uuid, done)
+		resin.models.device.identify(params.uuid).nodeify(done)
 
 exports.rename =
-	signature: 'device rename <id> [name]'
+	signature: 'device rename <uuid> [newName]'
 	description: 'rename a resin device'
 	help: '''
 		Use this command to rename a device.
@@ -112,99 +164,73 @@ exports.rename =
 
 		Examples:
 
-			$ resin device rename 317 MyPi
-			$ resin device rename 317
+			$ resin device rename 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9 MyPi
+			$ resin device rename 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		async.waterfall [
+		Promise.try ->
+			return params.newName if not _.isEmpty(params.newName)
 
-			(callback) ->
-				if not _.isEmpty(params.name)
-					return callback(null, params.name)
-				visuals.widgets.ask('How do you want to name this device?', callback)
+			form.ask
+				message: 'How do you want to name this device?'
+				type: 'input'
 
-			(name, callback) ->
-				resin.models.device.rename(params.id, name, callback)
-
-		], done
-
-exports.supported =
-	signature: 'devices supported'
-	description: 'list all supported devices'
-	help: '''
-		Use this command to get the list of all supported devices
-
-		Examples:
-
-			$ resin devices supported
-	'''
-	permission: 'user'
-	action: (params, options, done) ->
-		resin.models.device.getSupportedDeviceTypes (error, devices) ->
-			return done(error) if error?
-			_.each(devices, _.unary(console.log))
-			done()
+		.then(_.partial(resin.models.device.rename, params.uuid))
+		.tap ->
+			events.send('device.rename', device: params.uuid)
+		.nodeify(done)
 
 exports.init =
-	signature: 'device init [device]'
+	signature: 'device init'
 	description: 'initialise a device with resin os'
 	help: '''
 		Use this command to download the OS image of a certain application and write it to an SD Card.
 
-		Note that this command requires admin privileges.
-
-		If `device` is omitted, you will be prompted to select a device interactively.
-
-		Notice this command asks for confirmation interactively.
+		Notice this command may ask for confirmation interactively.
 		You can avoid this by passing the `--yes` boolean option.
 
-		You can quiet the progress bar by passing the `--quiet` boolean option.
-
-		You may have to unmount the device before attempting this operation.
-
-		You need to configure the network type and other settings:
-
-		Ethernet:
-		  You can setup the device OS to use ethernet by setting the `--network` option to "ethernet".
-
-		Wifi:
-		  You can setup the device OS to use wifi by setting the `--network` option to "wifi".
-		  If you set "network" to "wifi", you will need to specify the `--ssid` and `--key` option as well.
-
 		Examples:
 
-			$ resin device init --application 91 --network ethernet
-			$ resin device init /dev/disk2 --application 91 --network wifi --ssid MyNetwork --key secret
+			$ resin device init
+			$ resin device init --application MyApp
 	'''
 	options: [
-		commandOptions.application
-		commandOptions.network
-		commandOptions.wifiSsid
-		commandOptions.wifiKey
+		commandOptions.optionalApplication
+		commandOptions.yes
+		{
+			signature: 'advanced'
+			description: 'enable advanced configuration'
+			boolean: true
+			alias: 'v'
+		}
 	]
 	permission: 'user'
+	primary: true
 	action: (params, options, done) ->
+		Promise.try ->
+			return options.application if options.application?
+			return patterns.selectApplication()
+		.then(resin.models.application.get)
+		.then (application) ->
 
-		params.id = options.application
+			download = ->
+				tmp.tmpNameAsync().then (temporalPath) ->
+					capitano.runAsync("os download #{application.device_type} --output #{temporalPath}")
+				.disposer (temporalPath) ->
+					return rimraf(temporalPath)
 
-		async.waterfall([
+			Promise.using download(), (temporalPath) ->
+				capitano.runAsync("device register #{application.app_name}")
+					.then(resin.models.device.get)
+					.tap (device) ->
+						configure = "os configure #{temporalPath} #{device.uuid}"
+						configure += ' --advanced' if options.advanced
+						capitano.runAsync(configure).then ->
 
-			(callback) ->
-				return callback(null, params.device) if params.device?
-				visuals.patterns.selectDrive(callback)
+							helpers.sudo([ 'os', 'initialize', temporalPath, '--type', application.device_type ])
+			.then (device) ->
+				console.log('Done')
+				return device.uuid
 
-			(device, callback) ->
-				params.device = device
-				visuals.patterns.confirm(options.yes, "This will completely erase #{params.device}. Are you sure you want to continue?", callback)
-
-			(confirmed, callback) ->
-				return done() if not confirmed
-				options.yes = confirmed
-				osAction.download.action(params, options, callback)
-
-			(outputFile, callback) ->
-				params.image = outputFile
-				osAction.install.action(params, options, callback)
-
-		], done)
+		.nodeify(done)

lib/actions/drive.coffee

@@ -1,32 +0,0 @@
-_ = require('lodash')
-async = require('async')
-visuals = require('resin-cli-visuals')
-drivelist = require('drivelist')
-
-exports.list =
-	signature: 'drives'
-	description: 'list available drives'
-	help: '''
-		Use this command to list all drives that are connected to your machine.
-
-		Examples:
-
-			$ resin drives
-	'''
-	permission: 'user'
-	action: (params, options, done) ->
-		drivelist.list (error, drives) ->
-			return done(error) if error?
-
-			async.reject drives, drivelist.isSystem, (removableDrives) ->
-
-				if _.isEmpty(removableDrives)
-					return done(new Error('No removable devices available'))
-
-				console.log visuals.widgets.table.horizontal removableDrives, [
-					'device'
-					'description'
-					'size'
-				]
-
-				return done()

lib/actions/environment-variables.coffee

@@ -1,26 +1,31 @@
-_ = require('lodash-contrib')
+Promise = require('bluebird')
+_ = require('lodash')
 resin = require('resin-sdk')
 visuals = require('resin-cli-visuals')
+events = require('resin-cli-events')
 commandOptions = require('./command-options')
+patterns = require('../utils/patterns')
 
 exports.list =
 	signature: 'envs'
 	description: 'list all environment variables'
 	help: '''
-		Use this command to list all environment variables for a particular application.
-		Notice we will support per-device environment variables soon.
+		Use this command to list all environment variables for
+		a particular application or device.
 
-		This command lists all custom environment variables set on the devices running
-		the application. If you want to see all environment variables, including private
+		This command lists all custom environment variables.
+		If you want to see all environment variables, including private
 		ones used by resin, use the verbose option.
 
 		Example:
 
-			$ resin envs --application 91
-			$ resin envs --application 91 --verbose
+			$ resin envs --application MyApp
+			$ resin envs --application MyApp --verbose
+			$ resin envs --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
 	'''
 	options: [
-		commandOptions.application
+		commandOptions.optionalApplication
+		commandOptions.optionalDevice
 
 		{
 			signature: 'verbose'
@@ -31,19 +36,27 @@ exports.list =
 	]
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.models.environmentVariables.getAllByApplication options.application, (error, environmentVariables) ->
-			return done(error) if error?
+		Promise.try ->
+			if options.application?
+				return resin.models.environmentVariables.getAllByApplication(options.application)
+			else if options.device?
+				return resin.models.environmentVariables.device.getAll(options.device)
+			else
+				throw new Error('You must specify an application or device')
 
+		.tap (environmentVariables) ->
+			if _.isEmpty(environmentVariables)
+				throw new Error('No environment variables found')
 			if not options.verbose
-				environmentVariables = _.reject(environmentVariables, resin.models.environmentVariables.isSystemVariable)
+				isSystemVariable = resin.models.environmentVariables.isSystemVariable
+				environmentVariables = _.reject(environmentVariables, isSystemVariable)
 
-			console.log visuals.widgets.table.horizontal environmentVariables, [
+			console.log visuals.table.horizontal environmentVariables, [
 				'id'
 				'name'
 				'value'
 			]
-
-			return done()
+		.nodeify(done)
 
 exports.remove =
 	signature: 'env rm <id>'
@@ -56,17 +69,28 @@ exports.remove =
 		Notice this command asks for confirmation interactively.
 		You can avoid this by passing the `--yes` boolean option.
 
+		If you want to eliminate a device environment variable, pass the `--device` boolean option.
+
 		Examples:
 
 			$ resin env rm 215
 			$ resin env rm 215 --yes
+			$ resin env rm 215 --device
 	'''
-	options: [ commandOptions.yes ]
+	options: [
+		commandOptions.yes
+		commandOptions.booleanDevice
+	]
 	permission: 'user'
 	action: (params, options, done) ->
-		visuals.patterns.remove 'environment variable', options.yes, (callback) ->
-			resin.models.environmentVariables.remove(params.id, callback)
-		, done
+		patterns.confirm(options.yes, 'Are you sure you want to delete the environment variable?').then ->
+			if options.device
+				resin.models.environmentVariables.device.remove(params.id)
+				events.send('deviceEnvironmentVariable.delete', id: params.id)
+			else
+				resin.models.environmentVariables.remove(params.id)
+				events.send('environmentVariable.delete', id: params.id)
+		.nodeify(done)
 
 exports.add =
 	signature: 'env add <key> [value]'
@@ -74,31 +98,46 @@ exports.add =
 	help: '''
 		Use this command to add an enviroment variable to an application.
 
-		You need to pass the `--application` option.
-
 		If value is omitted, the tool will attempt to use the variable's value
 		as defined in your host machine.
 
+		Use the `--device` option if you want to assign the environment variable
+		to a specific device.
+
 		If the value is grabbed from the environment, a warning message will be printed.
 		Use `--quiet` to remove it.
 
 		Examples:
 
-			$ resin env add EDITOR vim -a 91
-			$ resin env add TERM -a 91
+			$ resin env add EDITOR vim --application MyApp
+			$ resin env add TERM --application MyApp
+			$ resin env add EDITOR vim --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
 	'''
-	options: [ commandOptions.application ]
+	options: [
+		commandOptions.optionalApplication
+		commandOptions.optionalDevice
+	]
 	permission: 'user'
 	action: (params, options, done) ->
-		if not params.value?
-			params.value = process.env[params.key]
-
+		Promise.try ->
 			if not params.value?
-				return done(new Error("Environment value not found for key: #{params.key}"))
-			else
-				console.info("Warning: using #{params.key}=#{params.value} from host environment")
+				params.value = process.env[params.key]
 
-		resin.models.environmentVariables.create(options.application, params.key, params.value, done)
+				if not params.value?
+					throw new Error("Environment value not found for key: #{params.key}")
+				else
+					console.info("Warning: using #{params.key}=#{params.value} from host environment")
+
+			if options.application?
+				resin.models.environmentVariables.create(options.application, params.key, params.value).then ->
+					resin.models.application.get(options.application).then (application) ->
+						events.send('environmentVariable.create', application: application.id)
+			else if options.device?
+				resin.models.environmentVariables.device.create(options.device, params.key, params.value).then ->
+					events.send('deviceEnvironmentVariable.create', device: options.device)
+			else
+				throw new Error('You must specify an application or device')
+		.nodeify(done)
 
 exports.rename =
 	signature: 'env rename <id> <value>'
@@ -106,10 +145,21 @@ exports.rename =
 	help: '''
 		Use this command to rename an enviroment variable from an application.
 
+		Pass the `--device` boolean option if you want to rename a device environment variable.
+
 		Examples:
 
 			$ resin env rename 376 emacs
+			$ resin env rename 376 emacs --device
 	'''
 	permission: 'user'
+	options: [ commandOptions.booleanDevice ]
 	action: (params, options, done) ->
-		resin.models.environmentVariables.update(params.id, params.value, done)
+		Promise.try ->
+			if options.device
+				resin.models.environmentVariables.device.update(params.id, params.value).then ->
+					events.send('deviceEnvironmentVariable.edit', id: params.id)
+			else
+				resin.models.environmentVariables.update(params.id, params.value).then ->
+					events.send('environmentVariable.edit', id: params.id)
+		.nodeify(done)

lib/actions/examples.coffee

@@ -1,102 +0,0 @@
-async = require('async')
-fs = require('fs')
-path = require('path')
-_ = require('lodash')
-gitCli = require('git-cli')
-resin = require('resin-sdk')
-visuals = require('resin-cli-visuals')
-examplesData = require('../data/examples.json')
-
-exports.list =
-	signature: 'examples'
-	description: 'list all example applications'
-	help: '''
-		Use this command to list available example applications from resin.io
-
-		Example:
-
-			$ resin examples
-	'''
-	permission: 'user'
-	action: ->
-		examplesData = _.map examplesData, (example, index) ->
-			example.id = index + 1
-			return example
-
-		examplesData = _.map examplesData, (example) ->
-			example.author ?= 'Unknown'
-			return example
-
-		console.log visuals.widgets.table.horizontal examplesData, [
-			'id'
-			'display_name'
-			'repository'
-			'author'
-		]
-
-exports.info =
-	signature: 'example <id>'
-	description: 'list a single example application'
-	help: '''
-		Use this command to show information of a single example application
-
-		Example:
-
-			$ resin example 3
-	'''
-	permission: 'user'
-	action: (params, options, done) ->
-		id = params.id - 1
-		example = examplesData[id]
-
-		if not example?
-			return done(new Error("Unknown example: #{id}"))
-
-		example.id = id
-		example.author ?= 'Unknown'
-
-		console.log visuals.widgets.table.vertical example, [
-			'id'
-			'display_name'
-			'description'
-			'author'
-			'repository'
-		]
-
-		return done()
-
-exports.clone =
-	signature: 'example clone <id>'
-	description: 'clone an example application'
-	help: '''
-		Use this command to clone an example application to the current directory
-
-		This command outputs information about the cloning process.
-		Use `--quiet` to remove that output.
-
-		Example:
-
-			$ resin example clone 3
-	'''
-	permission: 'user'
-	action: (params, options, done) ->
-		example = examplesData[params.id - 1]
-
-		if not example?
-			return done(new Error("Unknown example: #{id}"))
-
-		async.waterfall [
-
-			(callback) ->
-				exampleAbsolutePath = path.join(process.cwd(), example.name)
-
-				fs.exists exampleAbsolutePath, (exists) ->
-					return callback() if not exists
-					error = new Error("Directory exists: #{example.name}")
-					return callback(error)
-
-			(callback) ->
-				console.info("Cloning #{example.display_name} to #{example.name}")
-				gitCli.Repository.clone(example.repository, example.name, callback)
-
-		], done

lib/actions/help.coffee

@@ -1,93 +1,73 @@
 _ = require('lodash')
 _.str = require('underscore.string')
-resin = require('resin-sdk')
 capitano = require('capitano')
+columnify = require('columnify')
 
-# TODO: Refactor this terrible mess
+parse = (object) ->
+	return _.object _.map object, (item) ->
 
-PADDING_INITIAL = '    '
-PADDING_MIDDLE = '\t'
+		# Hacky way to determine if an object is
+		# a function or a command
+		if item.alias?
+			signature = item.toString()
+		else
+			signature = item.signature.toString()
 
-getFieldMaxLength = (array, field) ->
-	return _.max _.map array, (item) ->
-		return item[field].toString().length
+		return [
+			signature
+			item.description
+		]
 
-buildHelpString = (firstColumn, secondColumn) ->
-	result = "#{PADDING_INITIAL}#{firstColumn}"
-	result += "#{PADDING_MIDDLE}#{secondColumn}"
-	return result
+indent = (text) ->
+	text = _.map _.str.lines(text), (line) ->
+		return '    ' + line
+	return text.join('\n')
 
-addOptionPrefix = (option) ->
-	return if option.length <= 0
-	if option.length is 1
-		return "-#{option}"
-	else
-		return "--#{option}"
+print = (data) ->
+	console.log indent columnify data,
+		showHeaders: false
+		minWidth: 35
 
-addAlias = (alias) ->
-	return ", #{addOptionPrefix(alias)}"
-
-buildOptionSignatureHelp = (option) ->
-	result = addOptionPrefix(option.signature.toString())
-
-	if _.isString(option.alias)
-		result += addAlias(option.alias)
-	else if _.isArray(option.alias)
-		for alias in option.alias
-			result += addAlias(alias)
-
-	if option.parameter?
-		result += " <#{option.parameter}>"
-
-	return result
-
-getCommandHelp = (command) ->
-	maxSignatureLength = getFieldMaxLength(capitano.state.commands, 'signature')
-	commandSignature = _.str.rpad(command.signature.toString(), maxSignatureLength, ' ')
-	return buildHelpString(commandSignature, command.description)
-
-getOptionsParsedSignatures = (optionsHelp) ->
-	maxLength = _.max _.map optionsHelp, (signature) ->
-		return signature.length
-
-	return _.map optionsHelp, (signature) ->
-		return _.str.rpad(signature, maxLength, ' ')
-
-getOptionHelp = (option, maxLength) ->
-	result = PADDING_INITIAL
-	result += _.str.rpad(option.signature, maxLength, ' ')
-	result += PADDING_MIDDLE
-	result += option.description
-	return result
-
-general = ->
+general = (params, options, done) ->
 	console.log('Usage: resin [COMMAND] [OPTIONS]\n')
-	console.log('Commands:\n')
+	console.log('Primary commands:\n')
 
-	for command in capitano.state.commands
-		continue if command.isWildcard()
-		console.log(getCommandHelp(command))
+	# We do not want the wildcard command
+	# to be printed in the help screen.
+	commands = _.reject capitano.state.commands, (command) ->
+		return command.isWildcard()
 
-	console.log('\nGlobal Options:\n')
+	groupedCommands = _.groupBy commands, (command) ->
+		if command.plugin
+			return 'plugins'
+		else if command.primary
+			return 'primary'
+		return 'secondary'
 
-	options = _.map capitano.state.globalOptions, (option) ->
-		option.signature = buildOptionSignatureHelp(option)
-		return option
+	print(parse(groupedCommands.primary))
 
-	optionSignatureMaxLength = _.max _.map options, (option) ->
-		return option.signature.length
+	if options.verbose
+		if not _.isEmpty(groupedCommands.plugins)
+			console.log('\nInstalled plugins:\n')
+			print(parse(groupedCommands.plugins))
 
-	for option in options
-		console.log(getOptionHelp(option, optionSignatureMaxLength))
+		console.log('\nAdditional commands:\n')
+		print(parse(groupedCommands.secondary))
+	else
+		console.log('\nRun `resin help --verbose` to list additional commands')
 
-	console.log()
+	if not _.isEmpty(capitano.state.globalOptions)
+		console.log('\nGlobal Options:\n')
+		print(parse(capitano.state.globalOptions))
+
+	return done()
 
 command = (params, options, done) ->
 	capitano.state.getMatchCommand params.command, (error, command) ->
 		return done(error) if error?
 
 		if not command? or command.isWildcard()
-			return capitano.defaults.actions.commandNotFound(params.command)
+			return done(new Error("Command not found: #{params.command}"))
 
 		console.log("Usage: #{command.signature}")
 
@@ -98,18 +78,7 @@ command = (params, options, done) ->
 
 		if not _.isEmpty(command.options)
 			console.log('\nOptions:\n')
-
-			options = _.map command.options, (option) ->
-				option.signature = buildOptionSignatureHelp(option)
-				return option
-
-			optionSignatureMaxLength = _.max _.map options, (option) ->
-				return option.signature.toString().length
-
-			for option in options
-				console.log(getOptionHelp(option, optionSignatureMaxLength))
-
-			console.log()
+			print(parse(command.options))
 
 		return done()
 
@@ -124,6 +93,13 @@ exports.help =
 			$ resin help apps
 			$ resin help os download
 	'''
+	primary: true
+	options: [
+		signature: 'verbose'
+		description: 'show additional commands'
+		boolean: true
+		alias: 'v'
+	]
 	action: (params, options, done) ->
 		if params.command?
 			command(params, options, done)

lib/actions/index.coffee

@@ -1,16 +1,12 @@
 module.exports =
+	wizard: require('./wizard')
 	app: require('./app')
 	info: require('./info')
 	auth: require('./auth')
-	drive: require('./drive')
 	device: require('./device')
 	env: require('./environment-variables')
 	keys: require('./keys')
 	logs: require('./logs')
 	notes: require('./notes')
-	preferences: require('./preferences')
-	os: require('./os')
 	help: require('./help')
-	examples: require('./examples')
-	plugin: require('./plugin')
-	update: require('./update')
+	os: require('./os')

lib/actions/info.coffee

@@ -4,8 +4,8 @@ exports.version =
 	signature: 'version'
 	description: 'output the version number'
 	help: '''
-		Display the Resin CLI, as well as the bundled NodeJS version.
+		Display the Resin CLI version.
 	'''
-	action: ->
-		console.log("#{packageJSON.name}: #{packageJSON.version}")
-		console.log("node: #{process.version}")
+	action: (params, options, done) ->
+		console.log(packageJSON.version)
+		return done()

lib/actions/keys.coffee

@@ -1,11 +1,12 @@
+Promise = require('bluebird')
+fs = Promise.promisifyAll(require('fs'))
 _ = require('lodash')
-_.str = require('underscore.string')
-async = require('async')
-fs = require('fs')
 resin = require('resin-sdk')
 capitano = require('capitano')
 visuals = require('resin-cli-visuals')
+events = require('resin-cli-events')
 commandOptions = require('./command-options')
+patterns = require('../utils/patterns')
 
 exports.list =
 	signature: 'keys'
@@ -19,10 +20,12 @@ exports.list =
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.models.key.getAll (error, keys) ->
-			return done(error) if error?
-			console.log visuals.widgets.table.horizontal keys, [ 'id', 'title' ]
-			return done()
+		resin.models.key.getAll().then (keys) ->
+			console.log visuals.table.horizontal keys, [
+				'id'
+				'title'
+			]
+		.nodeify(done)
 
 exports.info =
 	signature: 'key <id>'
@@ -36,14 +39,17 @@ exports.info =
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.models.key.get params.id, (error, key) ->
-			return done(error) if error?
+		resin.models.key.get(params.id).then (key) ->
+			console.log visuals.table.vertical key, [
+				'id'
+				'title'
+			]
 
-			sshKeyWidth = resin.settings.get('sshKeyWidth')
-			key.public_key = '\n' + visuals.helpers.chop(key.public_key, sshKeyWidth)
-
-			console.log(visuals.widgets.table.vertical(key, [ 'id', 'title', 'public_key' ]))
-			return done()
+			# Since the public key string is long, it might
+			# wrap to lines below, causing the table layout to break.
+			# See https://github.com/resin-io/resin-cli/issues/151
+			console.log('\n' + key.public_key)
+		.nodeify(done)
 
 exports.remove =
 	signature: 'key rm <id>'
@@ -62,9 +68,11 @@ exports.remove =
 	options: [ commandOptions.yes ]
 	permission: 'user'
 	action: (params, options, done) ->
-		visuals.patterns.remove 'key', options.yes, (callback) ->
-			resin.models.key.remove(params.id, callback)
-		, done
+		patterns.confirm(options.yes, 'Are you sure you want to delete the key?').then ->
+			resin.models.key.remove(params.id)
+		.tap ->
+			events.send('publicKey.delete', id: params.id)
+		.nodeify(done)
 
 exports.add =
 	signature: 'key add <name> [path]'
@@ -82,16 +90,14 @@ exports.add =
 	'''
 	permission: 'user'
 	action: (params, options, done) ->
-		async.waterfall [
+		Promise.try ->
+			return fs.readFileAsync(params.path, encoding: 'utf8') if params.path?
 
-			(callback) ->
-				if params.path?
-					fs.readFile(params.path, encoding: 'utf8', callback)
-				else
-					capitano.utils.getStdin (data) ->
-						return callback(null, data)
+			Promise.fromNode (callback) ->
+				capitano.utils.getStdin (data) ->
+					return callback(null, data)
 
-			(key, callback) ->
-				resin.models.key.create(params.name, key, callback)
-
-		], done
+		.then(_.partial(resin.models.key.create, params.name))
+		.tap ->
+			events.send('publicKey.create')
+		.nodeify(done)

lib/actions/logs.coffee

@@ -1,9 +1,7 @@
 _ = require('lodash')
 resin = require('resin-sdk')
 
-LOGS_HISTORY_COUNT = 200
-
-exports.logs =
+module.exports =
 	signature: 'logs <uuid>'
 	description: 'show device logs'
 	help: '''
@@ -11,29 +9,18 @@ exports.logs =
 
 		By default, the command prints all log messages and exit.
 
-		To limit the output to the n last lines, use the `--num` option along with a number.
-		This is similar to doing `resin logs <uuid> | tail -n X`.
-
 		To continuously stream output, and see new logs in real time, use the `--tail` option.
 
-		Note that for now you need to provide the whole UUID for this command to work correctly,
-		and the tool won't notice if you're using an invalid UUID.
+		Note that for now you need to provide the whole UUID for this command to work correctly.
 
 		This is due to some technical limitations that we plan to address soon.
 
 		Examples:
 
 			$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828
-			$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828 --num 20
 			$ resin logs 23c73a12e3527df55c60b9ce647640c1b7da1b32d71e6a39849ac0f00db828 --tail
 	'''
 	options: [
-		{
-			signature: 'num'
-			parameter: 'num'
-			description: 'number of lines to display'
-			alias: 'n'
-		}
 		{
 			signature: 'tail'
 			description: 'continuously stream output'
@@ -42,15 +29,22 @@ exports.logs =
 		}
 	]
 	permission: 'user'
+	primary: true
 	action: (params, options, done) ->
-		resin.logs.subscribe params.uuid, {
-			history: options.num or LOGS_HISTORY_COUNT
-			tail: options.tail
-		}, (error, message) ->
-			return done(error) if error?
-			if _.isArray(message)
-				_.each message, (line) ->
-					console.log(line)
-			else
-				console.log(message)
-			return done()
+		promise = resin.logs.history(params.uuid).each (line) ->
+			console.log(line.message)
+
+		if not options.tail
+
+			# PubNub keeps the process alive after a history query.
+			# Until this is fixed, we force the process to exit.
+			# This of course prevents this command to be used programatically
+			return promise.catch(done).finally ->
+				process.exit(0)
+
+		promise.then ->
+			resin.logs.subscribe(params.uuid).then (logs) ->
+				logs.on 'line', (line) ->
+					console.log(line.message)
+				logs.on('error', done)
+		.catch(done)

lib/actions/notes.coffee

@@ -1,4 +1,5 @@
-async = require('async')
+Promise = require('bluebird')
+_ = require('lodash')
 resin = require('resin-sdk')
 
 exports.set =
@@ -9,20 +10,25 @@ exports.set =
 
 		If note command isn't passed, the tool attempts to read from `stdin`.
 
-		To view the notes, use $ resin device <id>.
+		To view the notes, use $ resin device <uuid>.
 
 		Examples:
 
-			$ resin note "My useful note" --device 317
-			$ cat note.txt | resin note --device 317
+			$ resin note "My useful note" --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
+			$ cat note.txt | resin note --device 7cf02a62a3a84440b1bb5579a3d57469148943278630b17e7fc6c4f7b465c9
 	'''
 	options: [
 		signature: 'device'
 		parameter: 'device'
-		description: 'device id'
+		description: 'device uuid'
 		alias: [ 'd', 'dev' ]
 		required: 'You have to specify a device'
 	]
 	permission: 'user'
 	action: (params, options, done) ->
-		resin.models.device.note(options.device, params.note, done)
+		Promise.try ->
+			if _.isEmpty(params.note)
+				throw new Error('Missing note content')
+
+			resin.models.device.note(options.device, params.note)
+		.nodeify(done)