Skip to content

Commit f0433ab

Browse files
committed
Merge pull request #2 from driusan/v0.3-dev
V0.3.1 Release
2 parents 2d2d793 + e0da760 commit f0433ab

5 files changed

Lines changed: 21 additions & 14 deletions

File tree

‎bugapp/Commit.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import (
99
func Commit(args ArgumentList) {
1010
options := make(map[string]bool)
1111
if !args.HasArgument("--no-autoclose") {
12-
options["autoclose"] = false
13-
} else {
1412
options["autoclose"] = true
13+
} else {
14+
options["autoclose"] = false
1515
}
16+
1617
scm, _, err := scm.DetectSCM(options)
1718
if err != nil {
1819
fmt.Printf("Error: %s\n", err.Error())

‎bugapp/Version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import (
66
)
77

88
func Version() {
9-
fmt.Printf("%s version 0.3-dev\n", os.Args[0])
9+
fmt.Printf("%s version 0.3.1\n", os.Args[0])
1010

1111
}

‎scm/GitManager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (a GitManager) getDeletedIdentifiers(dir bugs.Directory) []string {
5656
continue
5757
}
5858
if file[0:1] == "D" && strings.HasSuffix(file, "Identifier") {
59-
ghRegex := regexp.MustCompile("-Github:(\\s*)(.*)")
59+
ghRegex := regexp.MustCompile("(?im)^-Github:(\\s*)(.*)(\\s*)$^")
6060
diff := exec.Command("git", "diff", "--staged", "--", file[3:])
6161
diffout, _ := diff.CombinedOutput()
6262
if matches := ghRegex.FindStringSubmatch(string(diffout)); len(matches) > 2 {

‎scm/GitManager_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,8 @@ func (m GitTester) GetManager() SCMHandler {
107107
}
108108

109109
func TestGitBugRenameCommits(t *testing.T) {
110-
if os.Getenv("TRAVIS") == "true" {
111-
// I think this is related to the version of git installed
112-
// on Travis, but the apt add-on won't let us install a newer
113-
// version to test. For now, this test gets skipped.
114-
t.Skip("Test failing under Travis for unknown reasons.")
110+
if os.Getenv("TRAVIS") == "true" && os.Getenv("TRAVIS_OS_NAME") == "linux" {
111+
t.Skip("Skipping test which fails only under Travis for unknown reasons..")
115112
return
116113
}
117114
gm := GitTester{}
@@ -139,3 +136,11 @@ func TestGitFilesOutsideOfBugNotCommited(t *testing.T) {
139136
gm.handler = GitManager{}
140137
runtestCommitDirtyTree(&gm, t)
141138
}
139+
140+
func TestGitManagerGetType(t *testing.T) {
141+
manager := GitManager{}
142+
143+
if getType := manager.GetSCMType(); getType != "git" {
144+
t.Error("Incorrect SCM Type for GitManager. Got " + getType)
145+
}
146+
}

‎scm/TestHelpers_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package scm
22

33
import (
4+
"fmt"
45
"github.com/driusan/bug/bugs"
56
"io/ioutil"
67
"os"
@@ -58,6 +59,7 @@ func assertLogs(tester ManagerTester, t *testing.T, titles []string, diffs []str
5859
} else {
5960
if diff != diffs[i] {
6061
t.Error("Incorrect diff for " + titles[i])
62+
fmt.Fprintf(os.Stderr, "Got %s, expected %s", diff, diffs[i])
6163
}
6264
}
6365
}
@@ -68,7 +70,6 @@ func runtestRenameCommitsHelper(tester ManagerTester, t *testing.T, expectedDiff
6870
defer tester.TearDown()
6971
if err != nil {
7072
t.Error("Could not initialize repo")
71-
panic("Something went wrong trying to initialize git:" + err.Error())
7273
return
7374
}
7475

@@ -77,10 +78,10 @@ func runtestRenameCommitsHelper(tester ManagerTester, t *testing.T, expectedDiff
7778
t.Error("Could not get manager")
7879
return
7980
}
80-
os.Mkdir("issues", 0755)
81-
runCmd("bug", "create", "-n", "Test bug")
81+
os.MkdirAll("issues/Test-bug", 0755)
82+
ioutil.WriteFile("issues/Test-bug/Description", []byte(""), 0644)
8283
m.Commit(bugs.Directory(tester.GetWorkDir()), "Initial commit")
83-
runCmd("bug", "relabel", "1", "Renamed bug")
84+
runCmd("bug", "relabel", "1", "Renamed", "bug")
8485
m.Commit(bugs.Directory(tester.GetWorkDir()), "This is a test rename")
8586

8687
tester.AssertCleanTree(t)
@@ -100,7 +101,7 @@ func runtestCommitDirtyTree(tester ManagerTester, t *testing.T) {
100101
return
101102
}
102103
os.Mkdir("issues", 0755)
103-
runCmd("bug", "create", "-n", "Test bug")
104+
runCmd("bug", "create", "-n", "Test", "bug")
104105
if err = ioutil.WriteFile("donotcommit.txt", []byte(""), 0644); err != nil {
105106
t.Error("Could not write file")
106107
return

0 commit comments

Comments
 (0)
⌂ 换网址