Skip to content

Commit 99bff9c

Browse files
committed
split to meta.go
1 parent 2f994ff commit 99bff9c

File tree

2 files changed

+53
-48
lines changed

2 files changed

+53
-48
lines changed

meta.go

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package semv
2+
3+
import (
4+
"bytes"
5+
)
6+
7+
// UsernameCmd for git
8+
var UsernameCmd = []string{"config", "user.name"}
9+
10+
// LatestCommitCmd for git
11+
var LatestCommitCmd = []string{"describe", "--always"}
12+
var usernameCmder Cmder
13+
var latestCommitCmder Cmder
14+
15+
func username() ([]byte, error) {
16+
if usernameCmder == nil {
17+
usernameCmder = Cmd{}
18+
}
19+
20+
b, err := usernameCmder.Do(git, UsernameCmd...)
21+
if err != nil {
22+
return nil, err
23+
}
24+
25+
return bytes.TrimSpace(b), nil
26+
}
27+
28+
func latestCommit() ([]byte, error) {
29+
if latestCommitCmder == nil {
30+
latestCommitCmder = Cmd{}
31+
}
32+
33+
b, err := latestCommitCmder.Do(git, LatestCommitCmd...)
34+
if err != nil {
35+
return nil, err
36+
}
37+
38+
return bytes.TrimSpace(b), nil
39+
}
40+
41+
func meta() ([]string, error) {
42+
user, err := username()
43+
if err != nil {
44+
return nil, err
45+
}
46+
47+
hash, err := latestCommit()
48+
if err != nil {
49+
return nil, err
50+
}
51+
52+
return []string{string(hash), string(user)}, nil
53+
}

semv.go

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
package semv
22

33
import (
4-
"bytes"
54
"fmt"
65

76
"github.com/blang/semver"
87
)
98

10-
// UsernameCmd for git
11-
var UsernameCmd = []string{"config", "user.name"}
12-
13-
// LatestCommitCmd for git
14-
var LatestCommitCmd = []string{"describe", "--always"}
15-
var usernameCmder Cmder
16-
var latestCommitCmder Cmder
179
var defaultPreVersion = "0"
1810
var defaultPreVersionPrefix = "alpha"
1911
var defaultTagPrefix = "v"
@@ -163,43 +155,3 @@ func (v *Semv) incrementPatch() {
163155
v.data.Patch++
164156
v.data.Pre = nil
165157
}
166-
167-
func username() ([]byte, error) {
168-
if usernameCmder == nil {
169-
usernameCmder = Cmd{}
170-
}
171-
172-
b, err := usernameCmder.Do(git, UsernameCmd...)
173-
if err != nil {
174-
return nil, err
175-
}
176-
177-
return bytes.TrimSpace(b), nil
178-
}
179-
180-
func latestCommit() ([]byte, error) {
181-
if latestCommitCmder == nil {
182-
latestCommitCmder = Cmd{}
183-
}
184-
185-
b, err := latestCommitCmder.Do(git, LatestCommitCmd...)
186-
if err != nil {
187-
return nil, err
188-
}
189-
190-
return bytes.TrimSpace(b), nil
191-
}
192-
193-
func meta() ([]string, error) {
194-
user, err := username()
195-
if err != nil {
196-
return nil, err
197-
}
198-
199-
hash, err := latestCommit()
200-
if err != nil {
201-
return nil, err
202-
}
203-
204-
return []string{string(hash), string(user)}, nil
205-
}

0 commit comments

Comments
 (0)