Auto-merge for PR #647 via VersionBot

Add a --dont-check-device-type option for `resin preload`

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.6.0 - 2017-08-28
+
+* Add a --dont-check-device-type option for `resin preload` #647 [Alexis Svinartchouk]
+
 ## v6.5.3 - 2017-08-24
 
 * Remove resin-preload build filtering workaround. #645 [Alexis Svinartchouk]

build/actions/preload.js

@@ -151,6 +151,10 @@ module.exports = {
       signature: 'dont-detect-flasher-type-images',
       boolean: true,
       description: 'Disables the flasher type images detection: treats all images as non flasher types'
+    }, {
+      signature: 'dont-check-device-type',
+      boolean: true,
+      description: 'Disables check for matching device types in image and application'
     }
   ]),
   action: function(params, options, done) {
@@ -186,6 +190,9 @@ module.exports = {
         slug = arg.slug, builds = arg.builds;
         imageInfoSpinner.stop();
         return Promise["try"](function() {
+          if (options['dont-check-device-type'] && !options.appId) {
+            expectedError('You need to specify an app id if you disable the device type check.');
+          }
           if (options.appId) {
             return preload.getApplication(resin, options.appId)["catch"](errors.ResinApplicationNotFound, expectedError);
           }

lib/actions/preload.coffee

@@ -142,6 +142,11 @@ module.exports =
 			boolean: true
 			description: 'Disables the flasher type images detection: treats all images as non flasher types'
 		}
+		{
+			signature: 'dont-check-device-type'
+			boolean: true
+			description: 'Disables check for matching device types in image and application'
+		}
 	]
 	action: (params, options, done) ->
 		_ = require('lodash')
@@ -189,6 +194,8 @@ module.exports =
 				imageInfoSpinner.stop()
 				# Use the appId given as --app or show an interactive app selection menu
 				Promise.try ->
+					if options['dont-check-device-type'] and not options.appId
+						expectedError('You need to specify an app id if you disable the device type check.')
 					if options.appId
 						return preload.getApplication(resin, options.appId)
 						.catch(errors.ResinApplicationNotFound, expectedError)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "resin-cli",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "The official resin.io CLI tool",
   "main": "./build/actions/index.js",
   "homepage": "https://github.com/resin-io/resin-cli",