update command

cmd/generate/crud.go

@@ -1,37 +1,42 @@
-package main
+package generate
 
 import (
 	"fmt"
 	pluralize "github.com/gertd/go-pluralize"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
+	"log"
 	"path"
 	"runtime"
 	"strings"
 )
 
 var PackageName string
 
-var cliCmd = &cobra.Command{
+var PackageRoot string = "src"
+
+var CrudCmd = &cobra.Command{
 	Use:  "crud",
-	Args: cobra.MinimumNArgs(1),
+	Args: cobra.MinimumNArgs(2),
 	RunE: crud,
 }
 
 func crud(cmd *cobra.Command, args []string) error {
 	PackageName = args[0]
 	name := args[1]
 
-	hasDir, _ := afero.DirExists(afero.NewOsFs(), "pkg")
+	hasDir, _ := afero.DirExists(afero.NewOsFs(), PackageRoot)
 	if !hasDir {
-		afero.NewOsFs().Mkdir("pkg", 0755)
+		afero.NewOsFs().Mkdir(PackageRoot, 0755)
 	}
 
-	fs := afero.NewBasePathFs(afero.NewOsFs(), "pkg/")
+	fs := afero.NewBasePathFs(afero.NewOsFs(), PackageRoot+"/")
 
 	createFolders(fs, name)
 	createFiles(fs, name)
 
+	log.Println("Successfully generated CRUD for " + Title(name))
+
 	return nil
 }
 
@@ -59,7 +64,7 @@ func createFile(fs afero.Fs, name string, stubPath, filePath string) {
 	contents, _ := fileContents(stubPath)
 	contents = replaceStub(contents, name)
 
-	err := overwrite("pkg/"+filePath, contents)
+	err := overwrite(PackageRoot+"/"+filePath, contents)
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -84,6 +89,7 @@ func replaceStub(content string, name string) string {
 	content = strings.Replace(content, "{{PluralLowerName}}", Lower(Plural(name)), -1)
 	content = strings.Replace(content, "{{SingularLowerName}}", Lower(Singular(name)), -1)
 	content = strings.Replace(content, "{{PackageName}}", PackageName, -1)
+	content = strings.Replace(content, "{{PackageRoot}}", PackageRoot, -1)
 	return content
 }
 

cmd/generate/stubs/controller.stub

@@ -4,8 +4,8 @@ import "C"
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/shipu/artifact"
-	"{{PackageName}}/pkg/{{SingularLowerName}}/models"
-	"{{PackageName}}/pkg/{{SingularLowerName}}/services"
+	"{{PackageName}}/{{PackageRoot}}/{{SingularLowerName}}/models"
+	"{{PackageName}}/{{PackageRoot}}/{{SingularLowerName}}/services"
 	"net/http"
 )
 
@@ -100,4 +100,4 @@ func {{TitleName}}Delete() gin.HandlerFunc {
 
 		artifact.Res.Status(http.StatusOK).Message("Successfully Delete !!!").Data({{SingularLowerName}}).Json(c)
 	}
-}
+}

cmd/generate/stubs/model.stub

@@ -1,14 +1,18 @@
 package models
 
 import (
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"github.com/shipu/artifact"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
-var {{TitleName}}Collection artifact.MongoCollection = artifact.Mongo.Collection("{{PluralLowerName}}")
+var {{TitleName}}Collection artifact.MongoCollection
 
 type {{TitleName}} struct {
 	Id     primitive.ObjectID `json:"id,omitempty" bson:"_id"`
 	Task   string             `json:"task" bson:"task"`
     Status string             `json:"status" bson:"status"`
 }
+
+func Setup() {
+	{{TitleName}}Collection = artifact.Mongo.Collection("{{PluralLowerName}}")
+}

cmd/generate/stubs/route.stub

@@ -2,13 +2,14 @@ package routes
 
 import (
 	. "github.com/shipu/artifact"
-	c "{{PackageName}}/pkg/{{SingularLowerName}}/controllers"
+	c "{{PackageName}}/{{PackageRoot}}/{{SingularLowerName}}/controllers"
 )
 
 func Setup() {
-	Router.GET("{{PluralLowerName}}", c.{{TitleName}}Index())
-	Router.POST("{{PluralLowerName}}", c.{{TitleName}}Create())
-	Router.GET("{{PluralLowerName}}/:{{SingularLowerName}}Id", c.{{TitleName}}Show())
-	Router.PUT("{{PluralLowerName}}/:{{SingularLowerName}}Id", c.{{TitleName}}Update())
-	Router.DELETE("{{PluralLowerName}}/:{{SingularLowerName}}Id", c.{{TitleName}}Delete())
+    v1 := Router.Group("api/v1")
+	v1.GET("{{PluralLowerName}}", c.{{TitleName}}Index())
+	v1.POST("{{PluralLowerName}}", c.{{TitleName}}Create())
+	v1.GET("{{PluralLowerName}}/:{{SingularLowerName}}Id", c.{{TitleName}}Show())
+	v1.PUT("{{PluralLowerName}}/:{{SingularLowerName}}Id", c.{{TitleName}}Update())
+	v1.DELETE("{{PluralLowerName}}/:{{SingularLowerName}}Id", c.{{TitleName}}Delete())
 }

cmd/generate/stubs/service.stub

@@ -7,7 +7,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"{{PackageName}}/pkg/{{SingularLowerName}}/models"
+	"{{PackageName}}/{{PackageRoot}}/{{SingularLowerName}}/models"
 	"log"
 )
 

cmd/main.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"github.com/shipu/golang-gin-boilerplate/art/cmd/generate"
+	"github.com/spf13/cobra"
+	"log"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "art",
+	Short: "A simple artifact command",
+	Long:  `A simple artifact command`,
+	Run:   hello,
+}
+
+func hello(cmd *cobra.Command, args []string) {
+	log.Println("art command")
+}
+
+func init() {
+	rootCmd.AddCommand(generate.CrudCmd)
+}
+
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		log.Fatal(err)
+	}
+}