Merge pull request #587 from sectioneight/handle-gopkg-unstable

Add support for -unstable gopkg.in imports

Author: sdboyer

internal/gps/deduce.go

@@ -27,6 +27,8 @@ var (
 	svnSchemes = []string{"https", "http", "svn", "svn+ssh"}
 )
 
+const gopkgUnstableSuffix = "-unstable"
+
 func validateVCSScheme(scheme, typ string) bool {
 	// everything allows plain ssh
 	if scheme == "ssh" {
@@ -276,10 +278,18 @@ func (m gopkginDeducer) deduceSource(p string, u *url.URL) (maybeSource, error)
 	} else {
 		u.Path = path.Join(v[2], v[3])
 	}
-	major, err := strconv.ParseUint(v[4][1:], 10, 64)
+
+	unstable := false
+	majorStr := v[4]
+
+	if strings.HasSuffix(majorStr, gopkgUnstableSuffix) {
+		unstable = true
+		majorStr = strings.TrimSuffix(majorStr, gopkgUnstableSuffix)
+	}
+	major, err := strconv.ParseUint(majorStr[1:], 10, 64)
 	if err != nil {
 		// this should only be reachable if there's an error in the regex
-		return nil, fmt.Errorf("could not parse %q as a gopkg.in major version", v[4][1:])
+		return nil, fmt.Errorf("could not parse %q as a gopkg.in major version", majorStr[1:])
 	}
 
 	mb := make(maybeSources, len(gitSchemes))
@@ -290,9 +300,10 @@ func (m gopkginDeducer) deduceSource(p string, u *url.URL) (maybeSource, error)
 		}
 		u2.Scheme = scheme
 		mb[k] = maybeGopkginSource{
-			opath: v[1],
-			url:   &u2,
-			major: major,
+			opath:    v[1],
+			url:      &u2,
+			major:    major,
+			unstable: unstable,
 		}
 	}
 

internal/gps/maybe_source.go

@@ -131,6 +131,8 @@ type maybeGopkginSource struct {
 	url *url.URL
 	// the major version to apply for filtering
 	major uint64
+	// whether or not the source package is "unstable"
+	unstable bool
 }
 
 func (m maybeGopkginSource) try(ctx context.Context, cachedir string, c singleSourceCache, superv *supervisor) (source, sourceState, error) {
@@ -151,7 +153,8 @@ func (m maybeGopkginSource) try(ctx context.Context, cachedir string, c singleSo
 				repo: &gitRepo{r},
 			},
 		},
-		major: m.major,
+		major:    m.major,
+		unstable: m.unstable,
 	}
 
 	var vl []PairedVersion

internal/gps/vcs_source.go

@@ -278,7 +278,8 @@ func (s *gitSource) listVersions(ctx context.Context) (vlist []PairedVersion, er
 // according to the input URL.
 type gopkginSource struct {
 	gitSource
-	major uint64
+	major    uint64
+	unstable bool
 }
 
 func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, error) {
@@ -297,23 +298,27 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
 		pv := v.(versionPair)
 		switch tv := pv.v.(type) {
 		case semVersion:
-			if tv.sv.Major() == s.major {
+			if tv.sv.Major() == s.major && !s.unstable {
 				vlist[k] = v
 				k++
 			}
 		case branchVersion:
 			// The semver lib isn't exactly the same as gopkg.in's logic, but
 			// it's close enough that it's probably fine to use. We can be more
-			// exact if real problems crop up. The most obvious vector for
-			// problems is that we totally ignore the "unstable" designation
-			// right now.
+			// exact if real problems crop up.
 			sv, err := semver.NewVersion(tv.name)
 			if err != nil || sv.Major() != s.major {
 				// not a semver-shaped branch name at all, or not the same major
 				// version as specified in the import path constraint
 				continue
 			}
 
+			// Gopkg.in has a special "-unstable" suffix which we need to handle
+			// separately.
+			if s.unstable != strings.HasSuffix(tv.name, gopkgUnstableSuffix) {
+				continue
+			}
+
 			// Turn off the default branch marker unconditionally; we can't know
 			// which one to mark as default until we've seen them all
 			tv.isDefault = false

internal/gps/vcs_source_test.go

@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"os/exec"
 	"reflect"
+	"strings"
 	"sync"
 	"testing"
 )
@@ -152,10 +153,12 @@ func testGopkginSourceInteractions(t *testing.T) {
 			t.Errorf("URL was bad, lolwut? errtext: %s", err)
 			return
 		}
+		unstable := strings.HasSuffix(opath, gopkgUnstableSuffix)
 		mb := maybeGopkginSource{
-			opath: opath,
-			url:   u,
-			major: major,
+			opath:    opath,
+			url:      u,
+			major:    major,
+			unstable: unstable,
 		}
 
 		ctx := context.Background()
@@ -240,7 +243,7 @@ func testGopkginSourceInteractions(t *testing.T) {
 
 	// simultaneously run for v1, v2, and v3 filters of the target repo
 	wg := &sync.WaitGroup{}
-	wg.Add(3)
+	wg.Add(4)
 	go func() {
 		tfunc("gopkg.in/sdboyer/gpkt.v1", "github.com/sdboyer/gpkt", 1, []Version{
 			NewVersion("v1.1.0").Is(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
@@ -265,6 +268,13 @@ func testGopkginSourceInteractions(t *testing.T) {
 		wg.Done()
 	}()
 
+	go func() {
+		tfunc("github.com/sdboyer/gpkt2.v1-unstable", "github.com/sdboyer/gpkt2", 1, []Version{
+			newDefaultBranch("v1-unstable").Is(Revision("24de0be8f4a0b8a44321562117749b257bfcef69")),
+		})
+		wg.Done()
+	}()
+
 	wg.Wait()
 }