Add shared CI delivery command

cmd/releasekit/internal/cli/config.go

@@ -16,16 +16,17 @@ import (
 	"gitea.maximumdirect.net/eric/ReleaseKit/internal/process"
 )
 
-const Usage = "usage: releasekit version\n       releasekit check [--repo DIR] [--config FILE] VERSION\n       releasekit publish [--repo DIR] [--config FILE] VERSION\n       releasekit build [--repo DIR] [--config FILE] [--output DIR] VERSION\n       releasekit deliver [--repo DIR] [--config FILE] [--assets DIR] VERSION"
+const Usage = "usage: releasekit version\n       releasekit check [--repo DIR] [--config FILE] VERSION\n       releasekit publish [--repo DIR] [--config FILE] VERSION\n       releasekit build [--repo DIR] [--config FILE] [--output DIR] VERSION\n       releasekit deliver [--repo DIR] [--config FILE] [--assets DIR] VERSION\n       releasekit ci-deliver [--repo DIR] [--config FILE] [--remote NAME] --commit OID VERSION"
 
 type Command string
 
 const (
-	VersionCommand Command = "version"
-	CheckAction    Command = "check"
-	PublishAction  Command = "publish"
-	BuildAction    Command = "build"
-	DeliveryAction Command = "deliver"
+	VersionCommand   Command = "version"
+	CheckAction      Command = "check"
+	PublishAction    Command = "publish"
+	BuildAction      Command = "build"
+	DeliveryAction   Command = "deliver"
+	CIDeliveryAction Command = "ci-deliver"
 )
 
 // Invocation contains parsed command settings owned by the CLI adapter.
@@ -35,6 +36,8 @@ type Invocation struct {
 	ConfigPath string
 	OutputDir  string
 	AssetsDir  string
+	Remote     string
+	Commit     string
 	Version    string
 }
 
@@ -49,7 +52,7 @@ func Parse(args []string) (Invocation, error) {
 			return Invocation{}, errors.New("version takes no arguments")
 		}
 		return Invocation{Command: VersionCommand}, nil
-	case string(CheckAction), string(PublishAction), string(BuildAction), string(DeliveryAction):
+	case string(CheckAction), string(PublishAction), string(BuildAction), string(DeliveryAction), string(CIDeliveryAction):
 		action := Command(args[0])
 		flags := flag.NewFlagSet(string(action), flag.ContinueOnError)
 		flags.SetOutput(io.Discard)
@@ -63,18 +66,46 @@ func Parse(args []string) (Invocation, error) {
 		if action == DeliveryAction {
 			flags.StringVar(&assetsDir, "assets", "", "verified build assets directory")
 		}
+		var remote *string
+		expectedCommit := ""
+		if action == CIDeliveryAction {
+			remote = flags.String("remote", "origin", "Git remote")
+			flags.StringVar(&expectedCommit, "commit", "", "expected tagged commit")
+		}
 		if err := flags.Parse(args[1:]); err != nil {
 			return Invocation{}, err
 		}
 		if flags.NArg() != 1 {
 			return Invocation{}, fmt.Errorf("%s requires one version argument", action)
 		}
-		return Invocation{Command: action, Repository: *repository, ConfigPath: *configPath, OutputDir: outputDir, AssetsDir: assetsDir, Version: flags.Arg(0)}, nil
+		if action == CIDeliveryAction && expectedCommit == "" {
+			return Invocation{}, errors.New("ci-deliver requires --commit OID")
+		}
+		if action == CIDeliveryAction && !validGitObjectID(expectedCommit) {
+			return Invocation{}, errors.New("ci-deliver --commit must be a full Git object ID")
+		}
+		parsedRemote := ""
+		if remote != nil {
+			parsedRemote = *remote
+		}
+		return Invocation{Command: action, Repository: *repository, ConfigPath: *configPath, OutputDir: outputDir, AssetsDir: assetsDir, Remote: parsedRemote, Commit: expectedCommit, Version: flags.Arg(0)}, nil
 	default:
 		return Invocation{}, fmt.Errorf("unknown command %q", args[0])
 	}
 }
 
+func validGitObjectID(value string) bool {
+	if len(value) != 40 && len(value) != 64 {
+		return false
+	}
+	for _, char := range value {
+		if (char < '0' || char > '9') && (char < 'a' || char > 'f') && (char < 'A' || char > 'F') {
+			return false
+		}
+	}
+	return true
+}
+
 // CheckCommand contains one direct child-process invocation from a profile.
 type CheckCommand struct {
 	Args []string          `json:"args"`

cmd/releasekit/internal/cli/config_test.go

@@ -47,9 +47,29 @@ func TestParse(t *testing.T) {
 	if deliver.Command != DeliveryAction || deliver.Repository != "candidate" || deliver.ConfigPath != "releasekit.json" || deliver.AssetsDir != "assets with spaces" || deliver.Version != "v1.2.6" {
 		t.Fatalf("Parse(deliver) = %#v", deliver)
 	}
+	ciDelivery, err := Parse([]string{"ci-deliver", "--repo", "candidate", "--config", "profiles/release config.json", "--remote", "upstream", "--commit", "0123456789abcdef0123456789abcdef01234567", "v1.2.7"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if ciDelivery.Command != CIDeliveryAction || ciDelivery.Repository != "candidate" || ciDelivery.ConfigPath != "profiles/release config.json" || ciDelivery.Remote != "upstream" || ciDelivery.Commit != "0123456789abcdef0123456789abcdef01234567" || ciDelivery.Version != "v1.2.7" {
+		t.Fatalf("Parse(ci-deliver) = %#v", ciDelivery)
+	}
+	ciDefault, err := Parse([]string{"ci-deliver", "--commit", "0123456789abcdef0123456789abcdef01234567", "v1.2.8"})
+	if err != nil || ciDefault.Remote != "origin" {
+		t.Fatalf("Parse(ci-deliver defaults) = %#v, error = %v", ciDefault, err)
+	}
+	if _, err := Parse([]string{"ci-deliver", "v1.2.3"}); err == nil || !strings.Contains(err.Error(), "--commit") {
+		t.Fatalf("Parse(ci-deliver without commit) error = %v, want required commit", err)
+	}
+	if _, err := Parse([]string{"ci-deliver", "--commit", "abc123", "v1.2.3"}); err == nil || !strings.Contains(err.Error(), "full Git object ID") {
+		t.Fatalf("Parse(ci-deliver with abbreviated commit) error = %v, want full object ID error", err)
+	}
 	if _, err := Parse([]string{"check", "v1.2.3", "--repo", "repository"}); err == nil {
 		t.Fatal("Parse accepted a flag after the version")
 	}
+	if _, err := Parse([]string{"ci-deliver", "--commit", "0123456789abcdef0123456789abcdef01234567", "v1.2.3", "--repo", "repository"}); err == nil {
+		t.Fatal("Parse accepted a ci-deliver flag after the version")
+	}
 	if _, err := Parse(nil); err == nil || !strings.Contains(err.Error(), "command is required") {
 		t.Fatalf("Parse(nil) error = %v, want missing-command error", err)
 	}