From 8b5ff7765ab5ec63e84862d9332383ba856f8367 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Wed, 23 Mar 2016 11:18:39 +0000
Subject: [PATCH] Squashed 'tools/' changes from c342e83..f9aa081

f9aa081 Correctly fail when spelling mistakes are found.
f8950ed Merge pull request #19 from weaveworks/18-misspell
b377e46 Add misspell to the lint script.
f26a5b2 Merge pull request #20 from weaveworks/socks-update
f904203 Update socks proxy for upstream changes.
495e875 Add reciept to spellchecker

git-subtree-dir: tools
git-subtree-split: f9aa081666dcf6a8a6c8a3e061fd47a72370595d
---
 lint          | 22 ++++++++++++++++++++--
 rebuild-image |  2 +-
 socks/main.go |  7 ++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/lint b/lint
index 22db070c0..7d539f5da 100755
--- a/lint
+++ b/lint
@@ -15,6 +15,7 @@ set -e
 
 IGNORE_LINT_COMMENT=
 IGNORE_TEST_PACKAGES=
+IGNORE_SPELLINGS=
 while true; do
 	case "$1" in
 		-nocomment)
@@ -25,6 +26,10 @@ while true; do
 		IGNORE_TEST_PACKAGES=1
 		shift 1
 		;;
+        -ignorespelling)
+        IGNORE_SPELLINGS="$2,$IGNORE_SPELLINGS"
+        shift 2
+        ;;
 		*)
 		break
 	esac
@@ -35,8 +40,21 @@ function spell_check {
 	filename="$1"
 	local lint_result=0
 
-	if grep -iH --color=always 'psueod\|availible' "${filename}"; then
-		echo "${filename}: spelling mistake"
+	# we don't want to spell check tar balls or binaries
+	if file $filename | grep executable >/dev/null 2>&1; then
+		return $lint_result
+	fi
+	if [[ $filename == *".tar" ]]; then
+		return $lint_result
+	fi
+
+	# misspell is completely optional.  If you don't like it
+	# don't have it installed.
+	if ! type misspell >/dev/null 2>&1; then
+		return $lint_result
+	fi
+
+	if ! misspell -error -i "$IGNORE_SPELLINGS" "${filename}"; then
 		lint_result=1
 	fi
 
diff --git a/rebuild-image b/rebuild-image
index ea54f7403..1e00cbbe0 100755
--- a/rebuild-image
+++ b/rebuild-image
@@ -25,7 +25,7 @@ cached_image_rev() {
 	find $CACHEDIR -name "$SAVEDNAME-*" -type f | sed -n 's/^[^\-]*\-\([a-z0-9]*\).gz$/\1/p'
 }
 
-# Have there been any revision beween $1 and $2
+# Have there been any revision between $1 and $2
 has_changes() {
 	local rev1=$1
 	local rev2=$2
diff --git a/socks/main.go b/socks/main.go
index 6cde493d3..520df27d9 100644
--- a/socks/main.go
+++ b/socks/main.go
@@ -11,6 +11,7 @@ import (
 	socks5 "github.com/armon/go-socks5"
 	"github.com/docker/docker/pkg/mflag"
 	"github.com/weaveworks/weave/common/mflagext"
+	"golang.org/x/net/context"
 )
 
 type pacFileParameters struct {
@@ -72,11 +73,11 @@ type aliasingResolver struct {
 	socks5.NameResolver
 }
 
-func (r aliasingResolver) Resolve(name string) (net.IP, error) {
+func (r aliasingResolver) Resolve(ctx context.Context, name string) (context.Context, net.IP, error) {
 	if alias, ok := r.aliases[name]; ok {
-		return r.NameResolver.Resolve(alias)
+		return r.NameResolver.Resolve(ctx, alias)
 	}
-	return r.NameResolver.Resolve(name)
+	return r.NameResolver.Resolve(ctx, name)
 }
 
 func socksProxy(aliases map[string]string) {