Merge branch 'master' of github.com:src-d/go-git into commit

Author: mcuadros

_examples/common_test.go

@@ -2,7 +2,6 @@ package examples
 
 import (
 	"flag"
-	"fmt"
 	"go/build"
 	"io/ioutil"
 	"os"
@@ -96,7 +95,7 @@ func createBareRepository(dir string) string {
 
 func setEmptyRemote(dir string) string {
 	remote := createBareRepository(tempFolder())
-	setRemote(dir, fmt.Sprintf("file://%s", remote))
+	setRemote(dir, remote)
 	return dir
 }
 

_examples/storage/README.md

@@ -1,4 +1,4 @@
-#go-git + aerospike: a git repository backed by a database
+# go-git + aerospike: a git repository backed by a database
 
 <img src="https://upload.wikimedia.org/wikipedia/en/2/2b/Aerospike_logo.png" align="right"/> This is an example of a [go-git](https://github.com/src-d/go-git) repository backed by [Aerospike](http://www.aerospike.com/). 
 

common_test.go

@@ -1,7 +1,6 @@
 package git
 
 import (
-	"fmt"
 	"testing"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -95,8 +94,7 @@ func (s *BaseSuite) GetBasicLocalRepositoryURL() string {
 }
 
 func (s *BaseSuite) GetLocalRepositoryURL(f *fixtures.Fixture) string {
-	path := f.DotGit().Base()
-	return fmt.Sprintf("file://%s", path)
+	return f.DotGit().Base()
 }
 
 type SuiteCommon struct{}

plumbing/transport/client/client.go

@@ -35,13 +35,13 @@ func InstallProtocol(scheme string, c transport.Transport) {
 // http://, https://, ssh:// and file://.
 // See `InstallProtocol` to add or modify protocols.
 func NewClient(endpoint transport.Endpoint) (transport.Transport, error) {
-	f, ok := Protocols[endpoint.Scheme]
+	f, ok := Protocols[endpoint.Protocol()]
 	if !ok {
-		return nil, fmt.Errorf("unsupported scheme %q", endpoint.Scheme)
+		return nil, fmt.Errorf("unsupported scheme %q", endpoint.Protocol())
 	}
 
 	if f == nil {
-		return nil, fmt.Errorf("malformed client for scheme %q, client is defined as nil", endpoint.Scheme)
+		return nil, fmt.Errorf("malformed client for scheme %q, client is defined as nil", endpoint.Protocol())
 	}
 
 	return f, nil

plumbing/transport/common.go

@@ -18,6 +18,7 @@ import (
 	"io"
 	"net/url"
 	"regexp"
+	"strconv"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/protocol/packp"
@@ -28,7 +29,7 @@ var (
 	ErrRepositoryNotFound     = errors.New("repository not found")
 	ErrEmptyRemoteRepository  = errors.New("remote repository is empty")
 	ErrAuthenticationRequired = errors.New("authentication required")
-	ErrAuthorizationFailed	  = errors.New("authorization failed")
+	ErrAuthorizationFailed    = errors.New("authorization failed")
 	ErrEmptyUploadPackRequest = errors.New("empty git-upload-pack given")
 	ErrInvalidAuthMethod      = errors.New("invalid auth method")
 	ErrAlreadyConnected       = errors.New("session already established")
@@ -88,42 +89,159 @@ type ReceivePackSession interface {
 	ReceivePack(*packp.ReferenceUpdateRequest) (*packp.ReportStatus, error)
 }
 
-type Endpoint url.URL
-
-var (
-	isSchemeRegExp   = regexp.MustCompile("^[^:]+://")
-	scpLikeUrlRegExp = regexp.MustCompile("^(?P<user>[^@]+@)?(?P<host>[^:]+):/?(?P<path>.+)$")
-)
+// Endpoint represents a Git URL in any supported protocol.
+type Endpoint interface {
+	// Protocol returns the protocol (e.g. git, https, file). It should never
+	// return the empty string.
+	Protocol() string
+	// User returns the user or an empty string if none is given.
+	User() string
+	// Password returns the password or an empty string if none is given.
+	Password() string
+	// Host returns the host or an empty string if none is given.
+	Host() string
+	// Port returns the port or 0 if there is no port or a default should be
+	// used.
+	Port() int
+	// Path returns the repository path.
+	Path() string
+	// String returns a string representation of the Git URL.
+	String() string
+}
 
 func NewEndpoint(endpoint string) (Endpoint, error) {
-	endpoint = transformSCPLikeIfNeeded(endpoint)
+	if e, ok := parseSCPLike(endpoint); ok {
+		return e, nil
+	}
+
+	if e, ok := parseFile(endpoint); ok {
+		return e, nil
+	}
 
 	u, err := url.Parse(endpoint)
 	if err != nil {
-		return Endpoint{}, plumbing.NewPermanentError(err)
+		return nil, plumbing.NewPermanentError(err)
 	}
 
 	if !u.IsAbs() {
-		return Endpoint{}, plumbing.NewPermanentError(fmt.Errorf(
+		return nil, plumbing.NewPermanentError(fmt.Errorf(
 			"invalid endpoint: %s", endpoint,
 		))
 	}
 
-	return Endpoint(*u), nil
+	return urlEndpoint{u}, nil
+}
+
+type urlEndpoint struct {
+	*url.URL
+}
+
+func (e urlEndpoint) Protocol() string { return e.URL.Scheme }
+func (e urlEndpoint) Host() string     { return e.URL.Hostname() }
+
+func (e urlEndpoint) User() string {
+	if e.URL.User == nil {
+		return ""
+	}
+
+	return e.URL.User.Username()
+}
+
+func (e urlEndpoint) Password() string {
+	if e.URL.User == nil {
+		return ""
+	}
+
+	p, _ := e.URL.User.Password()
+	return p
+}
+
+func (e urlEndpoint) Port() int {
+	p := e.URL.Port()
+	if p == "" {
+		return 0
+	}
+
+	i, err := strconv.Atoi(e.URL.Port())
+	if err != nil {
+		return 0
+	}
+
+	return i
+}
+
+func (e urlEndpoint) Path() string {
+	var res string = e.URL.Path
+	if e.URL.RawQuery != "" {
+		res += "?" + e.URL.RawQuery
+	}
+
+	if e.URL.Fragment != "" {
+		res += "#" + e.URL.Fragment
+	}
+
+	return res
+}
+
+type scpEndpoint struct {
+	user string
+	host string
+	path string
 }
 
-func (e *Endpoint) String() string {
-	u := url.URL(*e)
-	return u.String()
+func (e *scpEndpoint) Protocol() string { return "ssh" }
+func (e *scpEndpoint) User() string     { return e.user }
+func (e *scpEndpoint) Password() string { return "" }
+func (e *scpEndpoint) Host() string     { return e.host }
+func (e *scpEndpoint) Port() int        { return 22 }
+func (e *scpEndpoint) Path() string     { return e.path }
+
+func (e *scpEndpoint) String() string {
+	var user string
+	if e.user != "" {
+		user = fmt.Sprintf("%s@", e.user)
+	}
+
+	return fmt.Sprintf("%s%s:%s", user, e.host, e.path)
+}
+
+type fileEndpoint struct {
+	path string
+}
+
+func (e *fileEndpoint) Protocol() string { return "file" }
+func (e *fileEndpoint) User() string     { return "" }
+func (e *fileEndpoint) Password() string { return "" }
+func (e *fileEndpoint) Host() string     { return "" }
+func (e *fileEndpoint) Port() int        { return 0 }
+func (e *fileEndpoint) Path() string     { return e.path }
+func (e *fileEndpoint) String() string   { return e.path }
+
+var (
+	isSchemeRegExp   = regexp.MustCompile(`^[^:]+://`)
+	scpLikeUrlRegExp = regexp.MustCompile(`^(?:(?P<user>[^@]+)@)?(?P<host>[^:\s]+):(?P<path>[^\\].*)$`)
+)
+
+func parseSCPLike(endpoint string) (Endpoint, bool) {
+	if isSchemeRegExp.MatchString(endpoint) || !scpLikeUrlRegExp.MatchString(endpoint) {
+		return nil, false
+	}
+
+	m := scpLikeUrlRegExp.FindStringSubmatch(endpoint)
+	return &scpEndpoint{
+		user: m[1],
+		host: m[2],
+		path: m[3],
+	}, true
 }
 
-func transformSCPLikeIfNeeded(endpoint string) string {
-	if !isSchemeRegExp.MatchString(endpoint) && scpLikeUrlRegExp.MatchString(endpoint) {
-		m := scpLikeUrlRegExp.FindStringSubmatch(endpoint)
-		return fmt.Sprintf("ssh://%s%s/%s", m[1], m[2], m[3])
+func parseFile(endpoint string) (Endpoint, bool) {
+	if isSchemeRegExp.MatchString(endpoint) {
+		return nil, false
 	}
 
-	return endpoint
+	path := endpoint
+	return &fileEndpoint{path}, true
 }
 
 // UnsupportedCapabilities are the capabilities not supported by any client

plumbing/transport/common_test.go

@@ -14,22 +14,118 @@ type SuiteCommon struct{}
 
 var _ = Suite(&SuiteCommon{})
 
-func (s *SuiteCommon) TestNewEndpoint(c *C) {
+func (s *SuiteCommon) TestNewEndpointHTTP(c *C) {
+	e, err := NewEndpoint("http://git:[email protected]/user/repository.git?foo#bar")
+	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "http")
+	c.Assert(e.User(), Equals, "git")
+	c.Assert(e.Password(), Equals, "pass")
+	c.Assert(e.Host(), Equals, "github.com")
+	c.Assert(e.Port(), Equals, 0)
+	c.Assert(e.Path(), Equals, "/user/repository.git?foo#bar")
+	c.Assert(e.String(), Equals, "http://git:[email protected]/user/repository.git?foo#bar")
+}
+
+func (s *SuiteCommon) TestNewEndpointSSH(c *C) {
 	e, err := NewEndpoint("ssh://[email protected]/user/repository.git")
 	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "ssh")
+	c.Assert(e.User(), Equals, "git")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "github.com")
+	c.Assert(e.Port(), Equals, 0)
+	c.Assert(e.Path(), Equals, "/user/repository.git")
 	c.Assert(e.String(), Equals, "ssh://[email protected]/user/repository.git")
 }
 
+func (s *SuiteCommon) TestNewEndpointSSHNoUser(c *C) {
+	e, err := NewEndpoint("ssh://github.com/user/repository.git")
+	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "ssh")
+	c.Assert(e.User(), Equals, "")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "github.com")
+	c.Assert(e.Port(), Equals, 0)
+	c.Assert(e.Path(), Equals, "/user/repository.git")
+	c.Assert(e.String(), Equals, "ssh://github.com/user/repository.git")
+}
+
+func (s *SuiteCommon) TestNewEndpointSSHWithPort(c *C) {
+	e, err := NewEndpoint("ssh://[email protected]:777/user/repository.git")
+	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "ssh")
+	c.Assert(e.User(), Equals, "git")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "github.com")
+	c.Assert(e.Port(), Equals, 777)
+	c.Assert(e.Path(), Equals, "/user/repository.git")
+	c.Assert(e.String(), Equals, "ssh://[email protected]:777/user/repository.git")
+}
+
 func (s *SuiteCommon) TestNewEndpointSCPLike(c *C) {
 	e, err := NewEndpoint("[email protected]:user/repository.git")
 	c.Assert(err, IsNil)
-	c.Assert(e.String(), Equals, "ssh://[email protected]/user/repository.git")
+	c.Assert(e.Protocol(), Equals, "ssh")
+	c.Assert(e.User(), Equals, "git")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "github.com")
+	c.Assert(e.Port(), Equals, 22)
+	c.Assert(e.Path(), Equals, "user/repository.git")
+	c.Assert(e.String(), Equals, "[email protected]:user/repository.git")
+}
+
+func (s *SuiteCommon) TestNewEndpointFileAbs(c *C) {
+	e, err := NewEndpoint("/foo.git")
+	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "file")
+	c.Assert(e.User(), Equals, "")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "")
+	c.Assert(e.Port(), Equals, 0)
+	c.Assert(e.Path(), Equals, "/foo.git")
+	c.Assert(e.String(), Equals, "/foo.git")
+}
+
+func (s *SuiteCommon) TestNewEndpointFileRel(c *C) {
+	e, err := NewEndpoint("foo.git")
+	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "file")
+	c.Assert(e.User(), Equals, "")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "")
+	c.Assert(e.Port(), Equals, 0)
+	c.Assert(e.Path(), Equals, "foo.git")
+	c.Assert(e.String(), Equals, "foo.git")
+}
+
+func (s *SuiteCommon) TestNewEndpointFileWindows(c *C) {
+	e, err := NewEndpoint("C:\\foo.git")
+	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "file")
+	c.Assert(e.User(), Equals, "")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "")
+	c.Assert(e.Port(), Equals, 0)
+	c.Assert(e.Path(), Equals, "C:\\foo.git")
+	c.Assert(e.String(), Equals, "C:\\foo.git")
+}
+
+func (s *SuiteCommon) TestNewEndpointFileURL(c *C) {
+	e, err := NewEndpoint("file:///foo.git")
+	c.Assert(err, IsNil)
+	c.Assert(e.Protocol(), Equals, "file")
+	c.Assert(e.User(), Equals, "")
+	c.Assert(e.Password(), Equals, "")
+	c.Assert(e.Host(), Equals, "")
+	c.Assert(e.Port(), Equals, 0)
+	c.Assert(e.Path(), Equals, "/foo.git")
+	c.Assert(e.String(), Equals, "file:///foo.git")
 }
 
-func (s *SuiteCommon) TestNewEndpointWrongForgat(c *C) {
-	e, err := NewEndpoint("foo")
-	c.Assert(err, Not(IsNil))
-	c.Assert(e.Host, Equals, "")
+func (s *SuiteCommon) TestNewEndpointInvalidURL(c *C) {
+	e, err := NewEndpoint("http://\\")
+	c.Assert(err, NotNil)
+	c.Assert(e, IsNil)
 }
 
 func (s *SuiteCommon) TestFilterUnsupportedCapabilities(c *C) {

plumbing/transport/file/client.go

@@ -41,7 +41,7 @@ func (r *runner) Command(cmd string, ep transport.Endpoint, auth transport.AuthM
 		return nil, err
 	}
 
-	return &command{cmd: exec.Command(cmd, ep.Path)}, nil
+	return &command{cmd: exec.Command(cmd, ep.Path())}, nil
 }
 
 type command struct {