builder cleanup

Signed-off-by: Andrea Luzzardi <[email protected]>

cmd/build.go

@@ -14,6 +14,8 @@ var buildCmd = &cobra.Command{
 	Short: "Build the application",
 	Args:  cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
+		ctx := context.Background()
+
 		verbose, err := cmd.Flags().GetBool("verbose")
 		if err != nil {
 			ui.Fatal("unable to resolve flag: %v", err)
@@ -25,7 +27,15 @@ var buildCmd = &cobra.Command{
 
 		rootDir := getCwd(cmd)
 		name := filepath.Base(rootDir)
-		build(name, rootDir, verbose, noCache)
+
+		b := builder.New(rootDir, name)
+		opts := builder.BuildOpts{
+			Verbose: verbose,
+			NoCache: noCache,
+		}
+		if err := b.Build(ctx, opts); err != nil {
+			ui.Fatal("Failed to build the application: %v", err)
+		}
 	},
 }
 
@@ -36,17 +46,3 @@ func init() {
 
 	rootCmd.AddCommand(buildCmd)
 }
-
-func build(name, rootDir string, verbose, noCache bool) {
-	ctx := context.Background()
-	ui.Info("Building %s", name)
-	b := builder.New(rootDir, name)
-	opts := builder.BuildOpts{
-		Verbose: verbose,
-		NoCache: noCache,
-	}
-	if err := b.Build(ctx, opts); err != nil {
-		ui.Fatal("Failed to build the application: %v", err)
-	}
-	ui.Success("Build successfull")
-}

cmd/create.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -10,6 +11,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/blocklayerhq/chainkit/pkg/builder"
 	"github.com/blocklayerhq/chainkit/pkg/httpfs"
 	"github.com/blocklayerhq/chainkit/pkg/ui"
 	"github.com/blocklayerhq/chainkit/templates"
@@ -41,13 +43,18 @@ func init() {
 }
 
 func create(name, rootDir string) {
+	ctx := context.Background()
+
 	ui.Info("Creating a new blockchain app in %s", ui.Emphasize(rootDir))
 
 	if err := scaffold(name, rootDir); err != nil {
 		ui.Fatal("Failed to initialize: %v", err)
 	}
 
-	build(name, rootDir, false, false)
+	b := builder.New(rootDir, name)
+	if err := b.Build(ctx, builder.BuildOpts{}); err != nil {
+		ui.Fatal("Failed to build the application: %v", err)
+	}
 
 	ui.Success("Success! Created %s at %s", ui.Emphasize(name), ui.Emphasize(rootDir))
 	printGettingStarted(name)

pkg/builder/builder.go

@@ -34,6 +34,7 @@ func New(rootDir, name string) *Builder {
 
 // Build executes a build.
 func (b *Builder) Build(ctx context.Context, opts BuildOpts) error {
+	ui.Info("Building %s", b.name)
 	args := []string{"build", "-t", b.name}
 	if opts.NoCache {
 		args = append(args, "--no-cache")
@@ -80,6 +81,7 @@ func (b *Builder) Build(ctx context.Context, opts BuildOpts) error {
 		return err
 	}
 
+	ui.Success("Build successfull")
 	return nil
 }