Skip to content

Commit fdd6a80

Browse files
author
Daniel Lavine and Tim Jarratt
committed
Simplify ui FailWithUsage method
It was absolutely absurd that we decided we needed to duplicate the name of each command so that we could pass it to the UI object to print usage. Maybe this change is only possible now because codegangsta/cli updated its interface in the last few months, but I'm still disappoint. Yet another amazing perl find and replace. [Finishes #70898678]
1 parent 698eb02 commit fdd6a80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+74
-75
lines changed

cf/commands/application/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (cmd *ShowApp) Metadata() command_metadata.CommandMetadata {
4747
func (cmd *ShowApp) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
4848
if len(c.Args()) < 1 {
4949
err = errors.New("Incorrect Usage")
50-
cmd.ui.FailWithUsage(c, "app")
50+
cmd.ui.FailWithUsage(c)
5151
return
5252
}
5353

cf/commands/application/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (command *DeleteApp) Metadata() command_metadata.CommandMetadata {
4343
func (cmd *DeleteApp) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
4444
if len(c.Args()) == 0 {
4545
err = errors.New("Incorrect Usage")
46-
cmd.ui.FailWithUsage(c, "delete")
46+
cmd.ui.FailWithUsage(c)
4747
return
4848
}
4949

cf/commands/application/env.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (command *Env) Metadata() command_metadata.CommandMetadata {
3434
func (cmd *Env) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
3535
if len(c.Args()) < 1 {
3636
err = errors.New("Incorrect Usage")
37-
cmd.ui.FailWithUsage(c, "env")
37+
cmd.ui.FailWithUsage(c)
3838
return
3939
}
4040

cf/commands/application/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (command *Events) Metadata() command_metadata.CommandMetadata {
3636
func (cmd *Events) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
3737
if len(c.Args()) != 1 {
3838
err = errors.New("Incorrect Usage")
39-
cmd.ui.FailWithUsage(c, "events")
39+
cmd.ui.FailWithUsage(c)
4040
return
4141
}
4242

cf/commands/application/files.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (command *Files) Metadata() command_metadata.CommandMetadata {
3737
func (cmd *Files) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
3838
if len(c.Args()) < 1 {
3939
err = errors.New("Incorrect Usage")
40-
cmd.ui.FailWithUsage(c, "files")
40+
cmd.ui.FailWithUsage(c)
4141
return
4242
}
4343

cf/commands/application/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (command *Logs) Metadata() command_metadata.CommandMetadata {
4343

4444
func (cmd *Logs) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
4545
if len(c.Args()) != 1 {
46-
cmd.ui.FailWithUsage(c, "logs")
46+
cmd.ui.FailWithUsage(c)
4747
err = errors.New("Incorrect Usage")
4848
return
4949
}

cf/commands/application/push.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (command *Push) Metadata() command_metadata.CommandMetadata {
9898
func (cmd *Push) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
9999
if len(c.Args()) > 1 {
100100
err = errors.New("Incorrect Usage")
101-
cmd.ui.FailWithUsage(c, "push")
101+
cmd.ui.FailWithUsage(c)
102102
return
103103
}
104104

cf/commands/application/rename.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (command *RenameApp) Metadata() command_metadata.CommandMetadata {
3737
func (cmd *RenameApp) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
3838
if len(c.Args()) != 2 {
3939
err = errors.New("Incorrect Usage")
40-
cmd.ui.FailWithUsage(c, "rename")
40+
cmd.ui.FailWithUsage(c)
4141
return
4242
}
4343
cmd.appReq = requirementsFactory.NewApplicationRequirement(c.Args()[0])

cf/commands/application/restart.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (command *Restart) Metadata() command_metadata.CommandMetadata {
4040
func (cmd *Restart) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
4141
if len(c.Args()) == 0 {
4242
err = errors.New("Incorrect Usage")
43-
cmd.ui.FailWithUsage(c, "restart")
43+
cmd.ui.FailWithUsage(c)
4444
return
4545
}
4646

cf/commands/application/scale.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (command *Scale) Metadata() command_metadata.CommandMetadata {
4747
func (cmd *Scale) GetRequirements(requirementsFactory requirements.Factory, c *cli.Context) (reqs []requirements.Requirement, err error) {
4848
if len(c.Args()) != 1 {
4949
err = errors.New("Incorrect Usage")
50-
cmd.ui.FailWithUsage(c, "scale")
50+
cmd.ui.FailWithUsage(c)
5151
return
5252
}
5353

0 commit comments

Comments
 (0)