Skip to content

Commit

Permalink
- v0.0.9
Browse files Browse the repository at this point in the history
- add tests for `Commands.GetWithEnv` (+ issue fix)
- add note on depending on "environmental" aliases.
  • Loading branch information
aaabramov committed Nov 8, 2021
1 parent c68db46 commit 081832b
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/spf13/cobra"
)

const version = "0.0.8" // TODO: set during build
const version = "0.0.9" // TODO: set during build

var versionCmd = &cobra.Command{
Use: "version",
Expand Down
9 changes: 6 additions & 3 deletions lib/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ type Commands struct {
func (c *Commands) get(name string) (*Command, bool) {
for _, command := range c.Commands {
if command.Name == name {
if command.Env != "" {
Fatal("%s goal is referenced as an assertion but is environment dependant." +
"It is not supported yet. Make it as a simple alias for now.")
}
return &command, true
}
}
Expand All @@ -74,12 +78,11 @@ func (c *Commands) get(name string) (*Command, bool) {
func (c *Commands) GetWithEnv(name string, env string) (*Command, bool) {
for _, command := range c.Commands {
if command.Name == name {
if env != "" && command.Env != "" {
if command.Env != "" && env != "" {
return &command, true
} else {
} else if command.Env == "" {
return &command, true
}

}
}
return nil, false
Expand Down
130 changes: 130 additions & 0 deletions lib/commands_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,133 @@ func TestCommand_Cli(t *testing.T) {
})
}
}

func TestCommands_GetWithEnv(t *testing.T) {
type fields struct {
Commands []Command
}
type args struct {
name string
env string
}
tests := []struct {
name string
fields fields
args args
want *Command
exists bool
}{
{
name: "single no env, empty env",
fields: fields{Commands: []Command{
{Name: "test", Env: ""},
}},
args: args{
name: "test",
env: "",
},
want: &Command{Name: "test", Env: ""},
exists: true,
},
{
name: "single no env, empty env, wrong command",
fields: fields{Commands: []Command{
{Name: "test", Env: ""},
}},
args: args{
name: "wrong",
env: "",
},
want: nil,
exists: false,
},
{
name: "single no env, dev env, wrong command",
fields: fields{Commands: []Command{
{Name: "test", Env: ""},
}},
args: args{
name: "wrong",
env: "dev",
},
want: nil,
exists: false,
},
{
name: "single with env, dev env, wrong command",
fields: fields{Commands: []Command{
{Name: "test", Env: "dev"},
}},
args: args{
name: "wrong",
env: "dev",
},
want: nil,
exists: false,
},
{
name: "single with env, empty env",
fields: fields{Commands: []Command{
{Name: "test", Env: "dev"},
}},
args: args{
name: "test",
env: "",
},
want: nil,
exists: false,
},
{
name: "single with env, dev env",
fields: fields{Commands: []Command{
{Name: "test", Env: "dev"},
}},
args: args{
name: "test",
env: "dev",
},
want: &Command{Name: "test", Env: "dev"},
exists: true,
},
{
name: "multiple with env, no env",
fields: fields{Commands: []Command{
{Name: "test", Env: "dev"},
{Name: "test", Env: "stage"},
}},
args: args{
name: "test",
env: "",
},
want: nil,
exists: false,
},
{
name: "multiple with env, dev env",
fields: fields{Commands: []Command{
{Name: "test", Env: "dev"},
{Name: "test", Env: "stage"},
}},
args: args{
name: "test",
env: "dev",
},
want: &Command{Name: "test", Env: "dev"},
exists: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &Commands{
Commands: tt.fields.Commands,
}
got, got1 := c.GetWithEnv(tt.args.name, tt.args.env)
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("GetWithEnv() got = %v, want %v", got, tt.want)
}
if got1 != tt.exists {
t.Errorf("GetWithEnv() got1 = %v, want %v", got1, tt.exists)
}
})
}
}

0 comments on commit 081832b

Please sign in to comment.