Gopkg.toml

@@ -0,0 +1,34 @@
+
+# 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/op/go-logging"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"
+
+[[constraint]]
+  name = "github.com/urfave/cli"
+  version = "1.20.0"

Makefile

@@ -1,9 +1,9 @@
 SOURCEDIR=.
 SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
 
-BINARY=findclient
+BINARY=fingerprint
 
-VERSION=0.5
+VERSION=0.6
 BUILD_TIME=`date +%FT%T%z`
 BUILD=`git rev-parse HEAD`
 
@@ -26,30 +26,29 @@ clean:
 	if [ -f ${BINARY} ] ; then rm ${BINARY} ; fi
 	rm -rf builds
 	rm -rf find
-	rm -rf findclient*
+	rm -rf fingerprint*
 
 .PHONY: binaries
 binaries:
-	go test
 	rm -rf builds
 	mkdir builds
 	# Build Windows
-	env GOOS=windows GOARCH=amd64 go build ${LDFLAGS} -o findclient.exe -v *.go
-	zip -r findclient_${VERSION}_windows_amd64.zip findclient.exe LICENSE
-	mv findclient_${VERSION}_windows_amd64.zip builds/
-	rm findclient.exe
+	env GOOS=windows GOARCH=amd64 go build ${LDFLAGS} -o fingerprint.exe -v *.go
+	zip -r fingerprint_${VERSION}_windows_amd64.zip fingerprint.exe LICENSE
+	mv fingerprint_${VERSION}_windows_amd64.zip builds/
+	rm fingerprint.exe
 	# Build Linux
-	env GOOS=linux GOARCH=amd64 go build ${LDFLAGS} -o findclient -v *.go
-	zip -r findclient_${VERSION}_linux_amd64.zip findclient LICENSE
-	mv findclient_${VERSION}_linux_amd64.zip builds/
-	rm findclient
+	env GOOS=linux GOARCH=amd64 go build ${LDFLAGS} -o fingerprint -v *.go
+	zip -r fingerprint_${VERSION}_linux_amd64.zip fingerprint LICENSE
+	mv fingerprint_${VERSION}_linux_amd64.zip builds/
+	rm fingerprint
 	# Build OS X
-	env GOOS=darwin GOARCH=amd64 go build ${LDFLAGS} -o findclient -v *.go
-	zip -r findclient_${VERSION}_osx.zip findclient LICENSE
-	mv findclient_${VERSION}_osx.zip builds/
-	rm findclient
+	env GOOS=darwin GOARCH=amd64 go build ${LDFLAGS} -o fingerprint -v *.go
+	zip -r fingerprint_${VERSION}_osx.zip fingerprint LICENSE
+	mv fingerprint_${VERSION}_osx.zip builds/
+	rm fingerprint
 	# Build Raspberry Pi / Chromebook
-	env GOOS=linux GOARCH=arm go build ${LDFLAGS} -o findclient -v *.go
-	zip -r findclient_${VERSION}_linux_arm.zip findclient LICENSE
-	mv findclient_${VERSION}_linux_arm.zip builds/
-	rm findclient
+	env GOOS=linux GOARCH=arm go build ${LDFLAGS} -o fingerprint -v *.go
+	zip -r fingerprint_${VERSION}_linux_arm.zip fingerprint LICENSE
+	mv fingerprint_${VERSION}_linux_arm.zip builds/
+	rm fingerprint

README.md

@@ -25,10 +25,10 @@ NAME:
    fingerprint - client for sending WiFi fingerprints to a FIND server
 
 USAGE:
-   find2.exe [global options] command [command options] [arguments...]
+   fingerprint [global options] command [command options] [arguments...]
 
 VERSION:
-   0.2
+   0.6
 
 COMMANDS:
 GLOBAL OPTIONS:

main.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codegangsta/cli"
-	"github.com/op/go-logging"
+	logging "github.com/op/go-logging"
+	"github.com/urfave/cli"
 )
 
 // Fingerprint to be sent to the server

main_test.go

@@ -17,7 +17,7 @@ func ExampleSendFingerprintServerOnlineLearn() {
 		fmt.Println(err)
 	}
 	fmt.Println(response)
-	// Output: Inserted fingerprint containing 22 APs for zack at zakhome floor 2 office
+	// Output: Inserted fingerprint containing 22 APs for zack (testdb) at zakhome floor 2 office
 }
 
 func ExampleSendFingerprintServerOnlineTrack() {

os_configuration.go

@@ -97,7 +97,7 @@ func DownloadVerifyFile(url string, target string, sha1sum string) error {
 			return err
 		}
 
-		log.Info(n, "bytes downloaded.")
+		log.Infof("%d bytes downloaded.",n )
 		fd.Close()
 
 		fileSum, err := ComputeSHA1Sum(target)