totole/revel-cmd
1
0
Fork 0
mirror of https://github.com/kevin-DL/revel-cmd.git synced 2026-01-11 18:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138 from notzippy/develop

Browse Source 
Re added the requirement for the -a, without this the flags would not…
This commit is contained in:
Steve
2018-09-22 15:32:30 -07:00
committed by GitHub
parent cfe5bf4b0c 01ccd695d4
commit b606ec999c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
harness/build.go
View File

@@ -243,7 +243,7 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (app *App, compi
utils.Logger.Info("Exec:", "args", getCmd.Args) utils.Logger.Info("Exec:", "args", getCmd.Args)
getOutput, err := getCmd.CombinedOutput() getOutput, err := getCmd.CombinedOutput()
if err != nil { if err != nil {
utils.Logger.Error("Build failed", "message", stOutput) utils.Logger.Error("Build failed", "message", stOutput, "error", err)
utils.Logger.Error("Failed to fetch the output", "getOutput", string(getOutput)) utils.Logger.Error("Failed to fetch the output", "getOutput", string(getOutput))
return nil, newCompileError(paths, output) return nil, newCompileError(paths, output)
} }

12
model/command_config.go
View File

@@ -47,13 +47,13 @@ type (
// The build command // The build command
Build struct { Build struct {
TargetPath string `short:"t" long:"target-path" description:"Path to target folder. Folder will be completely deleted if it exists" required:"true"` TargetPath string `short:"t" long:"target-path" description:"Path to target folder. Folder will be completely deleted if it exists" required:"true"`
ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" ` ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" required:"true"`
Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"` Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"`
CopySource bool `short:"s" long:"include-source" description:"Copy the source code as well"` CopySource bool `short:"s" long:"include-source" description:"Copy the source code as well"`
} `command:"build"` } `command:"build"`
// The run command // The run command
Run struct { Run struct {
ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" ` ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" required:"true"`
Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"` Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"`
Port string `short:"p" long:"port" description:"The port to listen"` Port string `short:"p" long:"port" description:"The port to listen"`
NoProxy bool `short:"n" long:"no-proxy" description:"True if proxy server should not be started. This will only update the main and routes files on change"` NoProxy bool `short:"n" long:"no-proxy" description:"True if proxy server should not be started. This will only update the main and routes files on change"`
@@ -61,17 +61,17 @@ type (
// The package command // The package command
Package struct { Package struct {
Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"` Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"`
ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" ` ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" required:"true"`
CopySource bool `short:"s" long:"include-source" description:"Copy the source code as well"` CopySource bool `short:"s" long:"include-source" description:"Copy the source code as well"`
} `command:"package"` } `command:"package"`
// The clean command // The clean command
Clean struct { Clean struct {
ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" ` ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" required:"true"`
} `command:"clean"` } `command:"clean"`
// The test command // The test command
Test struct { Test struct {
Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"` Mode string `short:"m" long:"run-mode" description:"The mode to run the application in"`
ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" ` ImportPath string `short:"a" long:"application-path" description:"Path to applicaiton folder" required:"true"`
Function string `short:"f" long:"suite-function" description:"The suite.function"` Function string `short:"f" long:"suite-function" description:"The suite.function"`
} `command:"test"` } `command:"test"`
// The version command // The version command
@@ -133,6 +133,6 @@ func (c *CommandConfig) UpdateImportPath() bool {
} }
c.ImportPath = importPath c.ImportPath = importPath
utils.Logger.Info("Returned import path", "path", importPath) utils.Logger.Info("Returned import path", "path", importPath, "buildpath",build.Default.GOPATH)
return (len(importPath) > 0 || !required) return (len(importPath) > 0 || !required)
} }