Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cli: nomad plan command #1181

Merged
merged 9 commits into from
May 25, 2016
Merged

cli: nomad plan command #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b208da6
initial implementation of nomad plan
dadgar May 13, 2016
764d622
little better output
dadgar May 13, 2016
dce1206
verbose output
dadgar May 13, 2016
9277a3b
better colors and verify help text
dadgar May 13, 2016
4d30607
Alligned properly
dadgar May 17, 2016
7433971
comments, refactor and help string
dadgar May 17, 2016
75e8f28
tests
dadgar May 17, 2016
5a4500c
vendor colorstring
dadgar May 25, 2016
0a6c5ba
meta flag test
dadgar May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions command/meta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/mitchellh/colorstring"
)

const (
Expand Down Expand Up @@ -38,6 +39,9 @@ type Meta struct {

// These are set by the command line flags.
flagAddress string

// Whether to not-colorize output
noColor bool
}

// FlagSet returns a FlagSet with the common flags that every
Expand All @@ -51,6 +55,7 @@ func (m *Meta) FlagSet(n string, fs FlagSetFlags) *flag.FlagSet {
// client connectivity options.
if fs&FlagSetClient != 0 {
f.StringVar(&m.flagAddress, "address", "", "")
f.BoolVar(&m.noColor, "no-color", false, "")
}

// Create an io.Writer that writes to our UI properly for errors.
Expand Down Expand Up @@ -82,6 +87,14 @@ func (m *Meta) Client() (*api.Client, error) {
return api.NewClient(config)
}

func (m *Meta) Colorize() *colorstring.Colorize {
return &colorstring.Colorize{
Colors: colorstring.DefaultColors,
Disable: m.noColor,
Reset: true,
}
}

// generalOptionsUsage returns the help string for the global options.
func generalOptionsUsage() string {
helpText := `
Expand Down
2 changes: 1 addition & 1 deletion command/meta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestMeta_FlagSet(t *testing.T) {
},
{
FlagSetClient,
[]string{"address"},
[]string{"address", "no-color"},
},
}

Expand Down