remove most of cmd; change things to use it

sinanawad · Jun 13, 2014 · 6337964 · 6337964
1 parent e620534
commit 6337964
Show file tree

Hide file tree

Showing 140 changed files with 174 additions and 2,730 deletions.
diff --git a/cmd/args.go b/cmd/args.go
diff --git a/cmd/args_test.go b/cmd/args_test.go
diff --git a/cmd/charm-admin/config.go b/cmd/charm-admin/config.go
@@ -7,9 +7,8 @@ import (
 	"fmt"
 
 	"github.com/juju/charmstore"
+	"github.com/juju/cmd"
 	"launchpad.net/gnuflag"
-
-	"github.com/juju/juju/cmd"
 )
 
 // ConfigCommand defines a command which requires a YAML config file.

diff --git a/cmd/charm-admin/config_test.go b/cmd/charm-admin/config_test.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"path"
 
+	"github.com/juju/cmd"
 	gc "launchpad.net/gocheck"
 
-	"github.com/juju/juju/cmd"
 	"github.com/juju/juju/testing"
 )
 

diff --git a/cmd/charm-admin/deletecharm.go b/cmd/charm-admin/deletecharm.go
@@ -8,9 +8,8 @@ import (
 
 	"github.com/juju/charm"
 	"github.com/juju/charmstore"
+	"github.com/juju/cmd"
 	"launchpad.net/gnuflag"
-
-	"github.com/juju/juju/cmd"
 )
 
 type DeleteCharmCommand struct {

diff --git a/cmd/charm-admin/main.go b/cmd/charm-admin/main.go
@@ -7,7 +7,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/juju/juju/cmd"
+	"github.com/juju/cmd"
+
+	jujucmd "github.com/juju/juju/cmd"
 )
 
 func main() {
@@ -17,9 +19,8 @@ func main() {
 		os.Exit(2)
 	}
 
-	admcmd := cmd.NewSuperCommand(cmd.SuperCommandParams{
+	admcmd := jujucmd.NewSuperCommand(cmd.SuperCommandParams{
 		Name: "charm-admin",
-		Log:  &cmd.Log{},
 	})
 
 	admcmd.Register(&DeleteCharmCommand{})