From d2b0772673087c3628a1c03650232e4c91129790 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <juanchiviotti@gmail.com>
Date: Thu, 8 Jan 2015 12:11:10 -0300
Subject: [PATCH] Remove duplication by relying on Capitano's new required
 option feature

---
 lib/actions/device.coffee                | 3 ---
 lib/actions/environment-variables.coffee | 6 ------
 lib/actions/os.coffee                    | 1 -
 lib/app.coffee                           | 1 +
 package.json                             | 2 +-
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/lib/actions/device.coffee b/lib/actions/device.coffee
index 345dbb94..8116e1d4 100644
--- a/lib/actions/device.coffee
+++ b/lib/actions/device.coffee
@@ -7,9 +7,6 @@ errors = require('../errors/errors')
 permissions = require('../permissions/permissions')
 
 exports.list = permissions.user (params, options) ->
-	if not options.application?
-		errors.handle(new Error('You have to specify an application'))
-
 	resin.models.device.getAllByApplication options.application, (error, devices) ->
 		errors.handle(error) if error?
 
diff --git a/lib/actions/environment-variables.coffee b/lib/actions/environment-variables.coffee
index ab7927cd..8eda421e 100644
--- a/lib/actions/environment-variables.coffee
+++ b/lib/actions/environment-variables.coffee
@@ -11,9 +11,6 @@ isSystemVariable = (environmentVariable) ->
 	SYSTEM_VAR_REGEX.test(environmentVariable.name)
 
 exports.list = permissions.user (params, options) ->
-	if not options.application?
-		errors.handle(new Error('You have to specify an application'))
-
 	resin.models.environmentVariables.getAllByApplication options.application, (error, environmentVariables) ->
 		errors.handle(error) if error?
 
@@ -28,9 +25,6 @@ exports.remove = permissions.user (params, options) ->
 	, errors.handle
 
 exports.add = permissions.user (params, options) ->
-	if not options.application?
-		errors.handle(new Error('You have to specify an application'))
-
 	if not params.value?
 		params.value = process.env[params.key]
 
diff --git a/lib/actions/os.coffee b/lib/actions/os.coffee
index b46a9391..bb87d776 100644
--- a/lib/actions/os.coffee
+++ b/lib/actions/os.coffee
@@ -4,7 +4,6 @@ path = require('path')
 mkdirp = require('mkdirp')
 ProgressBar = require('progress')
 resin = require('resin-sdk')
-connection = require('../connection/connection')
 log = require('../log/log')
 permissions = require('../permissions/permissions')
 errors = require('../errors/errors')
diff --git a/lib/app.coffee b/lib/app.coffee
index 9a69191d..531c9753 100644
--- a/lib/app.coffee
+++ b/lib/app.coffee
@@ -58,6 +58,7 @@ applicationOption =
 	parameter: 'application'
 	description: 'application id'
 	alias: [ 'a', 'app' ]
+	required: 'You have to specify an application'
 
 deviceOption =
 	signature: 'device'
diff --git a/package.json b/package.json
index b44c3cc8..75b7f31d 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "async": "~0.9.0",
-    "capitano": "~1.0.4",
+    "capitano": "~1.1.0",
     "cliff": "~0.1.9",
     "coffee-script": "~1.8.0",
     "conf.js": "^0.1.1",