Revert "Merge pull request #2903 from ActiveState/mitchell/dx-2334"

This reverts commit 85224ba, reversing
changes made to a99f200.

cmd/state/internal/cmdtree/bundles.go

@@ -82,7 +82,7 @@ func newBundleUninstallCommand(prime *primer.Values) *captain.Command {
 			{
 				Name:        locale.T("bundle_arg_name"),
 				Description: locale.T("bundle_arg_name_description"),
-				Value:       &params.Package,
+				Value:       &params.Name,
 				Required:    true,
 			},
 		},
@@ -118,7 +118,7 @@ func newBundlesSearchCommand(prime *primer.Values) *captain.Command {
 			{
 				Name:        locale.T("bundle_arg_name"),
 				Description: locale.T("bundle_arg_name_description"),
-				Value:       &params.Ingredient,
+				Value:       &params.Name,
 				Required:    true,
 			},
 		},

cmd/state/internal/cmdtree/cmdtree.go

@@ -206,7 +206,6 @@ func New(prime *primer.Values, args ...string) *CmdTree {
 		newSwitchCommand(prime),
 		newTestCommand(prime),
 		//newCommitCommand(prime), // re-enable in DX-2307
-		newPublish(prime),
 	)
 
 	return &CmdTree{
@@ -231,7 +230,6 @@ var (
 	VCSGroup              = captain.NewCommandGroup(locale.Tl("group_vcs", "Version Control"), 5)
 	AutomationGroup       = captain.NewCommandGroup(locale.Tl("group_automation", "Automation"), 4)
 	UtilsGroup            = captain.NewCommandGroup(locale.Tl("group_utils", "Utilities"), 3)
-	AuthorGroup           = captain.NewCommandGroup(locale.Tl("group_author", "Author"), 6)
 )
 
 func newGlobalOptions() *globalOptions {

cmd/state/internal/cmdtree/packages.go

@@ -58,13 +58,7 @@ func newInstallCommand(prime *primer.Values) *captain.Command {
 		locale.Tl("package_install_title", "Installing Package"),
 		locale.T("package_install_cmd_description"),
 		prime,
-		[]*captain.Flag{
-			{
-				Name:        "ts",
-				Description: locale.T("package_flag_ts_description"),
-				Value:       &params.Timestamp,
-			},
-		},
+		[]*captain.Flag{},
 		[]*captain.Argument{
 			{
 				Name:        locale.T("package_arg_nameversion"),
@@ -94,7 +88,7 @@ func newUninstallCommand(prime *primer.Values) *captain.Command {
 			{
 				Name:        locale.T("package_arg_name"),
 				Description: locale.T("package_arg_name_description"),
-				Value:       &params.Package,
+				Value:       &params.Name,
 				Required:    true,
 			},
 		},
@@ -151,17 +145,12 @@ func newSearchCommand(prime *primer.Values) *captain.Command {
 				Description: locale.T("package_search_flag_exact-term_description"),
 				Value:       &params.ExactTerm,
 			},
-			{
-				Name:        "ts",
-				Description: locale.T("package_search_flag_ts_description"),
-				Value:       &params.Timestamp,
-			},
 		},
 		[]*captain.Argument{
 			{
 				Name:        locale.T("package_arg_name"),
 				Description: locale.T("package_arg_name_description"),
-				Value:       &params.Ingredient,
+				Value:       &params.Name,
 				Required:    true,
 			},
 		},
@@ -187,11 +176,6 @@ func newInfoCommand(prime *primer.Values) *captain.Command {
 				Description: locale.T("package_info_flag_language_description"),
 				Value:       &params.Language,
 			},
-			{
-				Name:        "ts",
-				Description: locale.T("package_flag_ts_description"),
-				Value:       &params.Timestamp,
-			},
 		},
 		[]*captain.Argument{
 			{

go.mod

@@ -128,7 +128,7 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pelletier/go-toml v1.7.0 // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
-	github.com/pkg/errors v0.9.1
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect

internal/assets/contents/usage.tpl

@@ -21,14 +21,6 @@ Examples:
 {{- end }}
 
 {{- childCommands .Cmd}}
-{{- if gt (len .Cmd.Arguments) 0}}
-
-Arguments:
-{{-  range .Cmd.Arguments }}
-  <{{ .Name }}> {{ if .Required }}          {{ else }}(optional){{ end }} {{ .Description }}
-{{-  end }}
-{{-  end }}
-
 {{- if .Cobra.HasAvailableFlags}}
 
 Flags:
@@ -39,7 +31,13 @@ Flags:
 Global Flags:
 {{.Cobra.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}
 {{- end}}
+{{- if gt (len .Cmd.Arguments) 0}}
 
+Arguments:
+    {{-  range .Cmd.Arguments }}
+  <{{ .Name }}> {{ if .Required }}          {{ else }}(optional){{ end }} {{ .Description }}
+    {{-  end }}
+{{- end}}
 {{- if .Cobra.HasHelpSubCommands}}
 
 Additional help topics:

internal/captain/flag.go

@@ -7,10 +7,13 @@ import (
 	"strings"
 
 	"github.com/ActiveState/cli/internal/errs"
-	"github.com/spf13/pflag"
 )
 
-type FlagMarshaler pflag.Value
+type FlagMarshaler interface {
+	String() string
+	Set(string) error
+	Type() string
+}
 
 // Flag is used to define flags in our Command struct
 type Flag struct {
@@ -35,10 +38,6 @@ func (c *Command) setFlags(flags []*Flag) error {
 		switch v := flag.Value.(type) {
 		case nil:
 			return errs.New("flag value must not be nil (%v)", flag)
-		case *[]string:
-			flagSetter().StringSliceVarP(
-				v, flag.Name, flag.Shorthand, *v, flag.Description,
-			)
 		case *string:
 			flagSetter().StringVarP(
 				v, flag.Name, flag.Shorthand, *v, flag.Description,
@@ -57,7 +56,7 @@ func (c *Command) setFlags(flags []*Flag) error {
 			)
 		default:
 			return errs.New(
-				fmt.Sprintf("Unknown type for flag %s: %s (%v)", flag.Name, reflect.TypeOf(v).Name(), v),
+				fmt.Sprintf("Unknown type: %s (%v)"+reflect.TypeOf(v).Name(), v),
 			)
 		}
 

internal/captain/nameversion.go

@@ -0,0 +1,40 @@
+package captain
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/ActiveState/cli/internal/locale"
+)
+
+type NameVersion struct {
+	name    string
+	version string
+}
+
+func (nv *NameVersion) Set(arg string) error {
+	nameArg := strings.Split(arg, "@")
+	nv.name = nameArg[0]
+	if len(nameArg) == 2 {
+		nv.version = nameArg[1]
+	}
+	if len(nameArg) > 2 {
+		return locale.NewInputError("name_version_format_err", "Invalid format: Should be <name@version>")
+	}
+	return nil
+}
+
+func (nv *NameVersion) String() string {
+	if nv.version == "" {
+		return nv.name
+	}
+	return fmt.Sprintf("%s@%s", nv.name, nv.version)
+}
+
+func (nv *NameVersion) Name() string {
+	return nv.name
+}
+
+func (nv *NameVersion) Version() string {
+	return nv.version
+}