mir:update version to v2.7.0; mirc:support custom mir and engine's ve…

…rsion in cli option
alimy · Apr 10, 2021 · 4a66f79 · 4a66f79
1 parent 62ab2a5
commit 4a66f79
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 454 deletions.
diff --git a/mirc/cmd/new.go b/mirc/cmd/new.go
@@ -20,6 +20,8 @@ var (
 	pkgName    string
 	style      []string
 	mirPkgName string
+	mirVersion string
+	engVersion string
 )
 
 func init() {
@@ -35,6 +37,8 @@ func init() {
 	newCmd.Flags().StringVarP(&pkgName, "pkg", "p", "github.com/alimy/mir-example", "project's package name")
 	newCmd.Flags().StringSliceVarP(&style, "style", "s", []string{"gin"}, "generated engine style eg: gin,chi,mux,echo,iris,fiber,fiber-v2,macaron,httprouter")
 	newCmd.Flags().StringVar(&mirPkgName, "mir", "", "mir replace package name or place")
+	newCmd.Flags().StringVar(&mirVersion, "mir-version", "", "set mir version")
+	newCmd.Flags().StringVar(&engVersion, "engine-version", "", "set engine version")
 
 	// register agentCmd as sub-command
 	register(newCmd)
@@ -61,6 +65,8 @@ func newRun(_cmd *cobra.Command, _args []string) {
 	ctx := &templates.TmplCtx{
 		PkgName:    pkgName,
 		MirPkgName: mirPkgName,
+		MirVersion: mirVersion,
+		EngVersion: engVersion,
 	}
 	if err = genProject(ctx, path, style); err != nil {
 		log.Fatal(err)

diff --git a/mirc/cmd/templates/chi/go.mod.tmpl b/mirc/cmd/templates/chi/go.mod.tmpl
@@ -3,8 +3,8 @@ module {{ .PkgName }}
 go 1.16
 
 require (
-	github.com/alimy/mir/v2 v2.7.0-alpha
-	github.com/go-chi/chi v4.1.2+incompatible
+	github.com/alimy/mir/v2 {{ .VersionOfMir "v2.7.0" }}
+	github.com/go-chi/chi {{ .VersionOfEngine "v4.1.2+incompatible" }}
 )
 {{if notEmptyStr .MirPkgName }}
 replace (

diff --git a/mirc/cmd/templates/chi/go.sum.tmpl b/mirc/cmd/templates/chi/go.sum.tmpl
diff --git a/mirc/cmd/templates/echo/go.mod.tmpl b/mirc/cmd/templates/echo/go.mod.tmpl
@@ -3,8 +3,8 @@ module {{ .PkgName }}
 go 1.16
 
 require (
-	github.com/alimy/mir/v2 v2.7.0-alpha
-	github.com/labstack/echo/v4 v4.1.17
+	github.com/alimy/mir/v2 {{ .VersionOfMir "v2.7.0" }}
+	github.com/labstack/echo/v4 {{ .VersionOfEngine "v4.1.17" }}
 )
 {{if notEmptyStr .MirPkgName }}
 replace (

diff --git a/mirc/cmd/templates/echo/go.sum.tmpl b/mirc/cmd/templates/echo/go.sum.tmpl
diff --git a/mirc/cmd/templates/fiber-v2/go.mod.tmpl b/mirc/cmd/templates/fiber-v2/go.mod.tmpl
@@ -3,8 +3,8 @@ module {{ .PkgName }}
 go 1.16
 
 require (
-	github.com/alimy/mir/v2 v2.7.0-alpha
-	github.com/gofiber/fiber/v2 v2.3.3
+	github.com/alimy/mir/v2 {{ .VersionOfMir "v2.7.0" }}
+	github.com/gofiber/fiber/v2 {{ .VersionOfEngine "v2.3.3" }}
 )
 {{if notEmptyStr .MirPkgName }}
 replace (

diff --git a/mirc/cmd/templates/fiber-v2/go.sum.tmpl b/mirc/cmd/templates/fiber-v2/go.sum.tmpl
diff --git a/mirc/cmd/templates/fiber/go.mod.tmpl b/mirc/cmd/templates/fiber/go.mod.tmpl
@@ -3,8 +3,8 @@ module {{ .PkgName }}
 go 1.16
 
 require (
-	github.com/alimy/mir/v2 v2.7.0-alpha
-	github.com/gofiber/fiber v1.14.6
+	github.com/alimy/mir/v2 {{ .VersionOfMir "v2.7.0" }}
+	github.com/gofiber/fiber {{ .VersionOfEngine "v1.14.6" }}
 )
 {{if notEmptyStr .MirPkgName }}
 replace (

diff --git a/mirc/cmd/templates/fiber/go.sum.tmpl b/mirc/cmd/templates/fiber/go.sum.tmpl
diff --git a/mirc/cmd/templates/gin/go.mod.tmpl b/mirc/cmd/templates/gin/go.mod.tmpl
@@ -3,8 +3,8 @@ module {{ .PkgName }}
 go 1.16
 
 require (
-    github.com/alimy/mir/v2 v2.7.0-alpha
-    github.com/gin-gonic/gin v1.6.3
+    github.com/alimy/mir/v2 {{ .VersionOfMir "v2.7.0" }}
+    github.com/gin-gonic/gin {{ .VersionOfEngine "v1.6.3" }}
 )
 {{if notEmptyStr .MirPkgName }}
 replace (

diff --git a/mirc/cmd/templates/gin/go.sum.tmpl b/mirc/cmd/templates/gin/go.sum.tmpl
diff --git a/mirc/cmd/templates/httprouter/go.mod.tmpl b/mirc/cmd/templates/httprouter/go.mod.tmpl
@@ -3,8 +3,8 @@ module {{ .PkgName }}
 go 1.16
 
 require (
-	github.com/alimy/mir/v2 v2.7.0-alpha
-	github.com/julienschmidt/httprouter v1.3.0
+	github.com/alimy/mir/v2 {{ .VersionOfMir "v2.7.0" }}
+	github.com/julienschmidt/httprouter {{ .VersionOfEngine "v1.3.0" }}
 )
 {{if notEmptyStr .MirPkgName }}
 replace (

diff --git a/mirc/cmd/templates/httprouter/go.sum.tmpl b/mirc/cmd/templates/httprouter/go.sum.tmpl
diff --git a/mirc/cmd/templates/iris/go.mod.tmpl b/mirc/cmd/templates/iris/go.mod.tmpl
@@ -4,12 +4,12 @@ go 1.16
 
 require (
 	github.com/ajg/form v1.5.1 // indirect
-	github.com/alimy/mir/v2 v2.7.0-alpha
+	github.com/alimy/mir/v2 {{ .VersionOfMir "v2.7.0" }}
 	github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/imkira/go-interpol v1.1.0 // indirect
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
-	github.com/kataras/iris/v12 v12.1.8
+	github.com/kataras/iris/v12 {{ .VersionOfEngine "v12.1.8" }}
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/moul/http2curl v1.0.0 // indirect
 	github.com/onsi/ginkgo v1.14.2 // indirect