one liner run function for main package in app/build-tool/prebuilder

EXPERIMENTAL/typicmd/application/cli.go → EXPERIMENTAL/typicmd/application/run.go

@@ -1,13 +1,17 @@
 package application
 
 import (
+ log "github.com/sirupsen/logrus"
+
+ "os"
+
  "github.com/typical-go/typical-rest-server/EXPERIMENTAL/typictx"
  "github.com/typical-go/typical-rest-server/EXPERIMENTAL/typienv"
  "github.com/urfave/cli"
 )
 
-// Cli return the command line interface
-func Cli(c *typictx.Context) *cli.App {
+// Run the application
+func Run(c *typictx.Context) {
  app := cli.NewApp()
  app.Name = c.Name
  app.Usage = ""
@@ -25,5 +29,8 @@ func Cli(c *typictx.Context) *cli.App {
  Action: cmd.ActionFunc.CommandFunction(c),
  })
  }
- return app
+ err := app.Run(os.Args)
+ if err != nil {
+ log.Fatal(err.Error())
+ }
 }

EXPERIMENTAL/typicmd/buildtool/cli.go → EXPERIMENTAL/typicmd/buildtool/run.go

@@ -1,12 +1,16 @@
 package buildtool
 
 import (
+ "os"
+
+ log "github.com/sirupsen/logrus"
+
  "github.com/typical-go/typical-rest-server/EXPERIMENTAL/typictx"
  "github.com/urfave/cli"
 )
 
-// Cli return the command line interface
-func Cli(c *typictx.Context) *cli.App {
+// Run the build tool
+func Run(c *typictx.Context) {
  app := cli.NewApp()
  app.Name = c.Name
  app.Usage = ""
@@ -18,5 +22,8 @@ func Cli(c *typictx.Context) *cli.App {
  for _, cmd := range commands(c) {
  app.Commands = append(app.Commands, cmd.CliCommand(c))
  }
- return app
+ err := app.Run(os.Args)
+ if err != nil {
+ log.Fatal(err.Error())
+ }
 }

EXPERIMENTAL/typicmd/prebuilder/prebuild.go → EXPERIMENTAL/typicmd/prebuilder/run.go

@@ -21,8 +21,8 @@ const (
  debugEnv = "PREBUILDER_DEBUG"
 )
 
-// Prebuild process
-func Prebuild(ctx *typictx.Context) {
+// Run the prebuilder
+func Run(ctx *typictx.Context) {
  if os.Getenv(debugEnv) != "" {
  log.SetLevel(log.DebugLevel)
  }

cmd/app/main.go

@@ -1,18 +1,11 @@
 package main
 
 import (
- "os"
-
- log "github.com/sirupsen/logrus"
-
  "github.com/typical-go/typical-rest-server/EXPERIMENTAL/typicmd/application"
  _ "github.com/typical-go/typical-rest-server/cmd/internal/dependency"
  "github.com/typical-go/typical-rest-server/typical"
 )
 
 func main() {
- err := application.Cli(typical.Context).Run(os.Args)
- if err != nil {
- log.Fatal(err)
- }
+ application.Run(typical.Context)
 }

cmd/build-tool/main.go

@@ -1,17 +1,11 @@
 package main
 
 import (
- "os"
-
- log "github.com/sirupsen/logrus"
  "github.com/typical-go/typical-rest-server/EXPERIMENTAL/typicmd/buildtool"
  _ "github.com/typical-go/typical-rest-server/cmd/internal/dependency"
  "github.com/typical-go/typical-rest-server/typical"
 )
 
 func main() {
- err := buildtool.Cli(typical.Context).Run(os.Args)
- if err != nil {
- log.Fatalf("%s", err.Error())
- }
+ buildtool.Run(typical.Context)
 }

cmd/pre-builder/main.go

@@ -6,5 +6,5 @@ import (
 )
 
 func main() {
- prebuilder.Prebuild(typical.Context)
+ prebuilder.Run(typical.Context)
 }