diff --git a/cmd/commands/bale/bale.go b/cmd/commands/bale/bale.go index 82ce5b2..7fcf9c6 100644 --- a/cmd/commands/bale/bale.go +++ b/cmd/commands/bale/bale.go @@ -11,7 +11,6 @@ // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the // License for the specific language governing permissions and limitations // under the License. - package bale import ( @@ -43,8 +42,11 @@ var CmdBale = &commands.Command{ It will auto-generate an unpack function to the main package then run it during the runtime. This is mainly used for zealots who are requiring 100% Go code. `, - PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() }, - Run: runBale, + PreRun: func(cmd *commands.Command, args []string) { + version.ShowShortVersionBanner() + config.LoadConfig() + }, + Run: runBale, } func init() { diff --git a/cmd/commands/generate/generate.go b/cmd/commands/generate/generate.go index f679514..d7aedf8 100644 --- a/cmd/commands/generate/generate.go +++ b/cmd/commands/generate/generate.go @@ -1,3 +1,16 @@ +// Copyright 2013 bee authors +// +// 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. package generate import ( @@ -104,6 +117,8 @@ func scaffold(cmd *commands.Command, args []string, currpath string) { beeLogger.Log.Fatal("Wrong number of arguments. Run: bee help generate") } + config.LoadConfig() + cmd.Flag.Parse(args[2:]) if generate.SQLDriver == "" { generate.SQLDriver = utils.DocValue(config.Conf.Database.Driver) @@ -126,6 +141,8 @@ func scaffold(cmd *commands.Command, args []string, currpath string) { } func appCode(cmd *commands.Command, args []string, currpath string) { + config.LoadConfig() + cmd.Flag.Parse(args[1:]) if generate.SQLDriver == "" { generate.SQLDriver = utils.DocValue(config.Conf.Database.Driver) diff --git a/cmd/commands/migrate/migrate.go b/cmd/commands/migrate/migrate.go index 17ae222..f1964d9 100644 --- a/cmd/commands/migrate/migrate.go +++ b/cmd/commands/migrate/migrate.go @@ -1,3 +1,16 @@ +// Copyright 2013 bee authors +// +// 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. package migrate import ( @@ -39,8 +52,11 @@ var CmdMigrate = &commands.Command{ $ bee migrate refresh [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"] `, - PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() }, - Run: RunMigration, + PreRun: func(cmd *commands.Command, args []string) { + version.ShowShortVersionBanner() + config.LoadConfig() + }, + Run: RunMigration, } var mDriver utils.DocValue diff --git a/cmd/commands/run/run.go b/cmd/commands/run/run.go index 42503c8..aa32286 100644 --- a/cmd/commands/run/run.go +++ b/cmd/commands/run/run.go @@ -11,7 +11,6 @@ // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the // License for the specific language governing permissions and limitations // under the License. - package run import ( @@ -35,8 +34,11 @@ var CmdRun = &commands.Command{ Run command will supervise the filesystem of the application for any changes, and recompile/restart it. `, - PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() }, - Run: RunApp, + PreRun: func(cmd *commands.Command, args []string) { + version.ShowShortVersionBanner() + config.LoadConfig() + }, + Run: RunApp, } var ( diff --git a/config/conf.go b/config/conf.go index 6365121..9f11125 100644 --- a/config/conf.go +++ b/config/conf.go @@ -11,11 +11,11 @@ // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the // License for the specific language governing permissions and limitations // under the License. - package config import ( "encoding/json" + "io" "io/ioutil" "os" @@ -34,7 +34,6 @@ var defaultConf = `{ "install": false }, "go_install": true, - "watch_ext": [], "dir_structure": { "watch_all": false, "controllers": "", @@ -59,8 +58,7 @@ var Conf struct { Install bool } // Indicates whether execute "go install" before "go build". - GoInstall bool `json:"go_install" yaml:"go_install"` - WatchExt []string `json:"watch_ext" yaml:"watch_ext"` + GoInstall bool `json:"go_install" yaml:"go_install"` DirStruct struct { WatchAll bool `json:"watch_all" yaml:"watch_all"` Controllers string @@ -82,37 +80,54 @@ var Conf struct { EnableNotification bool `json:"enable_notification" yaml:"enable_notification"` } -func init() { - loadConfig() -} - -// loadConfig loads customized configuration. -func loadConfig() { - beeLogger.Log.Info("Loading default configuration...") - err := json.Unmarshal([]byte(defaultConf), &Conf) - if err != nil { - beeLogger.Log.Errorf(err.Error()) - } - err = filepath.Walk(".", func(path string, fileInfo os.FileInfo, err error) error { +// LoadConfig loads the bee tool configuration. +// It looks for Beefile or bee.json in the current path, +// and falls back to default configuration in case not found. +func LoadConfig() { + err := filepath.Walk(".", func(path string, fileInfo os.FileInfo, err error) error { if err != nil { return nil } + if fileInfo.IsDir() { return nil } + switch fileInfo.Name() { case "bee.json": - beeLogger.Log.Info("Loading configuration from 'bee.json'...") - return parseJSON(path, &Conf) + { + beeLogger.Log.Info("Loading configuration from 'bee.json'...") + err = parseJSON(path, &Conf) + if err != nil { + beeLogger.Log.Errorf("Failed to parse JSON file: %s", err) + return err + } + return io.EOF + } case "Beefile": - beeLogger.Log.Info("Loading configuration from 'Beefile'...") - return parseYAML(path, &Conf) + { + beeLogger.Log.Info("Loading configuration from 'Beefile'...") + err = parseYAML(path, &Conf) + if err != nil { + beeLogger.Log.Errorf("Failed to parse YAML file: %s", err) + return err + } + return io.EOF + } } return nil }) - if err != nil { - beeLogger.Log.Errorf("Failed to parse config file: %s", err) + + // In case no configuration file found or an error different than io.EOF, + // fallback to default configuration + if err != io.EOF { + beeLogger.Log.Info("Loading default configuration...") + err = json.Unmarshal([]byte(defaultConf), &Conf) + if err != nil { + return + } } + // Check format version if Conf.Version != confVer { beeLogger.Log.Warn("Your configuration file is outdated. Please do consider updating it.") @@ -123,12 +138,10 @@ func loadConfig() { if len(Conf.DirStruct.Controllers) == 0 { Conf.DirStruct.Controllers = "controllers" } + if len(Conf.DirStruct.Models) == 0 { Conf.DirStruct.Models = "models" } - - // Append watch exts - //watchExts = append(watchExts, Conf.WatchExt...) return }