Merge ef7901adba into 2b72ea66e8

.gitignore

@@ -1,2 +1,4 @@
 /data/
+/vendor/
 /custom.html
+/ipd

.travis.yml

@@ -5,3 +5,6 @@ language: go
 go:
   - 1.x
   - tip
+
+install:
+  - go get -u github.com/golang/dep/cmd/dep

Gopkg.lock

@@ -0,0 +1,36 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/jessevdk/go-flags"
+  packages = ["."]
+  revision = "c6ca198ec95c841fdb89fc0de7496fed11ab854e"
+  version = "v1.4.0"
+
+[[projects]]
+  name = "github.com/oschwald/geoip2-golang"
+  packages = ["."]
+  revision = "7118115686e16b77967cdbf55d1b944fe14ad312"
+  version = "v1.2.1"
+
+[[projects]]
+  name = "github.com/oschwald/maxminddb-golang"
+  packages = ["."]
+  revision = "c5bec84d1963260297932a1b7a1753c8420717a7"
+  version = "v1.3.0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows"
+  ]
+  revision = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "46dc1fc78798279ebb1f329ae1d3970b526cd88e93bcf9f917d80015b6f0dace"
+  solver-name = "gps-cdcl"
+  solver-version = 1

Gopkg.toml

@@ -0,0 +1,29 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/jessevdk/go-flags"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/oschwald/geoip2-golang"
+  version = "1.2.1"

Makefile

@@ -1,3 +1,4 @@
+GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
 OS := $(shell uname)
 ifeq ($(OS),Linux)
 	TAR_OPTS := --wildcards
@@ -14,6 +15,9 @@ test:
 vet:
 	go vet ./...
 
+build:
+	go build -o ipd cmd/ipd/main.go
+
 megacheck:
 ifdef TRAVIS
 	megacheck 2> /dev/null; if [ $$? -eq 127 ]; then \
@@ -23,12 +27,12 @@ ifdef TRAVIS
 endif
 
 check-fmt:
-	bash -c "diff --line-format='%L' <(echo -n) <(gofmt -d -s .)"
+	bash -c "diff --line-format='%L' <(echo -n) <(gofmt -d -s ${GOFILES_NOVENDOR})"
 
 lint: check-fmt vet megacheck
 
 deps:
-	go get -d -v ./...
+	dep ensure
 
 install:
 	go install ./...