Skip to content

Commit

Permalink
Merge pull request #138 from notzippy/develop
Browse files Browse the repository at this point in the history
Re added the requirement for the -a, without this the flags would not…
  • Loading branch information
notzippy authored Sep 22, 2018
2 parents cfe5bf4 + 01ccd69 commit b606ec9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion harness/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (app *App, compi
utils.Logger.Info("Exec:", "args", getCmd.Args)
getOutput, err := getCmd.CombinedOutput()
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))
return nil, newCompileError(paths, output)
}
Expand Down
12 changes: 6 additions & 6 deletions model/command_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,31 @@ type (
// The build command
Build struct {
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"`
CopySource bool `short:"s" long:"include-source" description:"Copy the source code as well"`
} `command:"build"`
// The run command
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"`
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"`
} `command:"run"`
// The package command
Package struct {
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"`
} `command:"package"`
// The clean command
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"`
// The test command
Test struct {
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"`
} `command:"test"`
// The version command
Expand Down Expand Up @@ -133,6 +133,6 @@ func (c *CommandConfig) UpdateImportPath() bool {
}

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)
}

0 comments on commit b606ec9

Please sign in to comment.