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

Refactor cmd/nerdctl, part 2

cmd/nerdctl/compose.go → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → cmd/nerdctl/compose/compose_down.go

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

cmd/nerdctl/compose_down_linux_test.go → cmd/nerdctl/compose/compose_down_linux_test.go

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

cmd/nerdctl/compose_exec.go → cmd/nerdctl/compose/compose_exec.go

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

cmd/nerdctl/compose_exec_linux_test.go → cmd/nerdctl/compose/compose_exec_linux_test.go

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

cmd/nerdctl/compose_images.go → cmd/nerdctl/compose/compose_images.go

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

cmd/nerdctl/compose_images_linux_test.go → cmd/nerdctl/compose/compose_images_linux_test.go

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

cmd/nerdctl/compose_kill.go → cmd/nerdctl/compose/compose_kill.go

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

cmd/nerdctl/compose_kill_linux_test.go → cmd/nerdctl/compose/compose_kill_linux_test.go

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

cmd/nerdctl/compose_logs.go → cmd/nerdctl/compose/compose_logs.go

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

cmd/nerdctl/compose_pause.go → cmd/nerdctl/compose/compose_pause.go

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

cmd/nerdctl/compose_pause_linux_test.go → cmd/nerdctl/compose/compose_pause_linux_test.go

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

cmd/nerdctl/compose_port.go → cmd/nerdctl/compose/compose_port.go

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

cmd/nerdctl/compose_port_linux_test.go → cmd/nerdctl/compose/compose_port_linux_test.go

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

cmd/nerdctl/compose_ps.go → cmd/nerdctl/compose/compose_ps.go

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

cmd/nerdctl/compose_ps_linux_test.go → cmd/nerdctl/compose/compose_ps_linux_test.go

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

cmd/nerdctl/compose_pull.go → cmd/nerdctl/compose/compose_pull.go

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

cmd/nerdctl/compose_pull_linux_test.go → cmd/nerdctl/compose/compose_pull_linux_test.go

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

cmd/nerdctl/compose_push.go → cmd/nerdctl/compose/compose_push.go

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

cmd/nerdctl/compose_restart.go → cmd/nerdctl/compose/compose_restart.go

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

cmd/nerdctl/compose_restart_linux_test.go → cmd/nerdctl/compose/compose_restart_linux_test.go

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

cmd/nerdctl/compose_rm.go → cmd/nerdctl/compose/compose_rm.go

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

cmd/nerdctl/compose_rm_linux_test.go → cmd/nerdctl/compose/compose_rm_linux_test.go

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

cmd/nerdctl/compose_run.go → cmd/nerdctl/compose/compose_run.go

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

cmd/nerdctl/compose_run_linux_test.go → cmd/nerdctl/compose/compose_run_linux_test.go

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

cmd/nerdctl/compose_start.go → cmd/nerdctl/compose/compose_start.go

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

cmd/nerdctl/compose_start_linux_test.go → cmd/nerdctl/compose/compose_start_linux_test.go

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

cmd/nerdctl/compose_stop.go → cmd/nerdctl/compose/compose_stop.go

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

cmd/nerdctl/compose_stop_linux_test.go → cmd/nerdctl/compose/compose_stop_linux_test.go

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

cmd/nerdctl/compose/compose_test.go

@@ -0,0 +1,27 @@
+/*
+   Copyright The containerd 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 compose
+
+import (
+	"testing"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
+)
+
+func TestMain(m *testing.M) {
+	testutil.M(m)
+}

cmd/nerdctl/compose_top.go → cmd/nerdctl/compose/compose_top.go

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