Fix 'default' group mapping and completions

Author: alebeck

cmd/boring/tunnels.go

@@ -100,7 +100,11 @@ func controlTunnels(args []string, kind daemon.CmdKind) {
 	var keep map[string]bool
 
 	if groupFilter != "" {
-		keep = filterByGroup(ts, groupFilter)
+		filterValue := groupFilter
+		if groupFilter == "default" {
+			filterValue = ""
+		}
+		keep = filterByGroup(ts, filterValue)
 		if len(keep) == 0 {
 			log.Fatalf("No %stunnels in group '%s'.", m, groupFilter)
 		}
@@ -223,9 +227,13 @@ func listTunnels(args []string) {
 
 	// Filter by group if requested
 	if groupFilter != "" {
+		filterValue := groupFilter
+		if groupFilter == "default" {
+			filterValue = ""
+		}
 		var filtered []*tunnel.Desc
 		for _, t := range all {
-			if t.Group == groupFilter {
+			if t.Group == filterValue {
 				filtered = append(filtered, t)
 			}
 		}

completions/boring.bash

@@ -36,7 +36,7 @@ _boring() {
 
     _boring_get_groups() {
         local -a groups
-        groups=($(boring list 2>/dev/null | sed -n 's/^\[\(.*\)\]$/\1/p' | grep -v '^default$'))
+        groups=($(boring list 2>/dev/null | sed -n 's/^\[\(.*\)\]$/\1/p'))
         COMPREPLY=($(compgen -W "${groups[*]}" -- "$cur"))
     }
 
@@ -46,6 +46,8 @@ _boring() {
         cmd="${COMP_WORDS[1]}"
         if [[ "$prev" == "-g" || "$prev" == "--group" ]]; then
             _boring_get_groups
+        elif [[ " ${COMP_WORDS[*]} " == *" -g "* || " ${COMP_WORDS[*]} " == *" --group "* ]]; then
+            COMPREPLY=()
         elif [[ "$cmd" == "open" || "$cmd" == "o" ]]; then
             _boring_get_names "closed"
         elif [[ "$cmd" == "close" || "$cmd" == "c" ]]; then

completions/boring.fish

@@ -26,7 +26,7 @@ function __boring_get_names
 end
 
 function __boring_get_groups
-    boring list 2>/dev/null | sed -n 's/^\[\(.*\)\]$/\1/p' | grep -v '^default$'
+    boring list 2>/dev/null | sed -n 's/^\[\(.*\)\]$/\1/p'
 end
 
 function __boring_complete
@@ -44,6 +44,9 @@ function __boring_complete
         __boring_get_groups
         return
     end
+    if contains -- -g $arguments; or contains -- --group $arguments
+        return
+    end
 
     switch $command
         case open o

completions/boring.zsh

@@ -41,7 +41,7 @@ _boring() {
 
     _boring_get_groups() {
         local -a groups
-        groups=($(boring list 2>/dev/null | sed -n 's/^\[\(.*\)\]$/\1/p' | grep -v '^default$'))
+        groups=($(boring list 2>/dev/null | sed -n 's/^\[\(.*\)\]$/\1/p'))
         if (( ${#groups[@]} )); then
             _values 'group' "${groups[@]}"
         fi
@@ -58,6 +58,8 @@ _boring() {
         names)
             if [[ "${words[CURRENT-1]}" == "-g" || "${words[CURRENT-1]}" == "--group" ]]; then
                 _boring_get_groups
+            elif (( ${line[(Ie)-g]} || ${line[(Ie)--group]} )); then
+                return 1
             elif [[ $line[1] == "open" || $line[1] == "o" ]]; then
                 _boring_get_names "closed" "${line[@]:1}"
             elif [[ $line[1] == "close" || $line[1] == "c" ]]; then