Auto-merge for PR #934 via VersionBot

Add an env vars example config to the local push docs

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/).
 
+## v7.8.5 - 2018-08-09
+
+* Update .resin-sync.yml docs for local push and include example env vars #934 [Tim Perry]
+
 ## v7.8.4 - 2018-08-02
 
 * Update klaw #936 [Tim Perry]

doc/cli.markdown

@@ -1431,12 +1431,14 @@ also change any option by editing '.resin-sync.yml' directly.
 Here is an example '.resin-sync.yml' :
 
 	$ cat $PWD/.resin-sync.yml
-	destination: '/usr/src/app'
-	before: 'echo Hello'
-	after: 'echo Done'
-	ignore:
-		- .git
-		- node_modules/
+	local_resinos:
+		app-name: local-app
+		build-triggers:
+			- Dockerfile: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
+			- package.json: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
+		environment:
+			- MY_VARIABLE=123
+
 
 Command line options have precedence over the ones saved in '.resin-sync.yml'.
 

lib/actions/local/push.coffee

@@ -43,12 +43,14 @@ resinPushHelp = '''
 	Here is an example '.resin-sync.yml' :
 
 		$ cat $PWD/.resin-sync.yml
-		destination: '/usr/src/app'
-		before: 'echo Hello'
-		after: 'echo Done'
-		ignore:
-			- .git
-			- node_modules/
+		local_resinos:
+			app-name: local-app
+			build-triggers:
+				- Dockerfile: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
+				- package.json: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
+			environment:
+				- MY_VARIABLE=123
+
 
 	Command line options have precedence over the ones saved in '.resin-sync.yml'.
 

lib/utils/ssh.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'child_process';
 import * as Bluebird from 'bluebird';
-import TypedError = require('typed-error');
+import { TypedError } from 'typed-error';
 
 import { getSubShellCommand } from './helpers';
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "resin-cli",
-  "version": "7.8.4",
+  "version": "7.8.5",
   "description": "The official resin.io CLI tool",
   "main": "./build/actions/index.js",
   "homepage": "https://github.com/resin-io/resin-cli",
@@ -163,7 +163,7 @@
     "tar-stream": "^1.5.5",
     "through2": "^2.0.3",
     "tmp": "0.0.31",
-    "typed-error": "^2.0.0",
+    "typed-error": "^3.0.0",
     "umount": "^1.1.6",
     "unzip2": "^0.2.5",
     "update-notifier": "^2.2.0",