Update tools

push-images

@@ -9,10 +9,10 @@ IMAGES=$(make images)
 IMAGE_TAG=$(./tools/image-tag)
 
 for image in ${IMAGES}; do
-  if [[ "$image" == *"build"* ]]; then
-    continue
-  fi
-  docker push ${image}:${IMAGE_TAG}
-  docker tag ${image}:${IMAGE_TAG} ${QUAY_PREFIX}${image}:${IMAGE_TAG}
-  docker push ${QUAY_PREFIX}${image}:${IMAGE_TAG}
+    if [[ "$image" == *"build"* ]]; then
+        continue
+    fi
+    docker push ${image}:${IMAGE_TAG}
+    docker tag ${image}:${IMAGE_TAG} ${QUAY_PREFIX}${image}:${IMAGE_TAG}
+    docker push ${QUAY_PREFIX}${image}:${IMAGE_TAG}
 done

tools/lint

@@ -17,8 +17,11 @@
 
 set -e
 
+LINT_IGNORE_FILE=${LINT_IGNORE_FILE:-".lintignore"}
+
 IGNORE_LINT_COMMENT=
 IGNORE_SPELLINGS=
+PARALLEL=
 while true; do
     case "$1" in
         -nocomment)
@@ -33,6 +36,10 @@ while true; do
             IGNORE_SPELLINGS="$2,$IGNORE_SPELLINGS"
             shift 2
             ;;
+        -p)
+            PARALLEL=1
+            shift 1
+            ;;
         *)
             break
             ;;
@@ -142,10 +149,11 @@ lint() {
         return
     fi
 
-    # Don't lint static.go
+    # Don't lint specific files
     case "$(basename "${filename}")" in
         static.go) return ;;
         coverage.html) return ;;
+        *.pb.go) return ;;
     esac
 
     if [[ "$(file --mime-type "${filename}" | awk '{print $2}')" == "text/x-shellscript" ]]; then
@@ -171,12 +179,45 @@ lint_files() {
     exit $lint_result
 }
 
+matches_any() {
+    local filename="$1"
+    local patterns="$2"
+    while read -r pattern; do
+        # shellcheck disable=SC2053
+        # Use the [[ operator without quotes on $pattern
+        # in order to "glob" the provided filename:
+        [[ "$filename" == $pattern ]] && return 0
+    done <<<"$patterns"
+    return 1
+}
+
+filter_out() {
+    local patterns_file="$1"
+    if [ -n "$patterns_file" ] && [ -r "$patterns_file" ]; then
+        local patterns=$(sed '/^#.*$/d ; /^\s*$/d' "$patterns_file") # Remove blank lines and comments before we start iterating.
+        [ -n "$DEBUG" ] && echo >&2 "> Filters:" && echo >&2 "$patterns"
+        local filtered_out=()
+        while read -r filename; do
+            matches_any "$filename" "$patterns" && filtered_out+=("$filename") || echo "$filename"
+        done
+        [ -n "$DEBUG" ] && echo >&2 "> Files filtered out (i.e. NOT linted):" && printf >&2 '%s\n' "${filtered_out[@]}"
+    else
+        cat # No patterns provided: simply propagate stdin to stdout.
+    fi
+}
+
 list_files() {
     if [ $# -gt 0 ]; then
-        git ls-files --exclude-standard | grep -vE '(^|/)vendor/'
+        find "$@" | grep -vE '(^|/)vendor/'
     else
-        git diff --cached --name-only
+        git ls-files --exclude-standard | grep -vE '(^|/)vendor/'
     fi
 }
 
-list_files "$@" | lint_files
+if [ $# = 1 ] && [ -f "$1" ]; then
+    lint "$1"
+elif [ -n "$PARALLEL" ]; then
+    list_files "$@" | filter_out "$LINT_IGNORE_FILE" | xargs -n1 -P16 $0
+else
+    list_files "$@" | filter_out "$LINT_IGNORE_FILE" | lint_files
+fi

tools/runner/runner.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/mgutz/ansi"
-	"github.com/weaveworks/docker/pkg/mflag"
+	"github.com/weaveworks/common/mflag"
 )
 
 const (

tools/socks/main.go

@@ -9,8 +9,8 @@ import (
 	"text/template"
 
 	socks5 "github.com/armon/go-socks5"
-	"github.com/weaveworks/docker/pkg/mflag"
-	"github.com/weaveworks/weave/common/mflagext"
+	"github.com/weaveworks/common/mflag"
+	"github.com/weaveworks/common/mflagext"
 	"golang.org/x/net/context"
 )
 

tools/test

@@ -7,9 +7,10 @@ SLOW=
 NO_GO_GET=true
 TAGS=
 PARALLEL=
+TIMEOUT=1m
 
 usage() {
-    echo "$0 [-slow] [-in-container foo] [-netgo] [-(no-)go-get]"
+    echo "$0 [-slow] [-in-container foo] [-netgo] [-(no-)go-get] [-timeout 1m]"
 }
 
 while [ $# -gt 0 ]; do
@@ -34,14 +35,18 @@ while [ $# -gt 0 ]; do
             PARALLEL=true
             shift 1
             ;;
+        "-timeout")
+            TIMEOUT=$2
+            shift 2
+            ;;
         *)
             usage
             exit 2
             ;;
     esac
 done
 
-GO_TEST_ARGS=($TAGS -cpu 4 -timeout 8m)
+GO_TEST_ARGS=($TAGS -cpu 4 -timeout $TIMEOUT)
 
 if [ -n "$SLOW" ] || [ -n "$CIRCLECI" ]; then
     SLOW=true
@@ -87,7 +92,7 @@ go test -i "${GO_TEST_ARGS[@]}" "${TESTDIRS[@]}"
 run_test() {
     local dir=$1
     if [ -z "$NO_GO_GET" ]; then
-        go get -t $TAGS "$dir"
+        go get -t "$TAGS" "$dir"
     fi
 
     local GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}")