file structure changes

Author: Pritesh-Patel

Makefile

@@ -14,7 +14,14 @@ build:
 	packr2 clean
 
 build-example:
-	./sprout generate -c example/sprout.yml -l go -o example
+	mkdir -p example
+	cd example && ../sprout create -p "hello-world"
+	cd example/hello-world && ../../sprout generate -l go
 
 clean-example:
-	rm -rf example/example
+	rm -rf example
+
+install-linux: build
+	mkdir -p ${HOME}/bin
+	cp sprout ${HOME}/bin/sprout
+	chmod +x ${HOME}/bin/sprout

README.md

@@ -18,23 +18,23 @@ It will also live with your project, when you add a new service to the config it
 
 ## What does it generate?
 
-The generation will create a folder with 3 repos within it.
+The generation will create 2 folders.
 
-* A rep for the IDL's
-* A repo that has the generated artifacts from the IDL
+* A rep for the IDL's, this folder will also contain generated artifacts from the IDL under 'gen'
 * A repo that implements the interfaces of the generated artifacts
 
 `NOTE: It only creates the folders for these repos, you will still need to create the git repos on your respected platform. Aswell as initialise each folder as a git repo and push when there have been changes. (if there is a strong desire we can look at how to make this process easier.)`
 
 ## The development cycle
 
-1) Setup sprout config & run generation
-2) Start adding your desired methods to the protobuf files generated
-3) Rerun generation
-4) Push the idl and the language generated repo
-5) Implement these methods on the main application repo
-6) When you feel the need to add more services add them to the sprout config
-7) Repeat steps 1 - 5
+1) Make folder and within that folder execute `sprout create [PROJECT_NAME]`
+2) A folder will be created and within that update the `sprout.yml` and then run `sprout generate -l=[LANGUAGE OF CHOICE]`
+3) Move back to the root folder and you will see that there is now an idl folder created.
+4) Modify the the protobuf services generated with your desired methods
+5) Either run `prototool generate` or return to the application folder and re run `sprout generate`
+6) Push up the IDL repo
+6) Implement these methods on the main application repo
+7) When you feel the need to add more services add them to the sprout config and repeate the generation process
 
 ## Dependencies
 

cmd/create.go

@@ -0,0 +1,40 @@
+package cmd
+
+import (
+	"log"
+	"os"
+	"fmt"
+	
+
+	"github.com/spf13/cobra"
+)
+
+var projectName string
+
+func init() {
+
+	createCmd.PersistentFlags().StringVarP(&projectName, "project-name", "p", "", "project name")
+
+	rootCmd.AddCommand(createCmd)
+}
+
+var createCmd = &cobra.Command{
+	Use:   "create",
+	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)
+		}
+
+		sproutConfigPath := fmt.Sprintf("%v/sprout.yml", projectName)
+
+		f, err := os.Create(sproutConfigPath)
+		if err != nil {
+			log.Printf("Error creating sprout config: %v", err)
+		}
+
+		Templator.Sprout.Execute(f, projectName)
+	},
+}

cmd/generate.go

@@ -10,7 +10,6 @@ import (
 )
 
 var configPath string
-var outputPath string
 var language string
 
 const (
@@ -22,15 +21,14 @@ var supportedLanguages = [...]string{Go}
 func init() {
 
 	generateCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "sprout.yml", "config path")
-	generateCmd.PersistentFlags().StringVarP(&outputPath, "output-path", "o", "./", "config path")
 	generateCmd.PersistentFlags().StringVarP(&language, "language", "l", "", "language to generate project in")
 
 	rootCmd.AddCommand(generateCmd)
 }
 
 var generateCmd = &cobra.Command{
 	Use:   "generate",
-	Short: "Generate project from config.",
+	Short: "Generate idl & application folders",
 	Run: func(cmd *cobra.Command, args []string) {
 		if !ValidLanguage() {
 			log.Fatalf("'%s' is not a supported language.", language)
@@ -39,11 +37,11 @@ var generateCmd = &cobra.Command{
 		cfg := config.LoadConfig(configPath)
 		cfg.Print()
 
-		proto.Generate(Templator, cfg, outputPath)
+		proto.Generate(Templator, cfg)
 
 		switch language {
 		case Go:
-			golang.Generate(Templator, cfg, outputPath)
+			golang.Generate(Templator, cfg)
 
 		}
 	},

example/README.MD

@@ -11,12 +11,12 @@ create:
 
 generate:
   go_options:
-    import_path: github.com/commitdev
+    import_path: github.com/yourrepo
     extra_modifiers:
       google/api/annotations.proto: google.golang.org/genproto/googleapis/api/annotations
       google/api/http.proto: google.golang.org/genproto/googleapis/api/annotations
   plugins:
     - name: go
       type: go
       flags: plugins=grpc
-      output: ../../sprout-example-go
+      output: ../gen/go