Merge pull request #59 from electricimp/develop

Develop

Author: betzrhodes

Diff for: ProductionGuide.md

@@ -1,6 +1,6 @@
 # impt Production Guide #
 
-**NOTE:** The contents of this guide have **NOT** been updated with the release of v2.5.0 (support for DUT device groups), and so some of the contents may be out of date.
+**NOTE:** The contents of this guide have **NOT** been updated with the release of v2.5.0 and above (support for DUT device groups), and so some of the contents may be out of date.
 
 This additional guide is intended for those customers who use *impt* with [production processes](https://developer.electricimp.com/manufacturing). You may use scripts on top of *impt* commands to automate some of the operations.
 

Diff for: README.md

@@ -46,7 +46,7 @@ Call `impt --version` or `impt -v` to display the version of the installed *impt
 
 ```bash
 > impt --version
-2.5.0
+2.5.1
 ```
 
 ## Proxy Setup ##
@@ -314,7 +314,7 @@ Response body: {
   }
 }
 Product "TestProduct" is created successfully.
-Product: 
+Product:
   id:   4e264cef-3316-cdfa-7f39-7a5d458994b3
   name: TestProduct
 IMPT COMMAND SUCCEEDS
@@ -365,7 +365,7 @@ The Command Execution Context rules (how *impt* determines authentication and ot
 impt auth login --lk <login_key>
 ```
 
-or by an account identifier: 
+or by an account identifier:
 
 ```bash
 impt auth login --user <user_id> --pwd <password>
@@ -412,13 +412,13 @@ The `IMPT_LOGINKEY`, `IMPT_USER`, `IMPT_PASSWORD`, `IMPT_ENDPOINT` variables may
 - You may have as many different [local auth files](./CommandsManual.md#local-auth-file) as you want and run *impt* commands with different authentication information in parallel (eg. for different projects/products) by running them from different processes (eg. consoles). But you should note that a [local auth file](./CommandsManual.md#local-auth-file) affects commands called from the directory where the file is located only, not from sub-directories.
 
 - If you want to run *impt* commands in parallel in different processes (eg. consoles) with different authentication information and call them from any directory, you can utilize the [environment variables](./CommandsManual.md#auth-environment-variables):
- 
+
     - Option 1 &mdash; Create the required number of [auth files](./CommandsManual.md#auth-files) with different authentication information; in every process specify its own path to the required auth file using the `IMPT_AUTH_FILE_PATH` environment variable.
 
     - Option 2 &mdash; In every process specify its own required authentication information using the `IMPT_LOGINKEY`, `IMPT_USER`, `IMPT_PASSWORD` and `IMPT_ENDPOINT` environment variables.
 
 - If you do not want to have the user credentials visible in the console (shell) history, call the [login command](./CommandsManual.md#auth-login) without specifying the credentials; *impt* will prompt to enter them.
-  
+
 - If you do not want to store any authentication information in files, use the `IMPT_LOGINKEY`, `IMPT_USER`, `IMPT_PASSWORD` and `IMPT_ENDPOINT` environment variables for authentication.
 
 - At any time and in any directory you can get the execution context currently applicable to this directory and the login status. Call the [`impt auth info`](./CommandsManual.md#auth-info) command from the required directory. The returned information includes a type of the authentication applicable to the current directory, access token status, account ID and other details.
@@ -440,7 +440,7 @@ Choose authentication method:
  (2) Login Key
 Enter 1 or 2: 1
 Enter username or email address: username
-Enter password: 
+Enter password:
 Global login is successful.
 IMPT COMMAND SUCCEEDS
 ```
@@ -527,7 +527,7 @@ If you want to use this feature, please read the [Commands Manual](./CommandsMan
 
 When it is hard to uniquely specify an entity without knowing the entity ID, use [entity listing](#entity-listing-and-ownership) commands to view the entities basing on some attributes, choose the required entity and use its entity ID in the required command.
 
-For some impCentral entities, such as Products and Device Groups, *impt* provides the ability, when using hierarchical identifiers, to identify them solely by their name. This is particularly helpful when you are developing scripts: you can pass the name of an entity and then call all manipulation commands with that entity (create, update, delete, etc.) without first obtaining the ID of the entity. The format and details of every concrete hierarchical identifier are described in the [Commands Manual](./CommandsManual.md#entity-identification). 
+For some impCentral entities, such as Products and Device Groups, *impt* provides the ability, when using hierarchical identifiers, to identify them solely by their name. This is particularly helpful when you are developing scripts: you can pass the name of an entity and then call all manipulation commands with that entity (create, update, delete, etc.) without first obtaining the ID of the entity. The format and details of every concrete hierarchical identifier are described in the [Commands Manual](./CommandsManual.md#entity-identification).
 
 ##### Example 1: An entity is found successfully**
 

Diff for: lib/util/ImpCentralApiHelper.js

@@ -480,6 +480,11 @@ class ImpCentralApiHelper {
                 stateChangeHandler,
                 errorHandler,
                 LogStreams.FORMAT_JSON)).
+            then((logStream) => {
+                return new Promise((resolve) => {
+                    setTimeout(() => { resolve(logStream); }, 500);
+                });
+            }).    
             then((logStream) => {
                 logStreamId = logStream.data.id;
                 return this.makeConcurrentOperations(deviceIds, (deviceId) => 

Diff for: lib/util/UserInteractor.js

@@ -35,7 +35,7 @@ const Config = require('./Config');
 const Identifier = require('./Identifier');
 const JsonFormatter = require('./JsonFormatter');
 
-const SPINNER_TEXT = 'Contacting the impCentral...';
+const SPINNER_TEXT = 'Contacting impCentral...';
 
 const PRINTED_ENTITIES_LIMIT = 5;
 

Diff for: package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "imp-central-impt",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "impt - command line tool for the Electric Imp impCentral API",
   "main": "bin/impt",
   "engines": {