logging and module fixs

Author: Pritesh-Patel

.gitignore

@@ -1,3 +1,3 @@
 main-packr.go
 packrd
-sprout
+/sprout

Makefile

@@ -13,7 +13,7 @@ build:
 	packr2 build -o sprout
 	packr2 clean
 
-build-example:
+build-example: build clean-example
 	mkdir -p example
 	cd example && ../sprout create -p "hello-world"
 	cd example/hello-world && ../../sprout generate -l go

cmd/create.go

@@ -1,10 +1,9 @@
 package cmd
 
 import (
+	"fmt"
 	"log"
 	"os"
-	"fmt"
-	
 
 	"github.com/spf13/cobra"
 )
@@ -23,9 +22,13 @@ var createCmd = &cobra.Command{
 	Short: "Create new project.",
 	Run: func(cmd *cobra.Command, args []string) {
 
-		err := os.Mkdir(projectName, os.ModePerm)
-		if os.IsExist(err){
-			log.Fatalf("Directory %v already exists!", projectName)
+		rootDir := fmt.Sprintf("./%v", projectName)
+
+		err := os.Mkdir(rootDir, os.ModePerm)
+		if os.IsExist(err) {
+			log.Fatalf("Directory %v already exists! Error: %v", projectName, err)
+		} else if err != nil {
+			log.Fatalf("Error creating root: %v ", err)
 		}
 
 		sproutConfigPath := fmt.Sprintf("%v/sprout.yml", projectName)

config/config.go

@@ -13,22 +13,23 @@ type Maintainers struct {
 }
 
 type Grpc struct {
+	Host string
 	Port int
 }
 
 type Graphql struct {
 	Enabled bool
-	Port int
+	Port    int
 }
 
 type Http struct {
 	Enabled bool
-	Port int
+	Port    int
 }
 
 type Network struct {
-	Grpc   Grpc
-	Http   Http
+	Grpc    Grpc
+	Http    Http
 	Graphql Graphql
 }
 

example/hello-world-idl/go.mod

@@ -0,0 +1,3 @@
+module github.com/yourrepo/hello-world-idl
+
+go 1.12

example/hello-world/go.mod

@@ -1,3 +1,10 @@
 module github.com/yourrepo/hello-world
 
 go 1.12
+
+replace github.com/yourrepo/hello-world-idl => ../hello-world-idl
+
+
+require (
+  github.com/yourrepo/hello-world-idl
+)

example/hello-world/main.go

@@ -1,4 +1,26 @@
 package main
+import (
+	"context"
+	"log"
+	"net"
+
+	health "github.com/yourrepo/hello-world/server/health"
+
+	"google.golang.org/grpc"
+)
 
 func main() {
+	lis, err := net.Listen("tcp", "0.0.0.0:3000")
+	if err != nil {
+		log.Fatalf("failed to listen: %v", err)
+	}
+	s := grpc.NewServer()
+
+	//TODO: Register your servers here
+	healthServer := health.NewServer()
+	health.RegisterHealthServer(s, healthServer)
+	
+	if err := s.Serve(lis); err != nil {
+		log.Fatalf("failed to serve: %v", err)
+	}
 }

example/hello-world/sprout.yml

@@ -9,6 +9,7 @@ maintainers:
 
 network:
   grpc:
+    host: 0.0.0.0
     port: 3000
   http:
     enabled: true

generate/golang/generate.go

@@ -18,16 +18,19 @@ func Generate(templator *templator.Templator, config *config.SproutConfig) {
 }
 
 func GenerateGoMain(templator *templator.Templator, config *config.SproutConfig) {
-	f, err := os.Create("main.go")
+	if _, err := os.Stat("main.go"); os.IsNotExist(err) {
 
-	if err != nil {
-		log.Printf("Error: %v", err)
-	}
-
-	templator.Go.GoMain.Execute(f, config)
-}
+		f, err := os.Create("main.go")
 
+		if err != nil {
+			log.Printf("Error: %v", err)
+		}
 
+		templator.Go.GoMain.Execute(f, config)
+	} else {
+		log.Printf("main.go already exists. skipping.")
+	}
+}
 
 func GenerateGoMod(templator *templator.Templator, config *config.SproutConfig) {
 	f, err := os.Create("go.mod")
@@ -50,7 +53,7 @@ func GenerateServers(templator *templator.Templator, config *config.SproutConfig
 		serverLibPath := fmt.Sprintf("%s/%s", serverDirPath, s.Name)
 		err := os.Mkdir(serverLibPath, os.ModePerm)
 		if os.IsExist(err) {
-			log.Printf("%s service exists skipping.", s.Name)
+			log.Printf("%s server exists skipping.", s.Name)
 			continue
 		}
 		log.Printf("generating %s", s.Name)
@@ -65,10 +68,10 @@ func GenerateServers(templator *templator.Templator, config *config.SproutConfig
 			log.Printf("Error: %v", err)
 		}
 
-		data := map[string]string {
+		data := map[string]string{
 			"ProjectName": config.Name,
 			"ServiceName": s.Name,
-			"GitRepo": config.GitRepo,
+			"GitRepo":     config.GitRepo,
 		}
 
 		templator.Go.GoServer.Execute(f, data)

generate/proto/generate.go

@@ -16,6 +16,21 @@ func Generate(templator *templator.Templator, config *config.SproutConfig) {
 	GenerateProtoHealth(templator, config)
 	GenerateProtoServices(templator, config)
 	GenerateProtoServiceLibs(config)
+	GenerateGoModIDL(templator, config)
+}
+
+func GenerateGoModIDL(templator *templator.Templator, config *config.SproutConfig) {
+	idlPath := fmt.Sprintf("../%s-idl", config.Name)
+	idlOutput := fmt.Sprintf("%s/go.mod", idlPath)
+
+	f, err := os.Create(idlOutput)
+
+	err = util.CreateDirIfDoesNotExist(idlPath)
+	if err != nil {
+		log.Printf("Error: %v", err)
+	}
+
+	templator.Go.GoModIDL.Execute(f, config)
 }
 
 func GenerateProtoToolConfig(templator *templator.Templator, config *config.SproutConfig) {
@@ -64,6 +79,7 @@ func GenerateProtoServices(templator *templator.Templator, config *config.Sprout
 		protoPath := fmt.Sprintf("%s/%s.proto", s.Name, s.Name)
 		cmd := exec.Command("prototool", "create", protoPath)
 		cmd.Dir = protoToolConfigPath
+		log.Printf("Generating %v", protoPath)
 		cmd.Run()
 	}
 
@@ -74,6 +90,8 @@ func GenerateProtoServiceLibs(config *config.SproutConfig) {
 	cmd := exec.Command("prototool", "generate")
 	cmd.Dir = protoToolConfigPath
 	bytes, err := cmd.Output()
+	
+	log.Print("Generating proto service libs...")
 	if err != nil {
 		log.Printf("Error executing prototool generate: %v", string(bytes))
 	}