Rename cli to cmd

Author: st3v

README.md

@@ -7,7 +7,7 @@ Command-line tool and Go library to wait for various conditions to become true.
 
 ## Installation
 
-Make sure Go is installed and setup correctly. To pull the library into the `$GOPATH` directory, build the CLI, and put the binary into the `$GOBIN` directory, simply run:
+Make sure Go is installed and setup correctly. To pull the library into the `$GOPATH` directory, build the binary, and put it into the `$GOBIN` directory, simply run:
 
 ```
 go get github.com/st3v/waitfor/...

check/command_test.go

@@ -11,6 +11,7 @@ import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
+
 	"github.com/st3v/waitfor/check"
 )
 

check/curl_test.go

@@ -12,6 +12,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/ghttp"
+
 	"github.com/st3v/waitfor/check"
 )
 

cli/waitfor/curl.go cmd/waitfor/curl.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/codegangsta/cli"
+
 	"github.com/st3v/waitfor/check"
 )
 

cli/waitfor/fake/port_check.go cmd/waitfor/fake/port_check.go

@@ -4,6 +4,7 @@ import (
 	"os"
 
 	"github.com/codegangsta/cli"
+
 	"github.com/st3v/waitfor"
 )
 

cli/waitfor/flag.go cmd/waitfor/flag.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/codegangsta/cli"
+
 	"github.com/st3v/waitfor/check"
 )
 

cli/waitfor/main.go cmd/waitfor/main.go

@@ -10,11 +10,11 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
 	"github.com/onsi/gomega/gbytes"
+
 	"github.com/st3v/waitfor"
 	"github.com/st3v/waitfor/check"
-	"github.com/st3v/waitfor/cli/waitfor/fake"
+	"github.com/st3v/waitfor/cmd/waitfor/fake"
 )
 
 var _ = Describe("port command", func() {

cli/waitfor/port.go cmd/waitfor/port.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 
 	"github.com/codegangsta/cli"
+
 	"github.com/st3v/waitfor"
 	"github.com/st3v/waitfor/check"
 )

cli/waitfor/port_test.go cmd/waitfor/port_test.go

@@ -9,5 +9,5 @@ import (
 
 func TestWaitfor(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "waitfor cli")
+	RunSpecs(t, "waitfor")
 }

cli/waitfor/shell.go cmd/waitfor/shell.go

@@ -6,9 +6,9 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"golang.org/x/net/context"
 
 	"github.com/st3v/waitfor"
-	"golang.org/x/net/context"
 )
 
 type condition struct {