Merge pull request #124 from kcmvp/scaffold

code refactor

.gitignore

@@ -20,7 +20,6 @@
 # Go workspace file
 go.work
 .idea
-gob
 11.json
 target
 *.sql

cmd/gbc/artifact/plugin.go → cmd/gob/artifact/plugin.go

@@ -34,8 +34,7 @@ func (plugin *Plugin) init() error {
 	plugin.version = "latest"
 	plugin.Url = strings.TrimSpace(plugin.Url)
 	reg := regexp.MustCompile(`@\S*`)
-	matches := reg.FindAllString(plugin.Url, -1)
-	if len(matches) > 0 {
+	if matches := reg.FindAllString(plugin.Url, -1); len(matches) > 0 {
 		plugin.version = strings.Trim(matches[0], "@")
 	}
 	plugin.Url = reg.ReplaceAllString(plugin.Url, "")

cmd/gbc/artifact/internal_plugin_test.go → cmd/gob/artifact/plugin_test.go

@@ -16,7 +16,7 @@ import (
 
 type InternalPluginTestSuit struct {
 	suite.Suite
-	lintLatestVersion      string
+	//lintLatestVersion      string
 	gotestsumLatestVersion string
 }
 
@@ -27,7 +27,6 @@ func (suite *InternalPluginTestSuit) TearDownSuite() {
 
 func TestInternalPluginSuite(t *testing.T) {
 	suite.Run(t, &InternalPluginTestSuit{
-		lintLatestVersion:      LatestVersion(false, "github.com/golangci/golangci-lint")[0].B,
 		gotestsumLatestVersion: LatestVersion(false, "gotest.tools/gotestsum")[0].B,
 	})
 }
@@ -45,22 +44,6 @@ func (suite *InternalPluginTestSuit) TestNewPlugin() {
 		binary  string
 		wantErr bool
 	}{
-		{
-			name:    "without version",
-			url:     "github.com/golangci/golangci-lint/cmd/golangci-lint",
-			module:  "github.com/golangci/golangci-lint",
-			logName: "golangci-lint",
-			binary:  fmt.Sprintf("%s-%s", "golangci-lint", suite.lintLatestVersion),
-			wantErr: false,
-		},
-		{
-			name:    "latest version",
-			url:     "github.com/golangci/golangci-lint/cmd/golangci-lint@latest",
-			module:  "github.com/golangci/golangci-lint",
-			logName: "golangci-lint",
-			binary:  fmt.Sprintf("%s-%s", "golangci-lint", suite.lintLatestVersion),
-			wantErr: false,
-		},
 		{
 			name:    "specific version",
 			url:     "github.com/golangci/golangci-lint/cmd/[email protected]",
@@ -120,23 +103,15 @@ func (suite *InternalPluginTestSuit) TestUnmarshalJSON() {
 	defer func() {
 		os.RemoveAll(gopath)
 	}()
-	data, _ := os.ReadFile(filepath.Join(CurProject().Root(), "cmd", "gbc", "command", "resources", "config.json"))
+	data, _ := os.ReadFile(filepath.Join(CurProject().Root(), "cmd", "gob", "command", "resources", "config.json"))
 	v := gjson.GetBytes(data, "gbc_init.plugins")
 	var plugins []Plugin
 	err := json.Unmarshal([]byte(v.Raw), &plugins)
 	t := suite.T()
 	assert.NoError(t, err)
 	assert.Equal(t, 2, len(plugins))
-	plugin, ok := lo.Find(plugins, func(plugin Plugin) bool {
-		return plugin.Url == "github.com/golangci/golangci-lint/cmd/golangci-lint"
-	})
-	assert.True(t, ok)
-	assert.Equal(t, suite.lintLatestVersion, plugin.Version())
-	assert.Equal(t, "golangci-lint", plugin.Name())
-	assert.Equal(t, "github.com/golangci/golangci-lint", plugin.Module())
-	assert.Equal(t, "lint", plugin.Alias)
 	// no command
-	plugin, ok = lo.Find(plugins, func(plugin Plugin) bool {
+	plugin, ok := lo.Find(plugins, func(plugin Plugin) bool {
 		return plugin.Url == "gotest.tools/gotestsum"
 	})
 	assert.True(t, ok)

cmd/gbc/artifact/project_test.go → cmd/gob/artifact/project_test.go

@@ -23,7 +23,7 @@ type ProjectTestSuite struct {
 }
 
 func (suite *ProjectTestSuite) BeforeTest(_, testName string) {
-	s, _ := os.Open(filepath.Join(CurProject().Root(), "cmd", "gbc", "testdata", "gob.yaml"))
+	s, _ := os.Open(filepath.Join(CurProject().Root(), "cmd", "gob", "testdata", "gob.yaml"))
 	root := filepath.Join(CurProject().Root(), "target", fmt.Sprintf("artifact_ProjectTestSuite_%s", testName))
 	os.MkdirAll(root, os.ModePerm)
 	t, _ := os.Create(filepath.Join(root, "gob.yaml"))
@@ -126,7 +126,7 @@ func (suite *ProjectTestSuite) TestValidate() {
 func (suite *ProjectTestSuite) TestMainFiles() {
 	mainFiles := CurProject().MainFiles()
 	assert.Equal(suite.T(), 1, len(mainFiles))
-	assert.True(suite.T(), lo.Contains(mainFiles, filepath.Join(CurProject().Root(), "cmd", "gbc", "gbc.go")))
+	assert.True(suite.T(), lo.Contains(mainFiles, filepath.Join(CurProject().Root(), "cmd", "gob", "gob.go")))
 }
 
 func (suite *ProjectTestSuite) TestVersion() {

cmd/gbc/command/build_action.go → cmd/gob/command/build_action.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/kcmvp/gob/cmd/gbc/artifact" //nolint
+	"github.com/kcmvp/gob/cmd/gob/artifact" //nolint
 	"os"
 	"os/exec"
 	"path/filepath"

cmd/gbc/command/build_action_test.go → cmd/gob/command/build_action_test.go

@@ -2,7 +2,7 @@ package command
 
 import (
 	"github.com/fatih/color"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/kcmvp/gob/utils"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
@@ -30,7 +30,7 @@ func (suite *ActionTestSuite) TearDownSuite() {
 func (suite *ActionTestSuite) TestActionBuild() {
 	err := buildAction(nil)
 	assert.NoError(suite.T(), err)
-	binary := filepath.Join(artifact.CurProject().Target(), lo.If(artifact.Windows(), "gbc.exe").Else("gbc"))
+	binary := filepath.Join(artifact.CurProject().Target(), lo.If(artifact.Windows(), "gob.exe").Else("gob"))
 	_, err = os.Stat(binary)
 	assert.NoError(suite.T(), err)
 }

cmd/gbc/command/deps.go → cmd/gob/command/deps.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kcmvp/gob/cmd/gbc/artifact" //nolint
+	"github.com/kcmvp/gob/cmd/gob/artifact" //nolint
 
 	"github.com/fatih/color"
 	"github.com/samber/lo"

cmd/gbc/command/deps_test.go → cmd/gob/command/deps_test.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"

cmd/gbc/command/exec.go → cmd/gob/command/exec.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 )

cmd/gbc/command/exec_test.go → cmd/gob/command/exec_test.go

@@ -2,7 +2,7 @@ package command
 
 import (
 	"fmt"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/kcmvp/gob/utils"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
@@ -20,7 +20,7 @@ type ExecTestSuite struct {
 
 func (suite *ExecTestSuite) BeforeTest(_, testName string) {
 	os.Chdir(artifact.CurProject().Root())
-	s, _ := os.Open(filepath.Join(artifact.CurProject().Root(), "cmd", "gbc", "testdata", "gob.yaml"))
+	s, _ := os.Open(filepath.Join(artifact.CurProject().Root(), "cmd", "gob", "testdata", "gob.yaml"))
 	_, method := utils.TestCaller()
 	root := filepath.Join(artifact.CurProject().Root(), "target", strings.ReplaceAll(method, "_BeforeTest", fmt.Sprintf("_%s", testName)))
 	os.MkdirAll(root, os.ModePerm)

cmd/gbc/command/initialize.go → cmd/gob/command/initialize.go

@@ -5,7 +5,7 @@ package command
 
 import (
 	"fmt"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/spf13/cobra"
 )
 

cmd/gbc/command/initialize_test.go → cmd/gob/command/initialize_test.go

@@ -3,7 +3,7 @@ package command
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/kcmvp/gob/utils"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
@@ -29,7 +29,7 @@ func TestInitializeTestSuit(t *testing.T) {
 func (suite *InitializeTestSuite) BeforeTest(_, testName string) {
 	os.Chdir(artifact.CurProject().Root())
 	var s, t *os.File
-	s, _ = os.Open(filepath.Join(artifact.CurProject().Root(), "cmd", "gbc", "testdata", "config.json"))
+	s, _ = os.Open(filepath.Join(artifact.CurProject().Root(), "cmd", "gob", "testdata", "config.json"))
 	_, method := utils.TestCaller()
 	root := filepath.Join(artifact.CurProject().Root(), "target", strings.ReplaceAll(method, "_BeforeTest", fmt.Sprintf("_%s", testName)))
 	os.MkdirAll(root, os.ModePerm)

cmd/gbc/command/plugin.go → cmd/gob/command/plugin.go

@@ -11,7 +11,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/jedib0t/go-pretty/v6/text"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 )

cmd/gbc/command/plugin_test.go → cmd/gob/command/plugin_test.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/kcmvp/gob/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"

cmd/gbc/command/root.go → cmd/gob/command/root.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/fatih/color"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/kcmvp/gob/utils"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"

cmd/gbc/command/root_test.go → cmd/gob/command/root_test.go

@@ -3,7 +3,7 @@ package command
 import (
 	"fmt"
 	"github.com/fatih/color"
-	"github.com/kcmvp/gob/cmd/gbc/artifact"
+	"github.com/kcmvp/gob/cmd/gob/artifact"
 	"github.com/kcmvp/gob/utils"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
@@ -26,7 +26,7 @@ func TestRootTestSuit(t *testing.T) {
 
 func (suite *RootTestSuit) BeforeTest(_, testName string) {
 	os.Chdir(artifact.CurProject().Root())
-	s, _ := os.Open(filepath.Join(artifact.CurProject().Root(), "cmd", "gbc", "testdata", "config.json"))
+	s, _ := os.Open(filepath.Join(artifact.CurProject().Root(), "cmd", "gob", "testdata", "config.json"))
 	_, method := utils.TestCaller()
 	root := filepath.Join(artifact.CurProject().Root(), "target", strings.ReplaceAll(method, "_BeforeTest", fmt.Sprintf("_%s", testName)))
 	os.MkdirAll(root, os.ModePerm)
@@ -149,7 +149,7 @@ func (suite *RootTestSuit) TestRunE() {
 	target := artifact.CurProject().Target()
 	err := rootCmd.RunE(rootCmd, []string{"build"})
 	assert.NoError(suite.T(), err)
-	_, err = os.Stat(filepath.Join(target, lo.If(artifact.Windows(), "gbc.exe").Else("gbc")))
+	_, err = os.Stat(filepath.Join(target, lo.If(artifact.Windows(), "gob.exe").Else("gob")))
 	assert.NoError(suite.T(), err, "binary should be generated")
 	err = rootCmd.RunE(rootCmd, []string{"build", "clean"})
 	assert.NoError(suite.T(), err)

cmd/gbc/gbc.go → cmd/gob/gob.go

@@ -4,7 +4,7 @@ Copyright © 2023 [email protected]
 package main
 
 import (
-	"github.com/kcmvp/gob/cmd/gbc/command"
+	"github.com/kcmvp/gob/cmd/gob/command"
 	"os" //nolint
 )