Merge pull request containerd#3383 from apostasie/refactor-cmd-2

Refactor cmd/nerdctl, part 2

Author: AkihiroSuda

cmd/nerdctl/compose.go renamed to cmd/nerdctl/compose/compose.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"github.com/spf13/cobra"
@@ -23,7 +23,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/composer"
 )
 
-func newComposeCommand() *cobra.Command {
+func NewComposeCommand() *cobra.Command {
 	var composeCommand = &cobra.Command{
 		Use:              "compose [flags] COMMAND",
 		Short:            "Compose",
@@ -33,7 +33,7 @@ func newComposeCommand() *cobra.Command {
 		TraverseChildren: true, // required for global short hands like -f
 	}
 	// `-f` is a nonPersistentAlias, as it conflicts with `nerdctl compose logs --follow`
-	AddPersistentStringArrayFlag(composeCommand, "file", nil, []string{"f"}, nil, "", "Specify an alternate compose file")
+	helpers.AddPersistentStringArrayFlag(composeCommand, "file", nil, []string{"f"}, nil, "", "Specify an alternate compose file")
 	composeCommand.PersistentFlags().String("project-directory", "", "Specify an alternate working directory")
 	composeCommand.PersistentFlags().StringP("project-name", "p", "", "Specify an alternate project name")
 	composeCommand.PersistentFlags().String("env-file", "", "Specify an alternate environment file")
@@ -70,7 +70,7 @@ func newComposeCommand() *cobra.Command {
 }
 
 func getComposeOptions(cmd *cobra.Command, debugFull, experimental bool) (composer.Options, error) {
-	nerdctlCmd, nerdctlArgs := globalFlags(cmd)
+	nerdctlCmd, nerdctlArgs := helpers.GlobalFlags(cmd)
 	projectDirectory, err := cmd.Flags().GetString("project-directory")
 	if err != nil {
 		return composer.Options{}, err

cmd/nerdctl/compose_build.go renamed to cmd/nerdctl/compose/compose_build.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"github.com/spf13/cobra"

cmd/nerdctl/compose_build_linux_test.go renamed to cmd/nerdctl/compose/compose_build_linux_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"fmt"

cmd/nerdctl/compose_config.go renamed to cmd/nerdctl/compose/compose_config.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"fmt"

cmd/nerdctl/compose_config_test.go renamed to cmd/nerdctl/compose/compose_config_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"fmt"

cmd/nerdctl/compose_cp.go renamed to cmd/nerdctl/compose/compose_cp.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"errors"

cmd/nerdctl/compose_cp_linux_test.go renamed to cmd/nerdctl/compose/compose_cp_linux_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"fmt"

cmd/nerdctl/compose_create.go renamed to cmd/nerdctl/compose/compose_create.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"errors"

cmd/nerdctl/compose_create_linux_test.go renamed to cmd/nerdctl/compose/compose_create_linux_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"fmt"

cmd/nerdctl/compose_down.go renamed to cmd/nerdctl/compose/compose_down.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package compose
 
 import (
 	"github.com/spf13/cobra"