Merge pull request docker#332 from joshwget/bump-codegangsta-cli

Bump codegangsta/cli

cli/app/app.go

@@ -11,10 +11,10 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/project"
 	"github.com/docker/libcompose/project/options"
 	"github.com/docker/libcompose/version"
+	"github.com/urfave/cli"
 )
 
 // ProjectAction is an adapter to allow the use of ordinary functions as libcompose actions.

cli/app/events.go

@@ -9,9 +9,9 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/project"
 	"github.com/docker/libcompose/project/events"
+	"github.com/urfave/cli"
 )
 
 // ProjectEvents listen for real-time events of containers.

cli/app/types.go

@@ -1,12 +1,12 @@
 package app
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/project"
+	"github.com/urfave/cli"
 )
 
 // ProjectFactory is an interface that helps creating libcompose project.
 type ProjectFactory interface {
-	// Create creates a libcompose project from the command line options (codegangsta cli context).
+	// Create creates a libcompose project from the command line options (urfave cli context).
 	Create(c *cli.Context) (project.APIProject, error)
 }

cli/app/version.go

@@ -7,8 +7,8 @@ import (
 	"text/template"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/version"
+	"github.com/urfave/cli"
 )
 
 var versionTemplate = `Version:      {{.Version}} ({{.GitCommit}})

cli/command/command.go

@@ -1,8 +1,8 @@
 package command
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/cli/app"
+	"github.com/urfave/cli"
 )
 
 // CreateCommand defines the libcompose create subcommand.

cli/command/help.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 	"os"
 	"path"
 )

cli/docker/app/commands.go

@@ -2,9 +2,9 @@ package app
 
 import (
 	"github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/docker"
 	"github.com/docker/libcompose/docker/client"
+	"github.com/urfave/cli"
 )
 
 // DockerClientFlags defines the flags that are specific to the docker client,

cli/docker/app/factory.go

@@ -3,10 +3,10 @@ package app
 import (
 	"os"
 
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/cli/logger"
 	"github.com/docker/libcompose/docker"
 	"github.com/docker/libcompose/project"
+	"github.com/urfave/cli"
 )
 
 // ProjectFactory is a struct that holds the app.ProjectFactory implementation.

cli/docker/app/factory_test.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/codegangsta/cli"
 	"github.com/docker/libcompose/project"
+	"github.com/urfave/cli"
 )
 
 func TestProjectFactoryProjectNameIsNormalized(t *testing.T) {

cli/main/main.go

@@ -3,11 +3,11 @@ package main
 import (
 	"os"
 
-	"github.com/codegangsta/cli"
 	cliApp "github.com/docker/libcompose/cli/app"
 	"github.com/docker/libcompose/cli/command"
 	dockerApp "github.com/docker/libcompose/cli/docker/app"
 	"github.com/docker/libcompose/version"
+	"github.com/urfave/cli"
 )
 
 func main() {

script/vendor.sh

@@ -6,8 +6,7 @@ rm -rf vendor/
 source 'script/.vendor-helpers.sh'
 
 clone git github.com/Sirupsen/logrus v0.10.0
-#clone git github.com/codegangsta/cli 6086d7927ec35315964d9fea46df6c04e6d697c1
-clone git github.com/codegangsta/cli 839f07bfe4819fa1434fa907d0804ce6ec45a5df
+clone git github.com/urfave/cli v1.18.0
 clone git github.com/docker/distribution 5bbf65499960b184fe8e0f045397375e1a6722b8
 clone git github.com/vbatts/tar-split v0.9.11
 clone git github.com/docker/docker 534753663161334baba06f13b8efa4cad22b5bc5