Merge pull request #1 from beego/master

Merge branch 'master' of github.com:beego/bee

README.md

@@ -3,4 +3,8 @@ bee
 
 [![Build Status](https://drone.io/github.com/beego/bee/status.png)](https://drone.io/github.com/beego/bee/latest)
 
-Bee is a tool for helping develop with beego app framework.
+Bee is a tool for helping develop with beego app framework.
+
+## Requirements
+
+- Go version >= 1.1.

apiapp.go

@@ -36,9 +36,13 @@ In the appname folder has the follow struct:
 	│   └── app.conf
 	├── controllers
 	│   └── default.go
+	├── routers
+	│   └── router.go
+	├── tests
+	│   └── default_test.go		
 	├── main.go
 	└── models
-	    └── object.go             
+	    └── object.go            
 
 `,
 }
@@ -53,8 +57,8 @@ copyrequestbody = true
 var apiMaingo = `package main
 
 import (
-	"github.com/astaxie/beego"
-	"{{.Appname}}/controllers"
+	_ "{{.Appname}}/routers"
+	"github.com/astaxie/beego"	
 )
 
 //		Objects
@@ -67,11 +71,21 @@ import (
 //	/object/<objectId>	DELETE					Deleting Objects
 
 func main() {
-	beego.RESTRouter("/object", &controllers.ObjectController{})
-	beego.Router("/ping", &controllers.ObjectController{},"get:Ping")
 	beego.Run()
 }
 `
+var apirouter = `package routers
+
+import (
+	"{{.Appname}}/controllers"
+	"github.com/astaxie/beego"
+)
+
+func init() {
+    beego.RESTRouter("/object", &controllers.ObjectController{})
+}
+`
+
 var apiModels = `package models
 
 import (
@@ -186,28 +200,36 @@ func (this *ObjectController) Delete() {
 	this.ServeJson()
 }
 
-func (this *ObjectController) Ping() {
-    this.Ctx.WriteString("pong")
-}
-
 `
 
-var apiTests = `package tests
+var apiTests = `package test
 
 import (
-    "testing"
-	beetest "github.com/astaxie/beego/testing"
-	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	_ "{{.Appname}}/routers"
+		
+	"github.com/astaxie/beego"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
-func TestHelloWorld(t *testing.T) {
-	request:=beetest.Get("/ping")
-	response,_:=request.Response()
-	defer response.Body.Close()
-	contents, _ := ioutil.ReadAll(response.Body)
-	if string(contents)!="pong"{
-        t.Errorf("response sould be pong")
-    }
+// TestGet is a sample to run an endpoint test
+func TestGet(t *testing.T) {
+	r, _ := http.NewRequest("GET", "/object", nil)
+	w := httptest.NewRecorder()
+	beego.BeeApp.Handlers.ServeHTTP(w, r)
+	
+	beego.Trace("testing", "TestGet", "Code[%d]\n%s", w.Code, w.Body.String())
+	
+	Convey("Subject: Test Station Endpoint\n", t, func() {
+	        Convey("Status Code Should Be 200", func() {
+	                So(w.Code, ShouldEqual, 200)
+	        })
+	        Convey("The Result Should Not Be Empty", func() {
+	                So(w.Body.Len(), ShouldBeGreaterThan, 0)
+	        })
+	})
 }
 
 `
@@ -233,6 +255,8 @@ func createapi(cmd *Command, args []string) {
 	os.Mkdir(path.Join(apppath, "controllers"), 0755)
 	fmt.Println("create controllers:", path.Join(apppath, "controllers"))
 	os.Mkdir(path.Join(apppath, "models"), 0755)
+	fmt.Println(path.Join(apppath, "routers") + string(path.Separator))
+	os.Mkdir(path.Join(apppath, "routers"), 0755)
 	fmt.Println("create models:", path.Join(apppath, "models"))
 	os.Mkdir(path.Join(apppath, "tests"), 0755)
 	fmt.Println("create tests:", path.Join(apppath, "tests"))
@@ -247,7 +271,11 @@ func createapi(cmd *Command, args []string) {
 
 	fmt.Println("create tests default.go:", path.Join(apppath, "tests", "default_test.go"))
 	writetofile(path.Join(apppath, "tests", "default_test.go"),
-		apiTests)
+		strings.Replace(apiTests, "{{.Appname}}", packpath, -1))
+
+	fmt.Println("create routers router.go:", path.Join(apppath, "routers", "router.go"))
+	writetofile(path.Join(apppath, "routers", "router.go"),
+		strings.Replace(apirouter, "{{.Appname}}", packpath, -1))
 
 	fmt.Println("create models object.go:", path.Join(apppath, "models", "object.go"))
 	writetofile(path.Join(apppath, "models", "object.go"), apiModels)

new.go

@@ -37,7 +37,11 @@ The [appname] folder has following structure:
     |- controllers
          |- default.go
     |- models
-    |- static
+    |- routers
+         |- router.go	
+    |- tests
+         |- default_test.go
+	|- static
          |- js
          |- css
          |- img             
@@ -102,6 +106,10 @@ func createApp(cmd *Command, args []string) {
 	fmt.Println(path.Join(apppath, "controllers") + string(path.Separator))
 	os.Mkdir(path.Join(apppath, "models"), 0755)
 	fmt.Println(path.Join(apppath, "models") + string(path.Separator))
+	os.Mkdir(path.Join(apppath, "routers"), 0755)
+	fmt.Println(path.Join(apppath, "routers") + string(path.Separator))
+	os.Mkdir(path.Join(apppath, "tests"), 0755)
+	fmt.Println(path.Join(apppath, "tests") + string(path.Separator))
 	os.Mkdir(path.Join(apppath, "static"), 0755)
 	fmt.Println(path.Join(apppath, "static") + string(path.Separator))
 	os.Mkdir(path.Join(apppath, "static", "js"), 0755)
@@ -121,6 +129,12 @@ func createApp(cmd *Command, args []string) {
 	fmt.Println(path.Join(apppath, "views", "index.tpl"))
 	writetofile(path.Join(apppath, "views", "index.tpl"), indextpl)
 
+	fmt.Println(path.Join(apppath, "routers", "router.go"))
+	writetofile(path.Join(apppath, "routers", "router.go"), strings.Replace(router, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), "/"), -1))
+
+	fmt.Println(path.Join(apppath, "tests", "default_test.go"))
+	writetofile(path.Join(apppath, "tests", "default_test.go"), strings.Replace(test, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), "/"), -1))
+
 	fmt.Println(path.Join(apppath, "main.go"))
 	writetofile(path.Join(apppath, "main.go"), strings.Replace(maingo, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), "/"), -1))
 
@@ -135,16 +149,59 @@ runmode = dev
 var maingo = `package main
 
 import (
-	"{{.Appname}}/controllers"
+	_ "{{.Appname}}/routers"
 	"github.com/astaxie/beego"
 )
 
 func main() {
-	beego.Router("/", &controllers.MainController{})
 	beego.Run()
 }
 
 `
+var router = `package routers
+
+import (
+	"{{.Appname}}/controllers"
+	"github.com/astaxie/beego"
+)
+
+func init() {
+    beego.Router("/", &controllers.MainController{})
+}
+`
+
+var test = `package test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	_ "{{.Appname}}/routers"
+		
+	"github.com/astaxie/beego"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+// TestMain is a sample to run an endpoint test
+func TestMain(t *testing.T) {
+	r, _ := http.NewRequest("GET", "/", nil)
+	w := httptest.NewRecorder()
+	beego.BeeApp.Handlers.ServeHTTP(w, r)
+	
+	beego.Trace("testing", "TestMain", "Code[%d]\n%s", w.Code, w.Body.String())
+	
+	Convey("Subject: Test Station Endpoint\n", t, func() {
+	        Convey("Status Code Should Be 200", func() {
+	                So(w.Code, ShouldEqual, 200)
+	        })
+	        Convey("The Result Should Not Be Empty", func() {
+	                So(w.Body.Len(), ShouldBeGreaterThan, 0)
+	        })
+	})
+}
+
+`
+
 var controllers = `package controllers
 
 import (

test.go

@@ -19,6 +19,8 @@ import (
 	"os/exec"
 	path "path/filepath"
 	"time"
+
+	_ "github.com/smartystreets/goconvey/convey"
 )
 
 var cmdTest = &Command{