path.Clean update args (paths)

This is a better alternative as it cleans all possible crazy input.

/cc @kr

Changelog.md

@@ -1,3 +1,7 @@
+# v26 2015/11/05
+
+* Better fix for the issue fixed in v25: All update paths are now path.Clean()'d
+
 # v25 2015/11/05
 
 * `godep update package/` == `godep update package`. Fixes #313

match_test.go

@@ -22,7 +22,6 @@ func TestMatchPattern(t *testing.T) {
 		{"net/...", "net", true},
 		{"net/...", "net/http", true},
 		{"net/...", "not/http", false},
-		{"net/", "net", true},
 	}
 	for _, test := range cases {
 		ok := matchPattern(test.pat)(test.path)

update.go

@@ -4,6 +4,7 @@ import (
 	"go/parser"
 	"go/token"
 	"log"
+	"path"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -44,6 +45,7 @@ func update(args []string) error {
 		return err
 	}
 	for _, arg := range args {
+		arg := path.Clean(arg)
 		any := markMatches(arg, g.Deps)
 		if !any {
 			log.Println("not in manifest:", arg)
@@ -136,10 +138,7 @@ func matchPattern(pattern string) func(name string) bool {
 	re := regexp.QuoteMeta(pattern)
 	re = strings.Replace(re, `\.\.\.`, `.*`, -1)
 	// Special case: foo/... matches foo too.
-	switch {
-	case strings.HasSuffix(re, `/`):
-		re = re[:len(re)-len(`/`)] + `(/)?`
-	case strings.HasSuffix(re, `/.*`):
+	if strings.HasSuffix(re, `/.*`) {
 		re = re[:len(re)-len(`/.*`)] + `(/.*)?`
 	}
 	reg := regexp.MustCompile(`^` + re + `$`)

update_test.go

@@ -54,6 +54,41 @@ func TestUpdate(t *testing.T) {
 				},
 			},
 		},
+		{ // simple case, update one dependency, trailing slash
+			cwd:  "C",
+			args: []string{"D/"},
+			start: []*node{
+				{
+					"D",
+					"",
+					[]*node{
+						{"main.go", pkg("D") + decl("D1"), nil},
+						{"+git", "D1", nil},
+						{"main.go", pkg("D") + decl("D2"), nil},
+						{"+git", "D2", nil},
+					},
+				},
+				{
+					"C",
+					"",
+					[]*node{
+						{"main.go", pkg("main", "D"), nil},
+						{"Godeps/Godeps.json", godeps("C", "D", "D1"), nil},
+						{"Godeps/_workspace/src/D/main.go", pkg("D") + decl("D1"), nil},
+						{"+git", "", nil},
+					},
+				},
+			},
+			want: []*node{
+				{"C/Godeps/_workspace/src/D/main.go", pkg("D") + decl("D2"), nil},
+			},
+			wdep: Godeps{
+				ImportPath: "C",
+				Deps: []Dependency{
+					{ImportPath: "D", Comment: "D2"},
+				},
+			},
+		},
 		{ // update one dependency, keep other one, no rewrite
 			cwd:  "C",
 			args: []string{"D"},

version.go

@@ -1,3 +1,3 @@
 package main
 
-const version = 25
+const version = 26