Add argument to specify the template url

felix-cli · Jun 2, 2021 · 4cb82f5 · 4cb82f5
1 parent f9c6b65
commit 4cb82f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/cmd/felix/main.go b/cmd/felix/main.go
@@ -33,6 +33,8 @@ var (
 	initCommand    = app.Command("init", "creates new service in current directory")
 	newCommand     = app.Command("new", "creates new service in new directory")
 	name           = newCommand.Arg("name", "the name of the new service and directory you want to create").Required().String()
+
+	templateURL = app.Flag("template", "github url for the template").Short('t').String()
 )
 
 func main() {
@@ -48,7 +50,9 @@ func getVersion(c *kingpin.ParseContext) error {
 }
 
 func felixInit(c *kingpin.ParseContext) error {
-	tmp := builder.Template{}
+	tmp := builder.Template{
+		URL: *templateURL,
+	}
 
 	if err := builder.Init(&tmp); err != nil {
 		fmt.Printf("Something went wrong: %s", err.Error())
@@ -62,6 +66,7 @@ func felixInit(c *kingpin.ParseContext) error {
 func felixNew(c *kingpin.ParseContext) error {
 	tmp := builder.Template{
 		Name: *name,
+		URL:  *templateURL,
 	}
 
 	if err := builder.Init(&tmp); err != nil {

diff --git a/internal/builder/builder.go b/internal/builder/builder.go
@@ -27,7 +27,12 @@ func Init(template *Template) error {
 		return err
 	}
 
-	cmd := exec.Command("curl", "-L", defaultTemplateURL, "-o", file.Name())
+	templateURL := template.URL
+	if templateURL == "" {
+		templateURL = defaultTemplateURL
+	}
+
+	cmd := exec.Command("curl", "-L", templateURL, "-o", file.Name())
 	cmd.Run()
 
 	reader, err := zip.OpenReader(file.Name())

diff --git a/internal/builder/file_handler.go b/internal/builder/file_handler.go
@@ -20,8 +20,6 @@ func copyToTempDir(tmpDir string, reader *zip.ReadCloser) (string, error) {
 			return "", err
 		}
 
-		defer zipped.Close()
-
 		// get the individual file name and extract the current directory
 		path := filepath.Join(tmpDir, f.Name)
 		if f.FileInfo().IsDir() {
@@ -35,12 +33,13 @@ func copyToTempDir(tmpDir string, reader *zip.ReadCloser) (string, error) {
 				return "", err
 			}
 
-			defer writer.Close()
-
 			if _, err = io.Copy(writer, zipped); err != nil {
 				return "", err
 			}
+			writer.Close()
 		}
+
+		zipped.Close()
 	}
 
 	return rootDir, nil

diff --git a/internal/builder/template.go b/internal/builder/template.go
@@ -16,6 +16,7 @@ type Template struct {
 	Org  string
 	Proj string
 	Name string
+	URL  string
 }
 
 func (b *Builder) parseTemplate(file string) ([]byte, error) {