refactor: add root package for Cobra commands (#825)

Signed-off-by: Billy Zha <[email protected]>

cmd/oras/main.go

@@ -16,35 +16,17 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"os"
+	"os/signal"
 
-	"github.com/spf13/cobra"
-	"oras.land/oras/cmd/oras/blob"
-	"oras.land/oras/cmd/oras/manifest"
-	repository "oras.land/oras/cmd/oras/repo"
-	"oras.land/oras/cmd/oras/tag"
+	"oras.land/oras/cmd/oras/root"
 )
 
 func main() {
-	cmd := &cobra.Command{
-		Use:          "oras [command]",
-		SilenceUsage: true,
-	}
-	cmd.AddCommand(
-		pullCmd(),
-		pushCmd(),
-		loginCmd(),
-		logoutCmd(),
-		versionCmd(),
-		discoverCmd(),
-		copyCmd(),
-		attachCmd(),
-		blob.Cmd(),
-		manifest.Cmd(),
-		tag.TagCmd(),
-		repository.Cmd(),
-	)
-	if err := cmd.Execute(); err != nil {
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer cancel()
+	if err := root.New().ExecuteContext(ctx); err != nil {
 		os.Exit(1)
 	}
 }

cmd/oras/attach.go → cmd/oras/root/attach.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"context"

cmd/oras/root/cmd.go

@@ -0,0 +1,45 @@
+/*
+Copyright The ORAS Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package root
+
+import (
+	"github.com/spf13/cobra"
+	"oras.land/oras/cmd/oras/root/blob"
+	"oras.land/oras/cmd/oras/root/manifest"
+	"oras.land/oras/cmd/oras/root/repo"
+)
+
+func New() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:          "oras [command]",
+		SilenceUsage: true,
+	}
+	cmd.AddCommand(
+		pullCmd(),
+		pushCmd(),
+		loginCmd(),
+		logoutCmd(),
+		versionCmd(),
+		discoverCmd(),
+		copyCmd(),
+		tagCmd(),
+		attachCmd(),
+		blob.Cmd(),
+		manifest.Cmd(),
+		repo.Cmd(),
+	)
+	return cmd
+}

cmd/oras/cp.go → cmd/oras/root/cp.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"context"

cmd/oras/discover.go → cmd/oras/root/discover.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"context"

cmd/oras/file.go → cmd/oras/root/file.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"context"

cmd/oras/login.go → cmd/oras/root/login.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"bufio"

cmd/oras/logout.go → cmd/oras/root/logout.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"github.com/sirupsen/logrus"

cmd/oras/pull.go → cmd/oras/root/pull.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"context"

cmd/oras/push.go → cmd/oras/root/push.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"context"

cmd/oras/repo/cmd.go → cmd/oras/root/repo/cmd.go

@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package repository
+package repo
 
 import (
 	"github.com/spf13/cobra"

cmd/oras/repo/ls.go → cmd/oras/root/repo/ls.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package repository
+package repo
 
 import (
 	"fmt"

cmd/oras/repo/tags.go → cmd/oras/root/repo/tags.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package repository
+package repo
 
 import (
 	"fmt"

cmd/oras/tag/tag.go → cmd/oras/root/tag.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package tag
+package root
 
 import (
 	"fmt"
@@ -33,7 +33,7 @@ type tagOptions struct {
 	targetRefs  []string
 }
 
-func TagCmd() *cobra.Command {
+func tagCmd() *cobra.Command {
 	var opts tagOptions
 	cmd := &cobra.Command{
 		Use:   "tag [flags] <name>{:<tag>|@<digest>} <new_tag> [...]",

cmd/oras/version.go → cmd/oras/root/version.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package root
 
 import (
 	"fmt"

internal/repository/repository.go

@@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package repository
 
 import (