Skip to content

Commit

Permalink
Merge pull request #6 from motemen/update-gobump-run
Browse files Browse the repository at this point in the history
Gobump.Run returns version informations
  • Loading branch information
Songmu authored Feb 15, 2019
2 parents bd1d962 + c025b19 commit 1adb663
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@ Flags:`)
}

gb.Target = fs.Arg(0)
return gb.Run()
_, err := gb.Run()
return err
}
15 changes: 9 additions & 6 deletions gobump.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type Gobump struct {
}

// Run the gobump
func (gb *Gobump) Run() error {
func (gb *Gobump) Run() (map[string]map[string]string, error) {
if gb.OutStream == nil {
gb.OutStream = os.Stdout
}
Expand All @@ -39,20 +39,22 @@ func (gb *Gobump) Run() error {
fset := token.NewFileSet()
pkgs, err := parser.ParseDir(fset, gb.Target, nil, parser.ParseComments)
if err != nil {
return err
return nil, err
}

ret := make(map[string]map[string]string)
found := false
for _, pkg := range pkgs {
for _, f := range pkg.Files {
vers, err := gb.Config.ProcessNode(fset, f)
if err != nil {
return err
return nil, err
}
if vers == nil {
continue
}

ret[fset.File(f.Pos()).Name()] = vers
found = true
if gb.Verbose || gb.Show {
if gb.Raw {
Expand All @@ -67,20 +69,21 @@ func (gb *Gobump) Run() error {
continue
}
if err := gb.out(fset, f); err != nil {
return err
return nil, err
}
}
}

if found == false {
return fmt.Errorf("version not found")
return nil, fmt.Errorf("version not found")
}
return nil
return ret, nil
}

func (gb *Gobump) out(fset *token.FileSet, f *ast.File) error {
out := gb.OutStream
if gb.Write {
// XXX shoule be use tmpfile here?
file, err := os.Create(fset.File(f.Pos()).Name())
if err != nil {
return err
Expand Down

0 comments on commit 1adb663

Please sign in to comment.