Skip to content

Commit de58a03

Browse files
committed
added documentation to actions
- added descriptions to completion
1 parent 6986461 commit de58a03

File tree

5 files changed

+25
-5
lines changed

5 files changed

+25
-5
lines changed

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
180180
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
181181
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
182182
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
183+
gopkg.in/ini.v1 v1.60.2 h1:7i8mqModL63zqi8nQn8Q3+0zvSCZy1AxhBgthKfi4WU=
183184
gopkg.in/ini.v1 v1.60.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
184185
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
185186
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=

pkg/actions/aws/aws.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"gopkg.in/ini.v1"
99
)
1010

11+
// ActionRegions completes region names
1112
func ActionRegions() carapace.Action {
1213
return carapace.ActionValuesDescribed(
1314
"af-south-1", "Africa (Cape Town)",
@@ -33,6 +34,7 @@ func ActionRegions() carapace.Action {
3334
)
3435
}
3536

37+
// ActionProfiles completes configuration profile names
3638
func ActionProfiles() carapace.Action {
3739
return carapace.ActionCallback(func(args []string) carapace.Action {
3840
profiles := []string{}

pkg/actions/fs/fs.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/rsteube/carapace"
99
)
1010

11+
// ActionMounts completes file system mounts
1112
func ActionMounts() carapace.Action {
1213
return carapace.ActionCallback(func(args []string) carapace.Action {
1314
if output, err := exec.Command("mount").Output(); err != nil {

pkg/actions/net/net.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/rsteube/carapace"
1212
)
1313

14+
// ActionHosts completes known hosts
1415
func ActionHosts() carapace.Action {
1516
return carapace.ActionCallback(func(args []string) carapace.Action {
1617
hosts := []string{}
@@ -30,6 +31,7 @@ func ActionHosts() carapace.Action {
3031
})
3132
}
3233

34+
// ActionNetInterfaces completes network interface names
3335
func ActionNetInterfaces() carapace.Action {
3436
return carapace.ActionCallback(func(args []string) carapace.Action {
3537
if output, err := exec.Command("ifconfig").Output(); err != nil {

pkg/actions/os/os.go

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,32 @@ import (
44
"io/ioutil"
55
"os"
66
"os/exec"
7+
"strconv"
78
"strings"
89

910
ps "github.com/mitchellh/go-ps"
1011
"github.com/rsteube/carapace"
1112
)
1213

14+
// ActionEnvironmentVariables completes environment values
1315
func ActionEnvironmentVariables() carapace.Action {
1416
return carapace.ActionCallback(func(args []string) carapace.Action {
1517
env := os.Environ()
16-
vars := make([]string, len(env))
18+
vars := make([]string, len(env)*2)
1719
for index, e := range os.Environ() {
1820
pair := strings.SplitN(e, "=", 2)
19-
vars[index] = pair[0]
21+
vars[index*2] = pair[0]
22+
if len(pair[1]) > 40 {
23+
vars[(index*2)+1] = pair[1][:37] + "..."
24+
} else {
25+
vars[(index*2)+1] = pair[1]
26+
}
2027
}
21-
return carapace.ActionValues(vars...)
28+
return carapace.ActionValuesDescribed(vars...)
2229
})
2330
}
2431

32+
// ActionGroups completes system group names
2533
func ActionGroups() carapace.Action {
2634
return carapace.ActionCallback(func(args []string) carapace.Action {
2735
groups := []string{}
@@ -41,6 +49,7 @@ func ActionGroups() carapace.Action {
4149
})
4250
}
4351

52+
// ActionKillSignals completes linux kill signals
4453
func ActionKillSignals() carapace.Action {
4554
return carapace.ActionValuesDescribed(
4655
"ABRT", "Abnormal termination",
@@ -77,20 +86,22 @@ func ActionKillSignals() carapace.Action {
7786
)
7887
}
7988

89+
// ActionProcessExecutables completes executable names of current processes
8090
func ActionProcessExecutables() carapace.Action {
8191
return carapace.ActionCallback(func(args []string) carapace.Action {
8292
if processes, err := ps.Processes(); err != nil {
8393
return carapace.ActionMessage(err.Error())
8494
} else {
8595
executables := make([]string, 0)
8696
for _, process := range processes {
87-
executables = append(executables, process.Executable())
97+
executables = append(executables, process.Executable(), strconv.Itoa(process.Pid()))
8898
}
89-
return carapace.ActionValues(executables...)
99+
return carapace.ActionValuesDescribed(executables...)
90100
}
91101
})
92102
}
93103

104+
// ActionProcessStates completes linux process states
94105
func ActionProcessStates() carapace.Action {
95106
return carapace.ActionValuesDescribed(
96107
"D", "uninterruptible sleep (usually IO)",
@@ -105,6 +116,7 @@ func ActionProcessStates() carapace.Action {
105116
)
106117
}
107118

119+
// ActionUsers completes system user names
108120
func ActionUsers() carapace.Action {
109121
return carapace.ActionCallback(func(args []string) carapace.Action {
110122
users := []string{}
@@ -124,6 +136,7 @@ func ActionUsers() carapace.Action {
124136
})
125137
}
126138

139+
// ActionUserGroup completes system user:group separately
127140
func ActionUserGroup() carapace.Action {
128141
return carapace.ActionMultiParts(":", func(args []string, parts []string) carapace.Action {
129142
switch len(parts) {
@@ -137,6 +150,7 @@ func ActionUserGroup() carapace.Action {
137150
})
138151
}
139152

153+
// ActionShells completes available terminal shells
140154
func ActionShells() carapace.Action {
141155
return carapace.ActionCallback(func(args []string) carapace.Action {
142156
if output, err := exec.Command("chsh", "--list-shells").Output(); err != nil {

0 commit comments

Comments
 (0)