Revert "Bring in changes from minio-io/cli"

Godeps/Godeps.json

@@ -27,8 +27,8 @@
 		},
 		{
 			"ImportPath": "github.com/minio-io/cli",
-			"Comment": "1.2.0-106-g74f4efd",
+			"Comment": "1.2.0-102-gecb385c",
-			"Rev": "74f4efdae47555906336b1dcd30c4b40d4d0d6fa"
+			"Rev": "ecb385c3fefd53678e3b6beba6a608fb7c8dfac1"
 		},
 		{
 			"ImportPath": "github.com/stretchr/objx",

Godeps/_workspace/src/github.com/minio-io/cli/README.md

@@ -5,7 +5,7 @@ You can view the API docs here:
 http://godoc.org/github.com/minio-io/cli
 
 ## Overview
-Command line apps are usually so tiny that there is absolutely no reason why your code should *not* be self-documenting. Things like generating help text and parsing command flags should not hinder productivity when writing a command line app.
+Command line apps are usually so tiny that there is absolutely no reason why your code should *not* be self-documenting. Things like generating help text and parsing command flags/options should not hinder productivity when writing a command line app.
 
 **This is where cli.go comes into play.** cli.go makes command line programming fun, organized, and expressive!
 
@@ -108,7 +108,7 @@ NAME:
     greet - fight the loneliness!
 
 USAGE:
-    greet [global flags] command [command flags] [arguments...]
+    greet [global options] command [command options] [arguments...]
 
 VERSION:
     0.0.0
@@ -116,7 +116,7 @@ VERSION:
 COMMANDS:
     help, h  Shows a list of commands or help for one command
 
-GLOBAL FLAGS
+GLOBAL OPTIONS
     --version	Shows version information
 ```
 
@@ -225,7 +225,7 @@ app.Commands = []cli.Command{
   {
     Name:      "template",
     Aliases:     []string{"r"},
-    Usage:     "flags for task templates",
+    Usage:     "options for task templates",
     Subcommands: []cli.Command{
       {
         Name:  "add",

Godeps/_workspace/src/github.com/minio-io/cli/app.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"os/exec"
 	"strings"
 	"time"
 
@@ -58,16 +57,12 @@ type App struct {
 	Writer io.Writer
 }
 
-// mustCompileTime - determines the modification time of the current binary
+// Tries to find out when this binary was compiled.
-func mustCompileTime() time.Time {
+// Returns the current time if it fails to find it.
-	path, err := exec.LookPath(os.Args[0])
+func compileTime() time.Time {
+	info, err := os.Stat(os.Args[0])
 	if err != nil {
-		return time.Time{}
+		return time.Now()
-	}
-
-	info, err := os.Stat(path)
-	if err != nil {
-		return time.Time{}
 	}
 	return info.ModTime()
 }
@@ -80,7 +75,7 @@ func NewApp() *App {
 		Version:      "0.0.0",
 		BashComplete: DefaultAppComplete,
 		Action:       helpCommand.Action,
-		Compiled:     mustCompileTime(),
+		Compiled:     compileTime(),
 		Writer:       os.Stdout,
 	}
 }

Godeps/_workspace/src/github.com/minio-io/cli/app_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/minio-io/cli"
+	"github.com/codegangsta/cli"
 )
 
 func ExampleApp() {

Godeps/_workspace/src/github.com/minio-io/cli/cli_test.go

@@ -3,7 +3,7 @@ package cli_test
 import (
 	"os"
 
-	"github.com/minio-io/cli"
+	"github.com/codegangsta/cli"
 )
 
 func Example() {

Godeps/_workspace/src/github.com/minio-io/cli/command_test.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/minio-io/cli"
+	"github.com/codegangsta/cli"
 )
 
 func TestCommandDoNotIgnoreFlags(t *testing.T) {

Godeps/_workspace/src/github.com/minio-io/cli/context.go

@@ -11,7 +11,7 @@ import (
 // Context is a type that is passed through to
 // each Handler action in a cli application. Context
 // can be used to retrieve context-specific Args and
-// parsed command-line flags.
+// parsed command-line options.
 type Context struct {
 	App            *App
 	Command        Command
@@ -179,11 +179,6 @@ func (a Args) First() string {
 	return a.Get(0)
 }
 
-// Last - Return the last argument, or else a blank String
-func (a Args) Last() string {
-	return a.Get(len(a) - 1)
-}
-
 // Tail - Return the rest of the arguments (not the first one)
 // or else an empty string slice
 func (a Args) Tail() []string {

Godeps/_workspace/src/github.com/minio-io/cli/context_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/minio-io/cli"
+	"github.com/codegangsta/cli"
 )
 
 func TestNewContext(t *testing.T) {

Godeps/_workspace/src/github.com/minio-io/cli/flag_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/minio-io/cli"
+	"github.com/codegangsta/cli"
 )
 
 var boolFlagTests = []struct {

Godeps/_workspace/src/github.com/minio-io/cli/help.go

@@ -12,7 +12,7 @@ var AppHelpTemplate = `NAME:
    {{.Name}} - {{.Usage}}
 
 USAGE:
-   {{.Name}} {{if .Flags}}[global flags] {{end}}command{{if .Flags}} [command flags]{{end}} [arguments...]
+   {{.Name}} {{if .Flags}}[global options] {{end}}command{{if .Flags}} [command options]{{end}} [arguments...]
 
 VERSION:
    {{.Version}}
@@ -26,7 +26,7 @@ BUILD:
 COMMANDS:
    {{range .Commands}}{{join .Names ", "}}{{ "\t" }}{{.Usage}}
    {{end}}{{if .Flags}}
-GLOBAL FLAGS:
+GLOBAL OPTIONS:
    {{range .Flags}}{{.}}
    {{end}}{{end}}
 `
@@ -38,12 +38,12 @@ var DefaultCommandHelpTemplate = `NAME:
    {{.Name}} - {{.Usage}}
 
 USAGE:
-   command {{.Name}}{{if .Flags}} [command flags]{{end}} [arguments...]{{if .Description}}
+   command {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}}
 
 DESCRIPTION:
    {{.Description}}{{end}}{{if .Flags}}
 
-FLAGS:
+OPTIONS:
    {{range .Flags}}{{.}}
    {{end}}{{ end }}
 `
@@ -55,12 +55,12 @@ var DefaultSubcommandHelpTemplate = `NAME:
    {{.Name}} - {{.Usage}}
 
 USAGE:
-   {{.Name}} command{{if .Flags}} [command flags]{{end}} [arguments...]
+   {{.Name}} command{{if .Flags}} [command options]{{end}} [arguments...]
 
 COMMANDS:
    {{range .Commands}}{{join .Names ", "}}{{ "\t" }}{{.Usage}}
    {{end}}{{if .Flags}}
-FLAGS:
+OPTIONS:
    {{range .Flags}}{{.}}
    {{end}}{{end}}
 `