Make sure everything uses the same shared deviceApiKey option

build/actions/command-options.js

@@ -44,6 +44,13 @@ exports.optionalDevice = {
   alias: 'd'
 };
 
+exports.optionalDeviceApiKey = {
+  signature: 'deviceApiKey',
+  description: 'custom device key - note that this is only supported on ResinOS 2.0.3+',
+  parameter: 'device-api-key',
+  alias: 'k'
+};
+
 exports.booleanDevice = {
   signature: 'device',
   description: 'device',

build/actions/config.js

@@ -196,12 +196,7 @@ exports.generate = {
   description: 'generate a config.json file',
   help: 'Use this command to generate a config.json for a device or application.\n\nThis is interactive by default, but you can do this automatically without interactivity\nby specifying an option for each question on the command line, if you know the questions\nthat will be asked for the relevant device type.\n\nExamples:\n\n	$ resin config generate --device 7cf02a6\n	$ resin config generate --device 7cf02a6 --device-api-key <existingDeviceKey>\n	$ resin config generate --device 7cf02a6 --output config.json\n	$ resin config generate --app MyApp\n	$ resin config generate --app MyApp --output config.json\n	$ resin config generate --app MyApp --network wifi --wifiSsid mySsid --wifiKey abcdefgh --appUpdatePollInterval 1',
   options: [
-    commandOptions.optionalApplication, commandOptions.optionalDevice, {
+    commandOptions.optionalApplication, commandOptions.optionalDevice, commandOptions.optionalDeviceApiKey, {
-      signature: 'deviceApiKey',
-      description: 'custom device key - note that this is only supported on ResinOS 2.0.3+',
-      parameter: 'device-api-key',
-      alias: 'k'
-    }, {
       signature: 'output',
       description: 'output',
       parameter: 'output',

build/actions/device.js

@@ -92,12 +92,7 @@ exports.register = {
       description: 'custom uuid',
       parameter: 'uuid',
       alias: 'u'
-    }, {
+    }, commandOptions.optionalDeviceApiKey
-      signature: 'deviceApiKey',
-      description: 'custom device key',
-      parameter: 'device-api-key',
-      alias: 'k'
-    }
   ],
   action: function(params, options, done) {
     var Promise, ref, ref1, resin;

doc/cli.markdown

@@ -350,7 +350,7 @@ custom uuid
 
 #### --deviceApiKey, -k <device-api-key>
 
-custom device key
+custom device key - note that this is only supported on ResinOS 2.0.3+
 
 ## device rm <uuid>
 

lib/actions/command-options.coffee

@@ -38,6 +38,12 @@ exports.optionalDevice =
 	description: 'device uuid'
 	alias: 'd'
 
+exports.optionalDeviceApiKey =
+	signature: 'deviceApiKey'
+	description: 'custom device key - note that this is only supported on ResinOS 2.0.3+'
+	parameter: 'device-api-key'
+	alias: 'k'
+
 exports.booleanDevice =
 	signature: 'device'
 	description: 'device'

lib/actions/config.coffee

@@ -237,12 +237,7 @@ exports.generate =
 	options: [
 		commandOptions.optionalApplication
 		commandOptions.optionalDevice
-		{
+		commandOptions.optionalDeviceApiKey
-			signature: 'deviceApiKey'
-			description: 'custom device key - note that this is only supported on ResinOS 2.0.3+'
-			parameter: 'device-api-key'
-			alias: 'k'
-		}
 		{
 			signature: 'output'
 			description: 'output'

lib/actions/device.coffee

@@ -147,12 +147,7 @@ exports.register =
 			parameter: 'uuid'
 			alias: 'u'
 		}
-		{
+		commandOptions.optionalDeviceApiKey
-			signature: 'deviceApiKey'
-			description: 'custom device key'
-			parameter: 'device-api-key'
-			alias: 'k'
-		}
 	]
 	action: (params, options, done) ->
 		Promise = require('bluebird')