rename subcmd to verb

Author: scott-cotton

cmd/dupi/blot.go

@@ -26,13 +26,13 @@ import (
 )
 
 type blotCmd struct {
-	subCmd
+	verb
 	offsets *bool
 }
 
 func newBlotCmd() *blotCmd {
 	cmd := &blotCmd{
-		subCmd: subCmd{name: "blot", flags: flag.NewFlagSet("blot", flag.ExitOnError)}}
+		verb: verb{name: "blot", flags: flag.NewFlagSet("blot", flag.ExitOnError)}}
 	cmd.offsets = cmd.flags.Bool("offsets", false, "show text position of blots")
 	return cmd
 }

cmd/dupi/dupi.go

@@ -28,7 +28,7 @@ import (
 
 // TBD: write and use newIndex(), newExtract()
 // instead of init() ugliness
-var scMap = map[string]SubCmd{
+var scMap = map[string]Verb{
 	"index":   newIndexCmd(),
 	"extract": newExtractCmd(),
 	"blot":    newBlotCmd(),
@@ -60,7 +60,7 @@ func getIndexRoot() string {
 func splitArgs(args []string) ([]string, []string) {
 	var i int
 	var arg string
-	var sc SubCmd
+	var sc Verb
 	for i, arg = range args {
 		sc = scMap[arg]
 		if sc != nil {

cmd/dupi/extract.go

@@ -27,14 +27,14 @@ import (
 )
 
 type extractCmd struct {
-	subCmd
+	verb
 	index *dupi.Index
 	json  *bool
 	sigma *float64
 }
 
 func newExtractCmd() *extractCmd {
-	var extract = &extractCmd{subCmd: subCmd{
+	var extract = &extractCmd{verb: verb{
 		name:  "extract",
 		usage: "extract [args]",
 		flags: flag.NewFlagSet("extract", flag.ExitOnError)}}

cmd/dupi/index.go

@@ -27,7 +27,7 @@ import (
 )
 
 type indexCmd struct {
-	subCmd
+	verb
 	shards  *int
 	seqlen  *int
 	add     *bool
@@ -38,7 +38,7 @@ type indexCmd struct {
 
 func newIndexCmd() *indexCmd {
 	var index = &indexCmd{
-		subCmd: subCmd{
+		verb: verb{
 			name:  "index",
 			flags: flag.NewFlagSet("index", flag.ExitOnError)}}
 	index.seqlen = index.flags.Int("t", 10, "similarity based seq len")

cmd/dupi/inspect.go

@@ -25,17 +25,17 @@ import (
 )
 
 type inspectCmd struct {
-	subCmd
+	verb
 	json  *bool
 	files *bool
 }
 
 func newInspectCmd() *inspectCmd {
-	sub := &subCmd{
+	sub := &verb{
 		name:  "inspect",
 		flags: flag.NewFlagSet("inspect", flag.ExitOnError)}
 	res := &inspectCmd{
-		subCmd: *sub,
+		verb: *sub,
 		json:   sub.flags.Bool("json", false, "output json."),
 		files:  sub.flags.Bool("files", false, "output file info.")}
 	return res

cmd/dupi/like.go

@@ -27,12 +27,12 @@ import (
 )
 
 type likeCmd struct {
-	subCmd
+	verb
 }
 
 func newLikeCmd() *likeCmd {
-	sc := &subCmd{flags: flag.NewFlagSet("like", flag.ExitOnError)}
-	lc := &likeCmd{subCmd: *sc}
+	sc := &verb{flags: flag.NewFlagSet("like", flag.ExitOnError)}
+	lc := &likeCmd{verb: *sc}
 	return lc
 }
 

cmd/dupi/unblot.go

@@ -23,13 +23,13 @@ import (
 )
 
 type unblotCmd struct {
-	subCmd
+	verb
 	all *bool
 }
 
 func newUnblotCmd() *unblotCmd {
 	cmd := &unblotCmd{
-		subCmd: subCmd{name: "unblot", flags: flag.NewFlagSet("unblot", flag.ExitOnError)}}
+		verb: verb{name: "unblot", flags: flag.NewFlagSet("unblot", flag.ExitOnError)}}
 	cmd.all = cmd.flags.Bool("all", false, "output all matches")
 	return cmd
 }

cmd/dupi/subcmd.go cmd/dupi/verb.gocmd/dupi/subcmd.go renamed to cmd/dupi/verb.go

@@ -5,23 +5,23 @@ package main
 
 import "flag"
 
-type SubCmd interface {
+type Verb interface {
 	Name() string
 	Flags() *flag.FlagSet
 	Run(args []string) error
 	Usage() string
 }
 
-type subCmd struct {
+type verb struct {
 	name  string
 	flags *flag.FlagSet
 	usage string
 }
 
-func (s *subCmd) Name() string {
+func (s *verb) Name() string {
 	return s.name
 }
 
-func (s *subCmd) Flags() *flag.FlagSet {
+func (s *verb) Flags() *flag.FlagSet {
 	return s.flags
 }