removed core and contain packages

src/cmd/get/context/context.go

@@ -3,7 +3,8 @@ package context
 import (
 	"fmt"
 
-	"github.com/silphid/yey/src/internal/core"
+	"github.com/silphid/yey/src/cmd"
+	yey "github.com/silphid/yey/src/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -24,18 +25,24 @@ func New() *cobra.Command {
 }
 
 func run(name string) error {
-	c, err := core.New()
+	contexts, err := yey.ReadAndParseContextFile()
 	if err != nil {
 		return err
 	}
-	name, err = c.GetOrPromptContextName(name)
-	if err != nil {
-		return err
+
+	if name == "" {
+		var err error
+		name, err = cmd.PromptContext(contexts)
+		if err != nil {
+			return fmt.Errorf("failed to prompt for desired context: %w", err)
+		}
 	}
-	context, err := c.GetContext(name)
+
+	context, err := contexts.GetContext(name)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get context with name %q: %w", name, err)
 	}
+
 	fmt.Println(context.String())
 	return nil
 }

src/cmd/get/contexts/contexts.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/silphid/yey/src/internal/core"
+	yey "github.com/silphid/yey/src/internal"
+
 	"github.com/spf13/cobra"
 )
 
@@ -21,14 +22,11 @@ func New() *cobra.Command {
 }
 
 func run() error {
-	c, err := core.New()
+	contexts, err := yey.ReadAndParseContextFile()
 	if err != nil {
 		return err
 	}
-	names, err := c.GetContextNames()
-	if err != nil {
-		return err
-	}
-	fmt.Println(strings.Join(names, "\n"))
+
+	fmt.Println(strings.Join(contexts.GetNames(), "\n"))
 	return nil
 }

src/cmd/get/get.go

@@ -1,20 +1,13 @@
 package get
 
 import (
-	"github.com/silphid/yey/src/cmd/get/containers"
-	"github.com/silphid/yey/src/cmd/get/context"
-	"github.com/silphid/yey/src/cmd/get/contexts"
 	"github.com/spf13/cobra"
 )
 
 // New creates a cobra command
 func New() *cobra.Command {
-	c := &cobra.Command{
+	return &cobra.Command{
 		Use:   "get",
 		Short: "Displays value(s) of entity or variable",
 	}
-	c.AddCommand(containers.New())
-	c.AddCommand(context.New())
-	c.AddCommand(contexts.New())
-	return c
 }

src/cmd/start/start.go

@@ -38,7 +38,7 @@ func run(ctx context.Context, name string) error {
 		var err error
 		name, err = cmd.PromptContext(contexts)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to prompt for desired context: %w", err)
 		}
 	}
 
@@ -49,7 +49,7 @@ func run(ctx context.Context, name string) error {
 
 	shortImageName, err := docker.GetShortImageName(yeyContext.Image)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get short image name for context.image: %w", err)
 	}
 
 	containerName := fmt.Sprintf("yey-%s-%s", shortImageName, yeyContext.Name)

src/internal/contain/contain_test.go → src/internal/docker/image_test.go

@@ -1,13 +1,12 @@
-package contain
+package docker
 
 import (
 	"testing"
 
-	_assert "github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetShortImageName(t *testing.T) {
-	assert := _assert.New(t)
 
 	cases := []struct {
 		name     string
@@ -49,17 +48,18 @@ func TestGetShortImageName(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
+			r := require.New(t)
 
-			actual, err := getShortImageName(c.image)
+			actual, err := GetShortImageName(c.image)
 
 			if c.error != "" {
-				assert.NotNil(err)
-				assert.Equal(c.error, err.Error())
+				r.NotNil(err)
+				r.Equal(c.error, err.Error())
 				return
 			}
 
-			assert.NoError(err)
-			assert.Equal(c.expected, actual)
+			r.NoError(err)
+			r.Equal(c.expected, actual)
 		})
 	}
 }

src/main.go

@@ -1,23 +1,45 @@
 package main
 
 import (
+	"context"
 	"os"
+	"os/signal"
 
 	"github.com/silphid/yey/src/cmd"
+
 	"github.com/silphid/yey/src/cmd/get"
+
+	getcontainers "github.com/silphid/yey/src/cmd/get/containers"
+	getcontext "github.com/silphid/yey/src/cmd/get/context"
+	getcontexts "github.com/silphid/yey/src/cmd/get/contexts"
+
 	"github.com/silphid/yey/src/cmd/start"
 	"github.com/silphid/yey/src/cmd/versioning"
 )
 
 var version string
 
 func main() {
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer stop()
+
+	go func() {
+		<-ctx.Done()
+		stop()
+	}()
+
 	rootCmd := cmd.NewRoot()
 	rootCmd.AddCommand(start.New())
-	rootCmd.AddCommand(get.New())
 	rootCmd.AddCommand(versioning.New(version))
 
-	if err := rootCmd.Execute(); err != nil {
+	getCMD := get.New()
+	getCMD.AddCommand(getcontext.New())
+	getCMD.AddCommand(getcontexts.New())
+	getCMD.AddCommand(getcontainers.New())
+
+	rootCmd.AddCommand(getCMD)
+
+	if err := rootCmd.ExecuteContext(ctx); err != nil {
 		os.Exit(-1)
 	}
 }