codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add dryflag, implement push for catalogue generate

Browse Source
This commit is contained in:
cellarspoon
2021-12-19 23:59:40 +01:00
parent 217d4bc2cc
commit bf82bc9c7f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cli/catalogue/catalogue.go
View File

@ -63,6 +63,7 @@ var catalogueGenerateCommand = &cli.Command{
internal.PushFlag, internal.PushFlag,
internal.CommitFlag, internal.CommitFlag,
internal.CommitMessageFlag, internal.CommitMessageFlag,
internal.DryFlag,
}, },
Description: ` Description: `
This command generates a new copy of the recipe catalogue which can be found on: This command generates a new copy of the recipe catalogue which can be found on:
@ -233,7 +234,7 @@ A new catalogue copy can be published to the recipes repository by passing the
} }
} }
if err := gitPkg.Commit("**.json", internal.CommitMessage, false); err != nil { if err := gitPkg.Commit("**.json", internal.CommitMessage, internal.Dry, internal.Push); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
} }

2
cli/recipe/release.go
View File

@ -155,7 +155,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
logrus.Fatal("no commit message specified?") logrus.Fatal("no commit message specified?")
} }
if err := gitPkg.Commit("compose.**yml", internal.CommitMessage, internal.Dry); err != nil { if err := gitPkg.Commit("compose.**yml", internal.CommitMessage, internal.Dry, false); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }

4
pkg/git/commit.go
View File

@ -10,7 +10,7 @@ import (
) )
// Commit runs a git commit // Commit runs a git commit
func Commit(glob, commitMessage string, dryRun bool) error { func Commit(glob, commitMessage string, dryRun, push bool) error {
if commitMessage == "" { if commitMessage == "" {
return fmt.Errorf("no commit message specified?") return fmt.Errorf("no commit message specified?")
} }
@ -55,7 +55,7 @@ func Commit(glob, commitMessage string, dryRun bool) error {
logrus.Info("dry run: no changes commited") logrus.Info("dry run: no changes commited")
} }
if !dryRun { if !dryRun && push {
if err := commitRepo.Push(&git.PushOptions{}); err != nil { if err := commitRepo.Push(&git.PushOptions{}); err != nil {
return err return err
} }