Merge branch 'master' of https://github.com/Bugagazavr/go-gitlab-client

deploy_keys.go

@@ -77,11 +77,10 @@ Parameters:
 
 */
 func (g *Gitlab) AddProjectDeployKey(id, title, key string) error {
+	var err error
 
 	path, opaque := g.ResourceUrlRaw(project_url_deploy_keys, map[string]string{":id": id})
 
-	var err error
-
 	v := url.Values{}
 	v.Set("title", title)
 	v.Set("key", key)

projects.go

@@ -3,6 +3,7 @@ package gogitlab
 import (
 	"encoding/json"
 	"strconv"
+	"strings"
 )
 
 const (
@@ -207,3 +208,38 @@ func (g *Gitlab) ProjectMergeRequests(id string, page int, per_page int, state s
 
 	return mr, err
 }
+
+/*
+Get single project id.
+
+    GET /projects/search/:query
+
+Parameters:
+
+    namespace The namespace of a project
+    name      The id of a project
+
+*/
+func (g *Gitlab) SearchProjectId(namespace string, name string) (id int, err error) {
+
+	url, opaque := g.ResourceUrlRaw(projects_search_url, map[string]string{
+		":query": strings.ToLower(name),
+	})
+
+	var projects []*Project
+
+	contents, err := g.buildAndExecRequestRaw("GET", url, opaque, nil)
+	if err == nil {
+		err = json.Unmarshal(contents, &projects)
+	} else {
+		return id, err
+	}
+
+	for _, project := range projects {
+		if project.Namespace.Name == namespace {
+			id = project.Id
+		}
+	}
+
+	return id, err
+}

projects_test.go

@@ -56,3 +56,15 @@ func TestProjectMergeRequests(t *testing.T) {
 		assert.Equal(t, mr[0].SourceBranch, "test1")
 	}
 }
+
+func TestSearchProjectId(t *testing.T) {
+	ts, gitlab := Stub("stubs/projects/index.json")
+
+	namespace := "Brightbox"
+	name := "Puppet"
+	id, err := gitlab.SearchProjectId(namespace, name)
+
+	assert.Equal(t, err, nil)
+	assert.Equal(t, id, 6)
+	defer ts.Close()
+}

repositories.go

@@ -53,6 +53,15 @@ type Commit struct {
 	CreatedAt    time.Time
 }
 
+type File struct {
+	Id   string `json:"id,omitempty"`
+	Name string `json:"name,omitempty"`
+	Type string `json:"type,omitempty"`
+	Mode string `json:"mode,omitempty"`
+
+	Children []*File
+}
+
 /*
 Get a list of repository branches from a project, sorted by name alphabetically.
 
@@ -207,3 +216,31 @@ func (g *Gitlab) RepoRawFile(id, sha, filepath string) ([]byte, error) {
 
 	return contents, err
 }
+
+/*
+Get Raw file content
+*/
+func (g *Gitlab) RepoTree(id, ref, path string) ([]*File, error) {
+
+	url := g.ResourceUrlQuery(repo_url_tree, map[string]string{
+		":id": id,
+	}, map[string]string{
+		"ref":  ref,
+		"path": path,
+	})
+
+	var files []*File
+
+	contents, err := g.buildAndExecRequest("GET", url, nil)
+	if err == nil {
+		err = json.Unmarshal(contents, &files)
+	}
+
+	for _, f := range files {
+		if f.Type == "tree" {
+			f.Children, err = g.RepoTree(id, ref, path+"/"+f.Name)
+		}
+	}
+
+	return files, err
+}