feat: 更新模块路径为 v2,修正文档和代码中的相关引用
This commit is contained in:
@@ -10,8 +10,8 @@ import (
|
||||
|
||||
_ "github.com/lib/pq"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/pkg/utils"
|
||||
"go.ipao.vip/atomctl/pkg/utils/generator"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/generator"
|
||||
)
|
||||
|
||||
func CommandGenEnum(root *cobra.Command) {
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
astModel "go.ipao.vip/atomctl/pkg/ast/model"
|
||||
astModel "go.ipao.vip/atomctl/v2/pkg/ast/model"
|
||||
|
||||
"github.com/go-jet/jet/v2/generator/metadata"
|
||||
"github.com/go-jet/jet/v2/generator/postgres"
|
||||
@@ -19,22 +19,22 @@ import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/viper"
|
||||
"go.ipao.vip/atomctl/pkg/ast/model"
|
||||
pgDatabase "go.ipao.vip/atomctl/pkg/postgres"
|
||||
"go.ipao.vip/atomctl/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/v2/pkg/ast/model"
|
||||
pgDatabase "go.ipao.vip/atomctl/v2/pkg/postgres"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
)
|
||||
|
||||
func CommandGenModel(root *cobra.Command) {
|
||||
cmd := &cobra.Command{
|
||||
Use: "model",
|
||||
Aliases: []string{"m"},
|
||||
Short: "Generate jet models",
|
||||
RunE: commandGenModelE,
|
||||
}
|
||||
cmd := &cobra.Command{
|
||||
Use: "model",
|
||||
Aliases: []string{"m"},
|
||||
Short: "Generate jet models",
|
||||
RunE: commandGenModelE,
|
||||
}
|
||||
|
||||
cmd.Flags().String("schema", "", "Override database schema")
|
||||
cmd.Flags().Bool("rename-schemas", true, "Rename generated database/<db> to database/schemas")
|
||||
cmd.Flags().String("schemas-out", "database/schemas", "Schemas output directory when renaming")
|
||||
cmd.Flags().String("schema", "", "Override database schema")
|
||||
cmd.Flags().Bool("rename-schemas", true, "Rename generated database/<db> to database/schemas")
|
||||
cmd.Flags().String("schemas-out", "database/schemas", "Schemas output directory when renaming")
|
||||
|
||||
root.AddCommand(cmd)
|
||||
}
|
||||
@@ -44,15 +44,15 @@ func commandGenModelE(cmd *cobra.Command, args []string) error {
|
||||
return errors.Wrap(err, "parse go.mod")
|
||||
}
|
||||
|
||||
_, dbConf, err := pgDatabase.GetDB(cmd.Flag("config").Value.String())
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "get db")
|
||||
}
|
||||
_, dbConf, err := pgDatabase.GetDB(cmd.Flag("config").Value.String())
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "get db")
|
||||
}
|
||||
|
||||
// optional schema override
|
||||
if s := cmd.Flag("schema").Value.String(); s != "" {
|
||||
dbConf.Schema = s
|
||||
}
|
||||
// optional schema override
|
||||
if s := cmd.Flag("schema").Value.String(); s != "" {
|
||||
dbConf.Schema = s
|
||||
}
|
||||
|
||||
v := viper.New()
|
||||
v.SetConfigType("yaml")
|
||||
@@ -175,16 +175,16 @@ func commandGenModelE(cmd *cobra.Command, args []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if rename, _ := cmd.Flags().GetBool("rename-schemas"); rename {
|
||||
out := cmd.Flag("schemas-out").Value.String()
|
||||
if err := os.RemoveAll(out); err != nil {
|
||||
return err
|
||||
}
|
||||
dataPath := fmt.Sprintf("database/%s", cfg.Database)
|
||||
if err := os.Rename(dataPath, out); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if rename, _ := cmd.Flags().GetBool("rename-schemas"); rename {
|
||||
out := cmd.Flag("schemas-out").Value.String()
|
||||
if err := os.RemoveAll(out); err != nil {
|
||||
return err
|
||||
}
|
||||
dataPath := fmt.Sprintf("database/%s", cfg.Database)
|
||||
if err := os.Rename(dataPath, out); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if err := astModel.Generate(generatedTables, transformer); err != nil {
|
||||
return err
|
||||
|
||||
@@ -6,11 +6,11 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"go.ipao.vip/atomctl/pkg/ast/provider"
|
||||
"go.ipao.vip/atomctl/pkg/utils/gomod"
|
||||
"github.com/samber/lo"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/v2/pkg/ast/provider"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
)
|
||||
|
||||
func CommandGenProvider(root *cobra.Command) {
|
||||
|
||||
@@ -10,40 +10,40 @@ import (
|
||||
"github.com/samber/lo"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/pkg/ast/route"
|
||||
"go.ipao.vip/atomctl/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/v2/pkg/ast/route"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
)
|
||||
|
||||
func CommandGenRoute(root *cobra.Command) {
|
||||
cmd := &cobra.Command{
|
||||
Use: "route",
|
||||
Short: "generate routes",
|
||||
RunE: commandGenRouteE,
|
||||
PostRunE: commandGenProviderE,
|
||||
}
|
||||
cmd := &cobra.Command{
|
||||
Use: "route",
|
||||
Short: "generate routes",
|
||||
RunE: commandGenRouteE,
|
||||
PostRunE: commandGenProviderE,
|
||||
}
|
||||
|
||||
cmd.Flags().String("path", ".", "Base path to scan (defaults to CWD)")
|
||||
cmd.Flags().String("path", ".", "Base path to scan (defaults to CWD)")
|
||||
|
||||
root.AddCommand(cmd)
|
||||
root.AddCommand(cmd)
|
||||
}
|
||||
|
||||
// https://go.ipao.vip/atomctl/pkg/swag?tab=readme-ov-file#api-operation
|
||||
// https://go.ipao.vip/atomctl/v2/pkg/swag?tab=readme-ov-file#api-operation
|
||||
func commandGenRouteE(cmd *cobra.Command, args []string) error {
|
||||
var err error
|
||||
var path string
|
||||
if len(args) > 0 {
|
||||
path = args[0]
|
||||
} else {
|
||||
path, err = os.Getwd()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
var err error
|
||||
var path string
|
||||
if len(args) > 0 {
|
||||
path = args[0]
|
||||
} else {
|
||||
path, err = os.Getwd()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// allow overriding via --path flag
|
||||
if f := cmd.Flag("path"); f != nil && f.Value.String() != "." && f.Value.String() != "" {
|
||||
path = f.Value.String()
|
||||
}
|
||||
// allow overriding via --path flag
|
||||
if f := cmd.Flag("path"); f != nil && f.Value.String() != "." && f.Value.String() != "" {
|
||||
path = f.Value.String()
|
||||
}
|
||||
|
||||
path, _ = filepath.Abs(path)
|
||||
|
||||
|
||||
@@ -3,24 +3,24 @@ package cmd
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.ipao.vip/atomctl/pkg/postgres"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/pressly/goose/v3"
|
||||
"github.com/samber/lo"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/v2/pkg/postgres"
|
||||
)
|
||||
|
||||
// migrate
|
||||
func CommandMigrate(root *cobra.Command) {
|
||||
cmd := &cobra.Command{
|
||||
Use: "migrate [up|up-by-one|up-to|create|down|down-to|fix|redo|reset|status|version]",
|
||||
Aliases: []string{"m"},
|
||||
RunE: commandMigrate,
|
||||
}
|
||||
cmd.Flags().StringP("config", "c", "config.toml", "database config file")
|
||||
cmd.Flags().String("dir", "database/migrations", "migrations directory")
|
||||
cmd.Flags().String("table", "migrations", "migrations table name")
|
||||
cmd := &cobra.Command{
|
||||
Use: "migrate [up|up-by-one|up-to|create|down|down-to|fix|redo|reset|status|version]",
|
||||
Aliases: []string{"m"},
|
||||
RunE: commandMigrate,
|
||||
}
|
||||
cmd.Flags().StringP("config", "c", "config.toml", "database config file")
|
||||
cmd.Flags().String("dir", "database/migrations", "migrations directory")
|
||||
cmd.Flags().String("table", "migrations", "migrations table name")
|
||||
|
||||
root.AddCommand(cmd)
|
||||
}
|
||||
@@ -41,13 +41,13 @@ func commandMigrate(cmd *cobra.Command, args []string) error {
|
||||
return errors.Wrap(err, "get db")
|
||||
}
|
||||
|
||||
action, args := args[0], args[1:]
|
||||
log.Infof("migration action: %s args: %+v", action, args)
|
||||
action, args := args[0], args[1:]
|
||||
log.Infof("migration action: %s args: %+v", action, args)
|
||||
|
||||
dir := cmd.Flag("dir").Value.String()
|
||||
table := cmd.Flag("table").Value.String()
|
||||
dir := cmd.Flag("dir").Value.String()
|
||||
table := cmd.Flag("table").Value.String()
|
||||
|
||||
goose.SetTableName(table)
|
||||
goose.SetTableName(table)
|
||||
|
||||
return goose.RunContext(context.Background(), action, db, dir, args...)
|
||||
return goose.RunContext(context.Background(), action, db, dir, args...)
|
||||
}
|
||||
|
||||
168
cmd/new_event.go
168
cmd/new_event.go
@@ -1,45 +1,45 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"text/template"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"text/template"
|
||||
|
||||
"go.ipao.vip/atomctl/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/templates"
|
||||
"github.com/samber/lo"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/v2/templates"
|
||||
)
|
||||
|
||||
// CommandNewProvider 注册 new_provider 命令
|
||||
func CommandNewEvent(root *cobra.Command) {
|
||||
cmd := &cobra.Command{
|
||||
Use: "event",
|
||||
Aliases: []string{"e"},
|
||||
Short: "创建新的 event publish & subscriber",
|
||||
Args: cobra.ExactArgs(1),
|
||||
RunE: commandNewEventE,
|
||||
}
|
||||
cmd := &cobra.Command{
|
||||
Use: "event",
|
||||
Aliases: []string{"e"},
|
||||
Short: "创建新的 event publish & subscriber",
|
||||
Args: cobra.ExactArgs(1),
|
||||
RunE: commandNewEventE,
|
||||
}
|
||||
|
||||
cmd.Flags().String("only", "", "仅生成: publisher 或 subscriber")
|
||||
cmd.Flags().String("only", "", "仅生成: publisher 或 subscriber")
|
||||
|
||||
root.AddCommand(cmd)
|
||||
root.AddCommand(cmd)
|
||||
}
|
||||
|
||||
func commandNewEventE(cmd *cobra.Command, args []string) error {
|
||||
snakeName := lo.SnakeCase(args[0])
|
||||
camelName := lo.PascalCase(args[0])
|
||||
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
only, _ := cmd.Flags().GetString("only")
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
only, _ := cmd.Flags().GetString("only")
|
||||
|
||||
publisherPath := filepath.Join(baseDir, "app/events/publishers")
|
||||
subscriberPath := filepath.Join(baseDir, "app/events/subscribers")
|
||||
publisherPath := filepath.Join(baseDir, "app/events/publishers")
|
||||
subscriberPath := filepath.Join(baseDir, "app/events/subscribers")
|
||||
|
||||
path, err := os.Getwd()
|
||||
if err != nil {
|
||||
@@ -52,17 +52,17 @@ func commandNewEventE(cmd *cobra.Command, args []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", publisherPath)
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", subscriberPath)
|
||||
} else {
|
||||
if err := os.MkdirAll(publisherPath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.MkdirAll(subscriberPath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", publisherPath)
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", subscriberPath)
|
||||
} else {
|
||||
if err := os.MkdirAll(publisherPath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.MkdirAll(subscriberPath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
err = fs.WalkDir(templates.Events, "events", func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
@@ -77,59 +77,73 @@ func commandNewEventE(cmd *cobra.Command, args []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
var destPath string
|
||||
if relPath == "publisher.go.tpl" {
|
||||
if only == "subscriber" { return nil }
|
||||
destPath = filepath.Join(publisherPath, snakeName+".go")
|
||||
} else if relPath == "subscriber.go.tpl" {
|
||||
if only == "publisher" { return nil }
|
||||
destPath = filepath.Join(subscriberPath, snakeName+".go")
|
||||
} else { return nil }
|
||||
var destPath string
|
||||
if relPath == "publisher.go.tpl" {
|
||||
if only == "subscriber" {
|
||||
return nil
|
||||
}
|
||||
destPath = filepath.Join(publisherPath, snakeName+".go")
|
||||
} else if relPath == "subscriber.go.tpl" {
|
||||
if only == "publisher" {
|
||||
return nil
|
||||
}
|
||||
destPath = filepath.Join(subscriberPath, snakeName+".go")
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
|
||||
tmpl, err := template.ParseFS(templates.Events, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] render > %s\n", destPath)
|
||||
return nil
|
||||
}
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] render > %s\n", destPath)
|
||||
return nil
|
||||
}
|
||||
|
||||
destFile, err := os.Create(destPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer destFile.Close()
|
||||
destFile, err := os.Create(destPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer destFile.Close()
|
||||
|
||||
return tmpl.Execute(destFile, map[string]string{
|
||||
"Name": camelName,
|
||||
"ModuleName": gomod.GetModuleName(),
|
||||
})
|
||||
})
|
||||
return tmpl.Execute(destFile, map[string]string{
|
||||
"Name": camelName,
|
||||
"ModuleName": gomod.GetModuleName(),
|
||||
})
|
||||
})
|
||||
|
||||
// 写入或追加 topic 常量,避免重复。
|
||||
topicsPath := filepath.Join(baseDir, "app/events/topics.go")
|
||||
topicLine := fmt.Sprintf("const Topic%s = %q\n", camelName, snakeName)
|
||||
// 写入或追加 topic 常量,避免重复。
|
||||
topicsPath := filepath.Join(baseDir, "app/events/topics.go")
|
||||
topicLine := fmt.Sprintf("const Topic%s = %q\n", camelName, snakeName)
|
||||
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] ensure topics file and add constant > %s\n", topicsPath)
|
||||
} else {
|
||||
// ensure file exists with basic header
|
||||
if _, statErr := os.Stat(topicsPath); os.IsNotExist(statErr) {
|
||||
if err := os.MkdirAll(filepath.Dir(topicsPath), os.ModePerm); err != nil { return err }
|
||||
header := "package events\n\n// topics generated by atomctl\n\n"
|
||||
if err := os.WriteFile(topicsPath, []byte(header), 0o644); err != nil { return err }
|
||||
}
|
||||
// check duplicate
|
||||
content, _ := os.ReadFile(topicsPath)
|
||||
if !strings.Contains(string(content), "Topic"+camelName+" ") && !strings.Contains(string(content), topicLine) {
|
||||
f, err := os.OpenFile(topicsPath, os.O_APPEND|os.O_WRONLY, 0o644)
|
||||
if err != nil { return err }
|
||||
defer f.Close()
|
||||
if _, err := f.WriteString(topicLine); err != nil { return err }
|
||||
}
|
||||
}
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] ensure topics file and add constant > %s\n", topicsPath)
|
||||
} else {
|
||||
// ensure file exists with basic header
|
||||
if _, statErr := os.Stat(topicsPath); os.IsNotExist(statErr) {
|
||||
if err := os.MkdirAll(filepath.Dir(topicsPath), os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
header := "package events\n\n// topics generated by atomctl\n\n"
|
||||
if err := os.WriteFile(topicsPath, []byte(header), 0o644); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
// check duplicate
|
||||
content, _ := os.ReadFile(topicsPath)
|
||||
if !strings.Contains(string(content), "Topic"+camelName+" ") && !strings.Contains(string(content), topicLine) {
|
||||
f, err := os.OpenFile(topicsPath, os.O_APPEND|os.O_WRONLY, 0o644)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer f.Close()
|
||||
if _, err := f.WriteString(topicLine); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Printf("event 已创建: %s\n", snakeName)
|
||||
return nil
|
||||
|
||||
@@ -7,10 +7,10 @@ import (
|
||||
"path/filepath"
|
||||
"text/template"
|
||||
|
||||
"go.ipao.vip/atomctl/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/templates"
|
||||
"github.com/samber/lo"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/v2/templates"
|
||||
)
|
||||
|
||||
// CommandNewProvider 注册 new_provider 命令
|
||||
@@ -26,14 +26,14 @@ func CommandNewJob(root *cobra.Command) {
|
||||
}
|
||||
|
||||
func commandNewJobE(cmd *cobra.Command, args []string) error {
|
||||
snakeName := lo.SnakeCase(args[0])
|
||||
camelName := lo.PascalCase(args[0])
|
||||
snakeName := lo.SnakeCase(args[0])
|
||||
camelName := lo.PascalCase(args[0])
|
||||
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
|
||||
basePath := filepath.Join(baseDir, "app/jobs")
|
||||
basePath := filepath.Join(baseDir, "app/jobs")
|
||||
|
||||
path, err := os.Getwd()
|
||||
if err != nil {
|
||||
@@ -46,13 +46,13 @@ func commandNewJobE(cmd *cobra.Command, args []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", basePath)
|
||||
} else {
|
||||
if err := os.MkdirAll(basePath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", basePath)
|
||||
} else {
|
||||
if err := os.MkdirAll(basePath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
err = fs.WalkDir(templates.Jobs, "jobs", func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
@@ -63,27 +63,27 @@ func commandNewJobE(cmd *cobra.Command, args []string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
filePath := filepath.Join(basePath, snakeName+".go")
|
||||
tmpl, err := template.ParseFS(templates.Jobs, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
filePath := filepath.Join(basePath, snakeName+".go")
|
||||
tmpl, err := template.ParseFS(templates.Jobs, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] render > %s\n", filePath)
|
||||
return nil
|
||||
}
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] render > %s\n", filePath)
|
||||
return nil
|
||||
}
|
||||
|
||||
destFile, err := os.Create(filePath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer destFile.Close()
|
||||
destFile, err := os.Create(filePath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer destFile.Close()
|
||||
|
||||
return tmpl.Execute(destFile, map[string]string{
|
||||
"Name": camelName,
|
||||
"ModuleName": gomod.GetModuleName(),
|
||||
})
|
||||
return tmpl.Execute(destFile, map[string]string{
|
||||
"Name": camelName,
|
||||
"ModuleName": gomod.GetModuleName(),
|
||||
})
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -9,11 +9,11 @@ import (
|
||||
"strings"
|
||||
"text/template"
|
||||
|
||||
"go.ipao.vip/atomctl/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/templates"
|
||||
"github.com/samber/lo"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/v2/templates"
|
||||
)
|
||||
|
||||
func CommandNewModule(root *cobra.Command) {
|
||||
|
||||
@@ -13,8 +13,8 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/templates"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
"go.ipao.vip/atomctl/v2/templates"
|
||||
)
|
||||
|
||||
// 验证包名是否合法:支持域名、路径分隔符和常见字符
|
||||
@@ -36,14 +36,14 @@ func CommandNewProject(root *cobra.Command) {
|
||||
}
|
||||
|
||||
func commandNewProjectE(cmd *cobra.Command, args []string) error {
|
||||
var (
|
||||
moduleName string
|
||||
inPlace bool
|
||||
)
|
||||
var (
|
||||
moduleName string
|
||||
inPlace bool
|
||||
)
|
||||
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
|
||||
if len(args) == 0 {
|
||||
if _, err := os.Stat("go.mod"); err == nil {
|
||||
@@ -76,27 +76,27 @@ func commandNewProjectE(cmd *cobra.Command, args []string) error {
|
||||
|
||||
force, _ := cmd.Flags().GetBool("force")
|
||||
|
||||
rootDir := "."
|
||||
if !inPlace {
|
||||
// honor base dir when creating a new project
|
||||
rootDir = filepath.Join(baseDir, projectInfo.ProjectName)
|
||||
if _, err := os.Stat(rootDir); err == nil {
|
||||
if !force {
|
||||
return fmt.Errorf("project directory %s already exists", rootDir)
|
||||
}
|
||||
log.Warnf("强制删除已存在的目录: %s", rootDir)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] 将删除目录: %s", rootDir)
|
||||
} else if err := os.RemoveAll(rootDir); err != nil {
|
||||
return fmt.Errorf("failed to remove existing directory: %v", err)
|
||||
}
|
||||
}
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] 将创建目录: %s", rootDir)
|
||||
} else if err := os.MkdirAll(rootDir, 0o755); err != nil {
|
||||
return fmt.Errorf("failed to create project directory: %v", err)
|
||||
}
|
||||
}
|
||||
rootDir := "."
|
||||
if !inPlace {
|
||||
// honor base dir when creating a new project
|
||||
rootDir = filepath.Join(baseDir, projectInfo.ProjectName)
|
||||
if _, err := os.Stat(rootDir); err == nil {
|
||||
if !force {
|
||||
return fmt.Errorf("project directory %s already exists", rootDir)
|
||||
}
|
||||
log.Warnf("强制删除已存在的目录: %s", rootDir)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] 将删除目录: %s", rootDir)
|
||||
} else if err := os.RemoveAll(rootDir); err != nil {
|
||||
return fmt.Errorf("failed to remove existing directory: %v", err)
|
||||
}
|
||||
}
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] 将创建目录: %s", rootDir)
|
||||
} else if err := os.MkdirAll(rootDir, 0o755); err != nil {
|
||||
return fmt.Errorf("failed to create project directory: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := fs.WalkDir(templates.Project, "project", func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
@@ -115,14 +115,14 @@ func commandNewProjectE(cmd *cobra.Command, args []string) error {
|
||||
}
|
||||
|
||||
targetPath := filepath.Join(rootDir, relPath)
|
||||
if d.IsDir() {
|
||||
log.Infof("创建目录: %s", targetPath)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] mkdir -p %s", targetPath)
|
||||
return nil
|
||||
}
|
||||
return os.MkdirAll(targetPath, 0o755)
|
||||
}
|
||||
if d.IsDir() {
|
||||
log.Infof("创建目录: %s", targetPath)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] mkdir -p %s", targetPath)
|
||||
return nil
|
||||
}
|
||||
return os.MkdirAll(targetPath, 0o755)
|
||||
}
|
||||
|
||||
content, err := templates.Project.ReadFile(path)
|
||||
if err != nil {
|
||||
@@ -164,28 +164,28 @@ func commandNewProjectE(cmd *cobra.Command, args []string) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
log.Infof("[渲染] 文件: %s", targetPath)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] render > %s", targetPath)
|
||||
return nil
|
||||
}
|
||||
f, err := os.Create(targetPath)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "创建文件失败 %s", targetPath)
|
||||
}
|
||||
defer f.Close()
|
||||
return tmpl.Execute(f, projectInfo)
|
||||
}
|
||||
log.Infof("[渲染] 文件: %s", targetPath)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] render > %s", targetPath)
|
||||
return nil
|
||||
}
|
||||
f, err := os.Create(targetPath)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "创建文件失败 %s", targetPath)
|
||||
}
|
||||
defer f.Close()
|
||||
return tmpl.Execute(f, projectInfo)
|
||||
}
|
||||
|
||||
log.Infof("[复制] 文件: %s", targetPath)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] write > %s", targetPath)
|
||||
return nil
|
||||
}
|
||||
return os.WriteFile(targetPath, content, 0o644)
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
log.Infof("[复制] 文件: %s", targetPath)
|
||||
if dryRun {
|
||||
log.Infof("[dry-run] write > %s", targetPath)
|
||||
return nil
|
||||
}
|
||||
return os.WriteFile(targetPath, content, 0o644)
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if inPlace {
|
||||
log.Info("🎉 项目初始化成功 (当前目录)!")
|
||||
|
||||
@@ -9,9 +9,9 @@ import (
|
||||
"strings"
|
||||
"text/template"
|
||||
|
||||
"go.ipao.vip/atomctl/templates"
|
||||
"github.com/iancoleman/strcase"
|
||||
"github.com/spf13/cobra"
|
||||
"go.ipao.vip/atomctl/v2/templates"
|
||||
)
|
||||
|
||||
// CommandNewProvider 注册 new_provider 命令
|
||||
@@ -27,24 +27,24 @@ func CommandNewProvider(root *cobra.Command) {
|
||||
}
|
||||
|
||||
func commandNewProviderE(cmd *cobra.Command, args []string) error {
|
||||
providerName := args[0]
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
providerName := args[0]
|
||||
// shared flags
|
||||
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
||||
baseDir, _ := cmd.Flags().GetString("dir")
|
||||
|
||||
targetPath := filepath.Join(baseDir, "providers", providerName)
|
||||
targetPath := filepath.Join(baseDir, "providers", providerName)
|
||||
|
||||
if _, err := os.Stat(targetPath); err == nil {
|
||||
return fmt.Errorf("目录 %s 已存在", targetPath)
|
||||
}
|
||||
if _, err := os.Stat(targetPath); err == nil {
|
||||
return fmt.Errorf("目录 %s 已存在", targetPath)
|
||||
}
|
||||
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", targetPath)
|
||||
} else {
|
||||
if err := os.MkdirAll(targetPath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", targetPath)
|
||||
} else {
|
||||
if err := os.MkdirAll(targetPath, os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
err := fs.WalkDir(templates.Provider, "provider", func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
@@ -59,35 +59,35 @@ func commandNewProviderE(cmd *cobra.Command, args []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
destPath := filepath.Join(targetPath, strings.TrimSuffix(relPath, ".tpl"))
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", filepath.Dir(destPath))
|
||||
} else {
|
||||
if err := os.MkdirAll(filepath.Dir(destPath), os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
destPath := filepath.Join(targetPath, strings.TrimSuffix(relPath, ".tpl"))
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] mkdir -p %s\n", filepath.Dir(destPath))
|
||||
} else {
|
||||
if err := os.MkdirAll(filepath.Dir(destPath), os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
tmpl, err := template.ParseFS(templates.Provider, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] render > %s\n", destPath)
|
||||
return nil
|
||||
}
|
||||
if dryRun {
|
||||
fmt.Printf("[dry-run] render > %s\n", destPath)
|
||||
return nil
|
||||
}
|
||||
|
||||
destFile, err := os.Create(destPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer destFile.Close()
|
||||
destFile, err := os.Create(destPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer destFile.Close()
|
||||
|
||||
return tmpl.Execute(destFile, map[string]string{
|
||||
"Name": providerName,
|
||||
"CamelName": strcase.ToCamel(providerName),
|
||||
})
|
||||
return tmpl.Execute(destFile, map[string]string{
|
||||
"Name": providerName,
|
||||
"CamelName": strcase.ToCamel(providerName),
|
||||
})
|
||||
})
|
||||
if err != nil {
|
||||
return errors.New("渲染 provider 模板失败")
|
||||
|
||||
Reference in New Issue
Block a user