Merge pull request #11 from electricimp/develop

CSE-432 and CSE-176

Author: Pavel Petroshenko

Diff for: .imptest

@@ -1,12 +1,12 @@
 {
-    "modelId": "-Ah71ECh-rlK" /* SpiFlashLogger */,
+    "modelId": "56FYpVVkqSRX" /* K */,
     "devices": [
-        "30000c2a690bdb9f" /* 30000c2a690bdcca */
+        "30000c2a690bdc21" /* K */
     ],
-    "agentFile": "build/agent.nut",
-    "deviceFile": "build/device.nut",
+    "agentFile": false,
+    "deviceFile": "SPIFlashLogger.device.lib.nut",
     "stopOnFailure": false,
-    "timeout": 30,
+    "timeout": 60,
     "tests": [
         "*.test.nut",
         "tests/**/*.test.nut"

Diff for: .imptest-auth.enc

@@ -0,0 +1,2 @@
+��8
+�'��2��>lL'��ÇT�����勣��H?I;��B+��2�QU�HX��(w�-D�4-J�ٜ��s�,�	���w����:��is�י�p

Diff for: .travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+
+node_js:
+  - '5.5'
+
+before_script:
+  - npm i -g imptest@latest
+
+script:
+  - imptest test
+
+before_install:
+  - openssl aes-256-cbc -K $encrypted_c20bb4dffaf6_key -iv $encrypted_c20bb4dffaf6_iv -in .imptest-auth.enc -out .imptest-auth -d 
+

Diff for: LICENSE

@@ -1,6 +1,8 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2015 Electric Imp
+Copyright 2015-2017 Electric Imp
+
+SPDX-License-Identifier: MIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,14 +11,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.