Add more flexible args in show command

cmd/show.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/b4b4r07/afx/pkg/helpers/templates"
 	"github.com/b4b4r07/afx/pkg/printers"
+	"github.com/b4b4r07/afx/pkg/state"
 	"github.com/goccy/go-yaml"
 	"github.com/spf13/cobra"
 )
@@ -45,9 +46,14 @@ func (m metaCmd) newShowCmd() *cobra.Command {
 		DisableFlagsInUseLine: true,
 		SilenceUsage:          true,
 		SilenceErrors:         true,
-		Args:                  cobra.MaximumNArgs(0),
+		ValidArgs:             state.Keys(m.state.NoChanges),
+		Args:                  cobra.MinimumNArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			b, err := yaml.Marshal(m.GetConfig())
+			cfg := m.GetConfig()
+			if len(args) > 0 {
+				cfg = cfg.Contains(args...)
+			}
+			b, err := yaml.Marshal(cfg)
 			if err != nil {
 				return err
 			}
@@ -66,6 +72,10 @@ func (m metaCmd) newShowCmd() *cobra.Command {
 				for _, pkg := range c.GetPackages(c.state.NoChanges) {
 					fmt.Println(pkg.GetHome())
 				}
+			case "name":
+				for _, pkg := range c.GetPackages(c.state.NoChanges) {
+					fmt.Println(pkg.GetName())
+				}
 			default:
 				return fmt.Errorf("%s: not supported output style", c.opt.output)
 			}
@@ -74,11 +84,11 @@ func (m metaCmd) newShowCmd() *cobra.Command {
 	}
 
 	flag := showCmd.Flags()
-	flag.StringVarP(&c.opt.output, "output", "o", "default", "Output style [default,json,yaml,path]")
+	flag.StringVarP(&c.opt.output, "output", "o", "default", "Output style [default,json,yaml,path,name]")
 
 	showCmd.RegisterFlagCompletionFunc("output",
 		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			out := []string{"default", "json", "yaml", "path"}
+			out := []string{"default", "json", "yaml", "path", "name"}
 			return out, cobra.ShellCompDirectiveNoFileComp
 		})
 
@@ -94,6 +104,17 @@ func (c *showCmd) run(args []string) error {
 		Type   string
 		Status string
 	}
+	type Items []Item
+
+	filter := func(items []Item, input string) []Item {
+		var tmp []Item
+		for _, item := range items {
+			if strings.Contains(item.Name, input) {
+				tmp = append(tmp, item)
+			}
+		}
+		return tmp
+	}
 
 	var items []Item
 	for _, pkg := range c.state.Additions {
@@ -125,6 +146,14 @@ func (c *showCmd) run(args []string) error {
 		})
 	}
 
+	if len(args) > 0 {
+		var tmp []Item
+		for _, arg := range args {
+			tmp = append(tmp, filter(items, arg)...)
+		}
+		items = tmp
+	}
+
 	sort.Slice(items, func(i, j int) bool {
 		return items[i].Name < items[j].Name
 	})

pkg/config/command.go

@@ -39,18 +39,6 @@ type Link struct {
 	To   string `yaml:"to"`
 }
 
-func (l *Link) MarshalYAML() ([]byte, error) {
-	type alias Link
-
-	return yaml.Marshal(struct {
-		*alias
-		To string `yaml:"to"`
-	}{
-		alias: (*alias)(l),
-		To:    os.ExpandEnv(l.To),
-	})
-}
-
 func (l *Link) UnmarshalYAML(b []byte) error {
 	type alias Link
 

pkg/config/config.go

@@ -18,12 +18,12 @@ import (
 // Config structure for file describing deployment. This includes the module source, inputs
 // dependencies, backend etc. One config element is connected to a single deployment
 type Config struct {
-	GitHub []*GitHub `yaml:"github"`
-	Gist   []*Gist   `yaml:"gist"`
-	Local  []*Local  `yaml:"local"`
-	HTTP   []*HTTP   `yaml:"http"`
+	GitHub []*GitHub `yaml:"github,omitempty"`
+	Gist   []*Gist   `yaml:"gist,omitempty"`
+	Local  []*Local  `yaml:"local,omitempty"`
+	HTTP   []*HTTP   `yaml:"http,omitempty"`
 
-	AppConfig *AppConfig `yaml:"config"`
+	AppConfig *AppConfig `yaml:"config,omitempty"`
 }
 
 // AppConfig represents configurations of this application itself
@@ -252,3 +252,57 @@ func getResource(pkg Package) state.Resource {
 		Paths:   paths,
 	}
 }
+
+func (c Config) Get(args ...string) Config {
+	var part Config
+	for _, arg := range args {
+		for _, github := range c.GitHub {
+			if github.Name == arg {
+				part.GitHub = append(part.GitHub, github)
+			}
+		}
+		for _, gist := range c.Gist {
+			if gist.Name == arg {
+				part.Gist = append(part.Gist, gist)
+			}
+		}
+		for _, local := range c.Local {
+			if local.Name == arg {
+				part.Local = append(part.Local, local)
+			}
+		}
+		for _, http := range c.HTTP {
+			if http.Name == arg {
+				part.HTTP = append(part.HTTP, http)
+			}
+		}
+	}
+	return part
+}
+
+func (c Config) Contains(args ...string) Config {
+	var part Config
+	for _, arg := range args {
+		for _, github := range c.GitHub {
+			if strings.Contains(github.Name, arg) {
+				part.GitHub = append(part.GitHub, github)
+			}
+		}
+		for _, gist := range c.Gist {
+			if strings.Contains(gist.Name, arg) {
+				part.Gist = append(part.Gist, gist)
+			}
+		}
+		for _, local := range c.Local {
+			if strings.Contains(local.Name, arg) {
+				part.Local = append(part.Local, local)
+			}
+		}
+		for _, http := range c.HTTP {
+			if strings.Contains(http.Name, arg) {
+				part.HTTP = append(part.HTTP, http)
+			}
+		}
+	}
+	return part
+}