Merge pull request #491 from beego/develop

bee 1.10.0

.travis.yml

@@ -1,8 +1,6 @@
 language: go
 go:
-  - 1.6.3
-  - 1.7.3
-  - 1.8
+  - 1.10.3
 install:
   - export PATH=$PATH:$HOME/gopath/bin
   - go get -u github.com/opennota/check/cmd/structcheck

Beefile

@@ -1,6 +1,7 @@
 version: 0
 go_install: false
-watch_ext: []
+watch_ext: [".go"]
+watch_ext_static: [".html", ".tpl", ".js", ".css"]
 dir_structure:
   watch_all: false
   controllers: ""

README.md

@@ -4,7 +4,8 @@ bee
 
 Bee is a command-line tool facilitating development of Beego-based application.
 
-[![Build Status](https://drone.io/github.com/beego/bee/status.png)](https://drone.io/github.com/beego/bee/latest)
+[![Build Status](https://img.shields.io/travis/beego/bee.svg?branch=master&label=master)](https://travis-ci.org/beego/bee)
+[![Build Status](https://img.shields.io/travis/beego/bee.svg?branch=develop&label=develop)](https://travis-ci.org/beego/bee)
 
 ## Requirements
 

bee.json

@@ -1,7 +1,8 @@
 {
 	"version": 0,
 	"go_install": false,
-	"watch_ext": [],
+	"watch_ext": [".go"],
+	"watch_ext_static": [".html", ".tpl", ".js", ".css"],
 	"dir_structure": {
 		"watch_all": false,
 		"controllers": "",

cmd/commands/generate/generate.go

@@ -166,6 +166,7 @@ func appCode(cmd *commands.Command, args []string, currpath string) {
 	beeLogger.Log.Infof("Using '%s' as 'Level'", generate.Level)
 	generate.GenerateAppcode(generate.SQLDriver.String(), generate.SQLConn.String(), generate.Level.String(), generate.Tables.String(), currpath)
 }
+
 func migration(cmd *commands.Command, args []string, currpath string) {
 	if len(args) < 2 {
 		beeLogger.Log.Fatal("Wrong number of arguments. Run: bee help generate")

cmd/commands/migrate/migrate.go

@@ -196,6 +196,17 @@ func checkForSchemaUpdateTable(db *sql.DB, driver string) {
 	}
 }
 
+func driverImportStatement(driver string) string {
+	switch driver {
+	case "mysql":
+		return "github.com/go-sql-driver/mysql"
+	case "postgres":
+		return "github.com/lib/pq"
+	default:
+		return "github.com/go-sql-driver/mysql"
+	}
+}
+
 func showMigrationsTableSQL(driver string) string {
 	switch driver {
 	case "mysql":
@@ -263,6 +274,7 @@ func writeMigrationSourceFile(dir, source, driver, connStr string, latestTime in
 		beeLogger.Log.Fatalf("Could not create file: %s", err)
 	} else {
 		content := strings.Replace(MigrationMainTPL, "{{DBDriver}}", driver, -1)
+		content = strings.Replace(content, "{{DriverRepo}}", driverImportStatement(driver), -1)
 		content = strings.Replace(content, "{{ConnStr}}", connStr, -1)
 		content = strings.Replace(content, "{{LatestTime}}", strconv.FormatInt(latestTime, 10), -1)
 		content = strings.Replace(content, "{{LatestName}}", latestName, -1)
@@ -346,8 +358,7 @@ import(
 	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/migration"
 
-	_ "github.com/go-sql-driver/mysql"
-	_ "github.com/lib/pq"
+	_ "{{DriverRepo}}"
 )
 
 func init(){

cmd/commands/run/run.go

@@ -58,6 +58,8 @@ var (
 	currentGoPath string
 	// Current runmode
 	runmode string
+	// Extra args to run application
+	runargs string
 	// Extra directories
 	extraPackages utils.StrFlags
 )
@@ -71,6 +73,7 @@ func init() {
 	CmdRun.Flag.BoolVar(&vendorWatch, "vendor", false, "Enable watch vendor folder.")
 	CmdRun.Flag.StringVar(&buildTags, "tags", "", "Set the build tags. See: https://golang.org/pkg/go/build/")
 	CmdRun.Flag.StringVar(&runmode, "runmode", "", "Set the Beego run mode.")
+	CmdRun.Flag.StringVar(&runargs, "runargs", "", "Extra args to run application")
 	CmdRun.Flag.Var(&extraPackages, "ex", "List of extra package to watch.")
 	exit = make(chan bool)
 	commands.AvailableCommands = append(commands.AvailableCommands, CmdRun)

cmd/commands/run/watch.go

@@ -36,13 +36,14 @@ var (
 	state               sync.Mutex
 	eventTime           = make(map[string]int64)
 	scheduleTime        time.Time
-	watchExts           = []string{".go"}
-	watchExtsStatic     = []string{".html", ".tpl", ".js", ".css"}
+	watchExts           = config.Conf.WatchExts
+	watchExtsStatic     = config.Conf.WatchExtsStatic
 	ignoredFilesRegExps = []string{
 		`.#(\w+).go`,
 		`.(\w+).go.swp`,
 		`(\w+).go~`,
 		`(\w+).tmp`,
+		`commentsRouter_controllers.go`,
 	}
 )
 
@@ -86,6 +87,12 @@ func NewWatcher(paths []string, files []string, isgenerate bool) {
 						scheduleTime = time.Now().Add(1 * time.Second)
 						time.Sleep(scheduleTime.Sub(time.Now()))
 						AutoBuild(files, isgenerate)
+
+						if config.Conf.EnableReload {
+							// Wait 100ms more before refreshing the browser
+							time.Sleep(100 * time.Millisecond)
+							sendReload(e.String())
+						}
 					}()
 				}
 			case err := <-watcher.Errors:
@@ -139,9 +146,9 @@ func AutoBuild(files []string, isgenerate bool) {
 		}
 		beeLogger.Log.Success("Docs generated!")
 	}
-
+	appName := appname
 	if err == nil {
-		appName := appname
+
 		if runtime.GOOS == "windows" {
 			appName += ".exe"
 		}
@@ -165,7 +172,7 @@ func AutoBuild(files []string, isgenerate bool) {
 	}
 
 	beeLogger.Log.Success("Built Successfully!")
-	Restart(appname)
+	Restart(appName)
 }
 
 // Kill kills the running command process
@@ -200,7 +207,13 @@ func Start(appname string) {
 	cmd = exec.Command(appname)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	cmd.Args = append([]string{appname}, config.Conf.CmdArgs...)
+	if runargs != "" {
+		r := regexp.MustCompile("'.+'|\".+\"|\\S+")
+		m := r.FindAllString(runargs, -1)
+		cmd.Args = append([]string{appname}, m...)
+	} else {
+		cmd.Args = append([]string{appname}, config.Conf.CmdArgs...)
+	}
 	cmd.Env = append(os.Environ(), config.Conf.Envs...)
 
 	go cmd.Run()

cmd/commands/version/version.go

@@ -57,7 +57,7 @@ Prints the current Bee, Beego and Go version alongside the platform information.
 }
 var outputFormat string
 
-const version = "1.9.1"
+const version = "1.10.0"
 
 func init() {
 	fs := flag.NewFlagSet("version", flag.ContinueOnError)

config/conf.go

@@ -27,6 +27,8 @@ const confVer = 0
 
 var Conf = struct {
 	Version            int
+	WatchExts          []string  `json:"watch_ext" yaml:"watch_ext"`
+	WatchExtsStatic    []string  `json:"watch_ext_static" yaml:"watch_ext_static"`
 	GoInstall          bool      `json:"go_install" yaml:"go_install"` // Indicates whether execute "go install" before "go build".
 	DirStruct          dirStruct `json:"dir_structure" yaml:"dir_structure"`
 	CmdArgs            []string  `json:"cmd_args" yaml:"cmd_args"`
@@ -37,7 +39,9 @@ var Conf = struct {
 	EnableNotification bool              `json:"enable_notification" yaml:"enable_notification"`
 	Scripts            map[string]string `json:"scripts" yaml:"scripts"`
 }{
-	GoInstall: true,
+	WatchExts:       []string{".go"},
+	WatchExtsStatic: []string{".html", ".tpl", ".js", ".css"},
+	GoInstall:       true,
 	DirStruct: dirStruct{
 		Others: []string{},
 	},

generate/g_appcode.go

@@ -318,7 +318,7 @@ func gen(dbms, connStr string, mode byte, selectedTableNames map[string]bool, ap
 		mvcPath.RouterPath = path.Join(apppath, "routers")
 		createPaths(mode, mvcPath)
 		pkgPath := getPackagePath(apppath)
-		writeSourceFiles(pkgPath, tables, mode, mvcPath, selectedTableNames)
+		writeSourceFiles(pkgPath, tables, mode, mvcPath)
 	} else {
 		beeLogger.Log.Fatalf("Generating app code from '%s' database is not supported yet.", dbms)
 	}
@@ -728,32 +728,26 @@ func createPaths(mode byte, paths *MvcPath) {
 // writeSourceFiles generates source files for model/controller/router
 // It will wipe the following directories and recreate them:./models, ./controllers, ./routers
 // Newly geneated files will be inside these folders.
-func writeSourceFiles(pkgPath string, tables []*Table, mode byte, paths *MvcPath, selectedTables map[string]bool) {
+func writeSourceFiles(pkgPath string, tables []*Table, mode byte, paths *MvcPath) {
 	if (OModel & mode) == OModel {
 		beeLogger.Log.Info("Creating model files...")
-		writeModelFiles(tables, paths.ModelPath, selectedTables)
+		writeModelFiles(tables, paths.ModelPath)
 	}
 	if (OController & mode) == OController {
 		beeLogger.Log.Info("Creating controller files...")
-		writeControllerFiles(tables, paths.ControllerPath, selectedTables, pkgPath)
+		writeControllerFiles(tables, paths.ControllerPath, pkgPath)
 	}
 	if (ORouter & mode) == ORouter {
 		beeLogger.Log.Info("Creating router files...")
-		writeRouterFile(tables, paths.RouterPath, selectedTables, pkgPath)
+		writeRouterFile(tables, paths.RouterPath, pkgPath)
 	}
 }
 
 // writeModelFiles generates model files
-func writeModelFiles(tables []*Table, mPath string, selectedTables map[string]bool) {
+func writeModelFiles(tables []*Table, mPath string) {
 	w := colors.NewColorWriter(os.Stdout)
 
 	for _, tb := range tables {
-		// if selectedTables map is not nil and this table is not selected, ignore it
-		if selectedTables != nil {
-			if _, selected := selectedTables[tb.Name]; !selected {
-				continue
-			}
-		}
 		filename := getFileName(tb.Name)
 		fpath := path.Join(mPath, filename+".go")
 		var f *os.File
@@ -806,16 +800,10 @@ func writeModelFiles(tables []*Table, mPath string, selectedTables map[string]bo
 }
 
 // writeControllerFiles generates controller files
-func writeControllerFiles(tables []*Table, cPath string, selectedTables map[string]bool, pkgPath string) {
+func writeControllerFiles(tables []*Table, cPath string, pkgPath string) {
 	w := colors.NewColorWriter(os.Stdout)
 
 	for _, tb := range tables {
-		// If selectedTables map is not nil and this table is not selected, ignore it
-		if selectedTables != nil {
-			if _, selected := selectedTables[tb.Name]; !selected {
-				continue
-			}
-		}
 		if tb.Pk == "" {
 			continue
 		}
@@ -854,17 +842,11 @@ func writeControllerFiles(tables []*Table, cPath string, selectedTables map[stri
 }
 
 // writeRouterFile generates router file
-func writeRouterFile(tables []*Table, rPath string, selectedTables map[string]bool, pkgPath string) {
+func writeRouterFile(tables []*Table, rPath string, pkgPath string) {
 	w := colors.NewColorWriter(os.Stdout)
 
 	var nameSpaces []string
 	for _, tb := range tables {
-		// If selectedTables map is not nil and this table is not selected, ignore it
-		if selectedTables != nil {
-			if _, selected := selectedTables[tb.Name]; !selected {
-				continue
-			}
-		}
 		if tb.Pk == "" {
 			continue
 		}