Skip to content

Commit b5afaa2

Browse files
authored
1 parent f33ef0f commit b5afaa2

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

cmd/create.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ import (
1515
"github.com/spf13/cobra"
1616
)
1717

18-
var createConfigPath string
18+
var (
19+
createConfigPath string
20+
overwriteFiles bool
21+
)
1922

2023
func init() {
2124
createCmd.PersistentFlags().StringVarP(&createConfigPath, "config", "c", constants.ZeroProjectYml, "config path")
25+
createCmd.PersistentFlags().BoolVarP(&overwriteFiles, "overwrite", "o", false, "overwrite pre-existing files")
2226

2327
rootCmd.AddCommand(createCmd)
2428
}
@@ -38,7 +42,7 @@ func Create(dir string, createConfigPath string) {
3842
configFilePath := path.Join(dir, createConfigPath)
3943
projectConfig := projectconfig.LoadConfig(configFilePath)
4044

41-
generate.Generate(*projectConfig)
45+
generate.Generate(*projectConfig, overwriteFiles)
4246

4347
if projectConfig.ShouldPushRepositories {
4448
flog.Infof(":up_arrow: Done Rendering - committing repositories to version control.")

internal/generate/generate_modules.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
)
2323

2424
// Generate accepts a projectconfig struct and renders the templates for all referenced modules
25-
func Generate(projectConfig projectconfig.ZeroProjectConfig) error {
25+
func Generate(projectConfig projectconfig.ZeroProjectConfig, overwriteFiles bool) error {
2626
flog.Infof(":clock: Fetching Modules")
2727

2828
// Make sure module sources are on disk
@@ -56,7 +56,7 @@ func Generate(projectConfig projectconfig.ZeroProjectConfig) error {
5656
mod.Files,
5757
}
5858

59-
txtTypeFiles, binTypeFiles := sortFileType(moduleDir, outputDir, false)
59+
txtTypeFiles, binTypeFiles := sortFileType(moduleDir, outputDir, overwriteFiles)
6060

6161
executeTemplates(txtTypeFiles, templateData, delimiters)
6262
copyBinFiles(binTypeFiles)

internal/generate/generate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestGenerateModules(t *testing.T) {
3232
"mod1": projectconfig.NewModule(map[string]string{"test": "bar"}, tmpDir, "github.com/fake-org/repo-foo", baseTestFixturesDir, []string{}),
3333
},
3434
}
35-
generate.Generate(projectConfig)
35+
generate.Generate(projectConfig, true)
3636

3737
content, err := ioutil.ReadFile(filepath.Join(tmpDir, "file_to_template.txt"))
3838
assert.NoError(t, err)

0 commit comments

Comments
 (0)