Update LICENSE

LICENSE

@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,10 +1,6 @@
 bee
 ===
 
-[![Build Status](https://drone.io/github.com/astaxie/bee/status.png)](https://drone.io/github.com/astaxie/bee/latest)
+[![Build Status](https://drone.io/github.com/beego/bee/status.png)](https://drone.io/github.com/beego/bee/latest)
 
-Bee is a tool for managing beego framework.
+Bee is a tool for helping develop with beego app framework.
-
-## License
-
-[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).

apiapp.go

@@ -67,7 +67,8 @@ import (
 //	/object/<objectId>	DELETE					Deleting Objects
 
 func main() {
-	beego.RESTRouter("/object", &controllers.ObejctController{})
+	beego.RESTRouter("/object", &controllers.ObjectController{})
+	beego.Router("/ping", &controllers.ObjectController{},"get:Ping")
 	beego.Run()
 }
 `
@@ -136,20 +137,20 @@ import (
 type ResponseInfo struct {
 }
 
-type ObejctController struct {
+type ObjectController struct {
 	beego.Controller
 }
 
-func (this *ObejctController) Post() {
+func (this *ObjectController) Post() {
 	var ob models.Object
-	json.Unmarshal(this.Ctx.RequestBody, &ob)
+	json.Unmarshal(this.Ctx.Input.RequestBody, &ob)
 	objectid := models.AddOne(ob)
 	this.Data["json"] = map[string]string{"ObjectId": objectid}
 	this.ServeJson()
 }
 
-func (this *ObejctController) Get() {
+func (this *ObjectController) Get() {
-	objectId := this.Ctx.Params[":objectId"]
+	objectId := this.Ctx.Input.Param[":objectId"]
 	if objectId != "" {
 		ob, err := models.GetOne(objectId)
 		if err != nil {
@@ -164,10 +165,10 @@ func (this *ObejctController) Get() {
 	this.ServeJson()
 }
 
-func (this *ObejctController) Put() {
+func (this *ObjectController) Put() {
-	objectId := this.Ctx.Params[":objectId"]
+	objectId := this.Ctx.Input.Param[":objectId"]
 	var ob models.Object
-	json.Unmarshal(this.Ctx.RequestBody, &ob)
+	json.Unmarshal(this.Ctx.Input.RequestBody, &ob)
 
 	err := models.Update(objectId, ob.Score)
 	if err != nil {
@@ -178,12 +179,37 @@ func (this *ObejctController) Put() {
 	this.ServeJson()
 }
 
-func (this *ObejctController) Delete() {
+func (this *ObjectController) Delete() {
-	objectId := this.Ctx.Params[":objectId"]
+	objectId := this.Ctx.Input.Param[":objectId"]
 	models.Delete(objectId)
 	this.Data["json"] = "delete success!"
 	this.ServeJson()
 }
+
+func (this *ObjectController) Ping() {
+    this.Ctx.WriteString("pong")
+}
+
+`
+
+var apiTests = `package tests
+
+import (
+    "testing"
+	beetest "github.com/astaxie/beego/testing"
+	"io/ioutil"
+)
+
+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")
+    }
+}
+
 `
 
 func init() {
@@ -219,6 +245,10 @@ func createapi(cmd *Command, args []string) {
 	writetofile(path.Join(apppath, "controllers", "default.go"),
 		strings.Replace(apiControllers, "{{.Appname}}", packpath, -1))
 
+	fmt.Println("create tests default.go:", path.Join(apppath, "tests", "default_test.go"))
+	writetofile(path.Join(apppath, "tests", "default_test.go"),
+		apiTests)
+
 	fmt.Println("create models object.go:", path.Join(apppath, "models", "object.go"))
 	writetofile(path.Join(apppath, "models", "object.go"), apiModels)
 

new.go

@@ -122,7 +122,7 @@ func createApp(cmd *Command, args []string) {
 	writetofile(path.Join(apppath, "views", "index.tpl"), indextpl)
 
 	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)), string(path.Separator)), -1))
+	writetofile(path.Join(apppath, "main.go"), strings.Replace(maingo, "{{.Appname}}", strings.Join(strings.Split(apppath[len(appsrcpath)+1:], string(path.Separator)), "/"), -1))
 
 	ColorLog("[SUCC] New application successfully created!\n")
 }
@@ -168,7 +168,6 @@ var indextpl = `<!DOCTYPE html>
   	<head>
     	<title>Beego</title>
     	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  	</head>
 	
 		<style type="text/css">
 			body {
@@ -224,6 +223,7 @@ var indextpl = `<!DOCTYPE html>
 				margin: 0px 0px 10px;
 			}
 		</style>
+	</head>
   	
   	<body>
   		<header class="hero-unit" style="background-color:#A9F16C">
@@ -236,7 +236,7 @@ var indextpl = `<!DOCTYPE html>
 			    <br />
 			    	Official website: <a href="http://{{.Website}}">{{.Website}}</a>
 			    <br />
-			    	Contact me: {{.Email}}</a>
+			    	Contact me: {{.Email}}
 			    </p>
 			  </div>
 			</div>

test.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"bytes"
 	"os"
 	"os/exec"
 	path "path/filepath"
@@ -32,6 +31,20 @@ func init() {
 	cmdTest.Run = testApp
 }
 
+func safePathAppend(arr []string, paths ...string) []string {
+	for _, path := range paths {
+		if pathExists(path) {
+			arr = append(arr, path)
+		}
+	}
+	return arr
+}
+
+func pathExists(path string) bool {
+	_, err := os.Stat(path)
+	return err == nil || os.IsExist(err)
+}
+
 var started = make(chan bool)
 
 func testApp(cmd *Command, args []string) {
@@ -48,7 +61,7 @@ func testApp(cmd *Command, args []string) {
 		ColorLog("[ERRO] Fail to parse bee.json[ %s ]\n", err)
 	}
 	var paths []string
-	paths = append(paths,
+	paths = safePathAppend(paths,
 		path.Join(crupath, conf.DirStruct.Controllers),
 		path.Join(crupath, conf.DirStruct.Models),
 		path.Join(crupath, "./")) // Current path.
@@ -63,28 +76,28 @@ func testApp(cmd *Command, args []string) {
 		select {
 		case <-started:
 			runTest()
-			Kill()
+			//Kill()
-			os.Exit(0)
+			//os.Exit(0)
 		}
 	}
 }
 
 func runTest() {
 	ColorLog("[INFO] Start testing...\n")
-	time.Sleep(time.Second * 5)
+	time.Sleep(time.Second * 1)
-	path, _ := os.Getwd()
+	crupwd, _ := os.Getwd()
-	os.Chdir(path + "/tests")
+	testDir := path.Join(crupwd, "tests")
+	if pathExists(testDir) {
+		os.Chdir(testDir)
+	}
 
 	var err error
 	icmd := exec.Command("go", "test")
-	var out, errbuffer bytes.Buffer
+	icmd.Stdout = os.Stdout
-	icmd.Stdout = &out
+	icmd.Stderr = os.Stderr
-	icmd.Stderr = &errbuffer
+	ColorLog("[TRAC] ============== Test Begin ===================\n")
-	ColorLog("[INFO] ============== Test Begin ===================\n")
 	err = icmd.Run()
-	ColorLog(out.String())
+	ColorLog("[TRAC] ============== Test End ===================\n")
-	ColorLog(errbuffer.String())
-	ColorLog("[INFO] ============== Test End ===================\n")
 
 	if err != nil {
 		ColorLog("[ERRO] ============== Test failed ===================\n")

util.go

@@ -20,6 +20,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"time"
 )
 
 // Go is a basic promise implementation: it wraps calls a function in a goroutine
@@ -55,6 +56,11 @@ const (
 	Magenta
 	//NRed      = uint8(31) // Normal
 	EndColor = "\033[0m"
+
+	TRAC = "TRAC"
+	ERRO = "ERRO"
+	WARN = "WARN"
+	SUCC = "SUCC"
 )
 
 // ColorLog colors log and print to stdout.
@@ -78,7 +84,6 @@ func ColorLogS(format string, a ...interface{}) string {
 	var clog string
 
 	if runtime.GOOS != "windows" {
-
 		// Level.
 		i := strings.Index(log, "]")
 		if log[0] == '[' && i > -1 {
@@ -125,20 +130,21 @@ func ColorLogS(format string, a ...interface{}) string {
 		log = clog + log
 	}
 
-	return log
+	return strings.TrimPrefix(
+		time.Now().Format("2006-01-02 03:04:05 "), "20") + log
 }
 
 // getColorLevel returns colored level string by given level.
 func getColorLevel(level string) string {
 	level = strings.ToUpper(level)
 	switch level {
-	case "TRAC":
+	case TRAC:
 		return fmt.Sprintf("\033[%dm%s\033[0m", Blue, level)
-	case "ERRO":
+	case ERRO:
 		return fmt.Sprintf("\033[%dm%s\033[0m", Red, level)
-	case "WARN":
+	case WARN:
 		return fmt.Sprintf("\033[%dm%s\033[0m", Magenta, level)
-	case "SUCC":
+	case SUCC:
 		return fmt.Sprintf("\033[%dm%s\033[0m", Green, level)
 	default:
 		return level

watch.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"os/exec"
 	"strings"
@@ -66,7 +65,7 @@ func NewWatcher(paths []string) {
 					go Autobuild()
 				}
 			case err := <-watcher.Error:
-				log.Fatal("error:", err)
+				ColorLog("[WARN] %s\n", err.Error()) // No need to exit here
 			}
 		}
 
@@ -143,7 +142,7 @@ func Kill() {
 			fmt.Println("Kill -> ", e)
 		}
 	}()
-	if cmd != nil {
+	if cmd != nil && cmd.Process != nil {
 		cmd.Process.Kill()
 	}
 }