Merge pull request #14 from zach-klippenstein/format-flags

[cmd/adb] Formatted flag definitions.

.travis.yml

@@ -3,3 +3,7 @@ language: go
 go:
   - 1.6
   - tip
+
+install:
+ # Needed for tip (394ac81)
+  - go get -t -v ./...

cmd/adb/main.go

@@ -17,23 +17,52 @@ import (
 const StdIoFilename = "-"
 
 var (
-	serial = kingpin.Flag("serial", "Connect to device by serial number.").Short('s').String()
+	serial = kingpin.Flag("serial",
+		"Connect to device by serial number.").
+		Short('s').
+		String()
 
-	shellCommand    = kingpin.Command("shell", "Run a shell command on the device.")
+	shellCommand = kingpin.Command("shell",
-	shellCommandArg = shellCommand.Arg("command", "Command to run on device.").Strings()
+		"Run a shell command on the device.")
+	shellCommandArg = shellCommand.Arg("command",
+		"Command to run on device.").
+		Strings()
 
-	devicesCommand  = kingpin.Command("devices", "List devices.")
+	devicesCommand = kingpin.Command("devices",
-	devicesLongFlag = devicesCommand.Flag("long", "Include extra detail about devices.").Short('l').Bool()
+		"List devices.")
+	devicesLongFlag = devicesCommand.Flag("long",
+		"Include extra detail about devices.").
+		Short('l').
+		Bool()
 
-	pullCommand      = kingpin.Command("pull", "Pull a file from the device.")
+	pullCommand = kingpin.Command("pull",
-	pullProgressFlag = pullCommand.Flag("progress", "Show progress.").Short('p').Bool()
+		"Pull a file from the device.")
-	pullRemoteArg    = pullCommand.Arg("remote", "Path of source file on device.").Required().String()
+	pullProgressFlag = pullCommand.Flag("progress",
-	pullLocalArg     = pullCommand.Arg("local", "Path of destination file. If -, will write to stdout.").String()
+		"Show progress.").
+		Short('p').
+		Bool()
+	pullRemoteArg = pullCommand.Arg("remote",
+		"Path of source file on device.").
+		Required().
+		String()
+	pullLocalArg = pullCommand.Arg("local",
+		"Path of destination file. If -, will write to stdout.").
+		String()
 
-	pushCommand      = kingpin.Command("push", "Push a file to the device.")
+	pushCommand = kingpin.Command("push",
-	pushProgressFlag = pushCommand.Flag("progress", "Show progress.").Short('p').Bool()
+		"Push a file to the device.")
-	pushLocalArg     = pushCommand.Arg("local", "Path of source file. If -, will read from stdin.").Required().String()
+	pushProgressFlag = pushCommand.Flag("progress",
-	pushRemoteArg    = pushCommand.Arg("remote", "Path of destination file on device.").Required().String()
+		"Show progress.").
+		Short('p').
+		Bool()
+	pushLocalArg = pushCommand.Arg("local",
+		"Path of source file. If -, will read from stdin.").
+		Required().
+		String()
+	pushRemoteArg = pushCommand.Arg("remote",
+		"Path of destination file on device.").
+		Required().
+		String()
 )
 
 var server adb.Server