Go fmt

branch.go

@@ -3,17 +3,17 @@ package gobucket
 type BranchList map[string]*Branch
 
 type Branch struct {
-	Node string `json:"node"`
-	Files []File `json:"files"`
-	RawAuthor string `json:"raw_author"`
-	UtcTimestamp string `json:"utctimestamp"`
-	Author string `json:"author"`
-	Timestamp string `json:"timestamp"`
-	RawNode string `json:"raw_node"`
-	Parents []string `json:"parents"`
-	Branch string `json:"branch"`
-	Message string `json:"message"`
-	Size int `json:"size"`
+	Node         string   `json:"node"`
+	Files        []File   `json:"files"`
+	RawAuthor    string   `json:"raw_author"`
+	UtcTimestamp string   `json:"utctimestamp"`
+	Author       string   `json:"author"`
+	Timestamp    string   `json:"timestamp"`
+	RawNode      string   `json:"raw_node"`
+	Parents      []string `json:"parents"`
+	Branch       string   `json:"branch"`
+	Message      string   `json:"message"`
+	Size         int      `json:"size"`
 }
 
 type BranchName struct {

commit.go

@@ -1,15 +1,15 @@
 package gobucket
 
 type Commit struct {
-	Node string `json:"node"`
-	Files []File `json:"files"`
-	RawAuthor string `json:"raw_author"`
-	UtcTimestamp string `json:"utctimestamp"`
-	Author string `json:"author"`
-	Timestamp string `json:"timestamp"`
-	RawNode string `json:"raw_node"`
-	Parents []string `json:"parents"`
-	Branch string `json:"branch"`
-	Message string `json:"message"`
-	Size int `json:"size"`
+	Node         string   `json:"node"`
+	Files        []File   `json:"files"`
+	RawAuthor    string   `json:"raw_author"`
+	UtcTimestamp string   `json:"utctimestamp"`
+	Author       string   `json:"author"`
+	Timestamp    string   `json:"timestamp"`
+	RawNode      string   `json:"raw_node"`
+	Parents      []string `json:"parents"`
+	Branch       string   `json:"branch"`
+	Message      string   `json:"message"`
+	Size         int      `json:"size"`
 }

gobucket.go

@@ -1,12 +1,12 @@
 package gobucket
 
 import (
+	"bytes"
+	"encoding/json"
 	"net/http"
 	"net/url"
-	"encoding/json"
-	"bytes"
 	"strings"
-//	"reflect"
+	//	"reflect"
 )
 
 const (
@@ -19,15 +19,14 @@ func NewClient(usernameStr string, passwordStr string) *Client {
 
 	httpClient := http.DefaultClient
 
-
 	baseURL, _ := url.Parse(defaultBaseURL)
 
 	c := &Client{
-		client: httpClient,
+		client:    httpClient,
 		UserAgent: userAgent,
-		BaseURL: baseURL,
-		username: usernameStr,
-		password: passwordStr,
+		BaseURL:   baseURL,
+		username:  usernameStr,
+		password:  passwordStr,
 	}
 
 	c.Repositories = &RepositoriesService{client: c}
@@ -36,8 +35,7 @@ func NewClient(usernameStr string, passwordStr string) *Client {
 }
 
 type Client struct {
-
-	BaseURL  *url.URL
+	BaseURL *url.URL
 
 	client *http.Client
 
@@ -48,11 +46,8 @@ type Client struct {
 
 	Repositories *RepositoriesService
 	PullRequests *PullRequestsService
-
 }
 
-
-
 func (c *Client) NewRequest(method string, urlString string, body interface{}) (*http.Request, error) {
 
 	rel, err := url.Parse(urlString)
@@ -74,7 +69,6 @@ func (c *Client) NewRequest(method string, urlString string, body interface{}) (
 
 	}
 
-
 	req, err := http.NewRequest(method, u, buf)
 
 	if err != nil {
@@ -90,8 +84,7 @@ func (c *Client) NewRequest(method string, urlString string, body interface{}) (
 	return req, nil
 }
 
-func (c *Client) Do(req *http.Request, output interface {}) error {
-
+func (c *Client) Do(req *http.Request, output interface{}) error {
 
 	resp, err := c.client.Do(req)
 

gobucket_test.go

@@ -1,13 +1,13 @@
 package gobucket
 
 import (
+	"fmt"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"io/ioutil"
-	"testing"
-	"fmt"
 	"reflect"
+	"testing"
 )
 
 var (
@@ -110,7 +110,6 @@ func TestClientNewRequest_String(t *testing.T) {
 	}
 }
 
-
 func TestDo_GET(t *testing.T) {
 	setUp()
 	defer tearDown()
@@ -120,11 +119,11 @@ func TestDo_GET(t *testing.T) {
 	}
 
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-			if m := "GET"; m != r.Method {
-				t.Errorf("Request method = %v, expected %v", r.Method, m)
-			}
-			fmt.Fprint(w, `{"Bar":"drink"}`)
-		})
+		if m := "GET"; m != r.Method {
+			t.Errorf("Request method = %v, expected %v", r.Method, m)
+		}
+		fmt.Fprint(w, `{"Bar":"drink"}`)
+	})
 
 	req, _ := client.NewRequest("GET", "/", nil)
 	body := new(Foo)
@@ -147,11 +146,11 @@ func TestDo_POST(t *testing.T) {
 	}
 
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-			if m := "POST"; m != r.Method {
-				t.Errorf("Request method = %v, expected %v", r.Method, m)
-			}
-			fmt.Fprint(w, `{"Bar":"drink"}`)
-		})
+		if m := "POST"; m != r.Method {
+			t.Errorf("Request method = %v, expected %v", r.Method, m)
+		}
+		fmt.Fprint(w, `{"Bar":"drink"}`)
+	})
 
 	req, _ := client.NewRequest("POST", "/", nil)
 	body := new(Foo)

hook.go

@@ -17,13 +17,12 @@ func GetHookData(payload []byte) (*Hook, error) {
 	return &h, nil
 }
 
-
 type Hook struct {
 	Repository HookRepository `json:"repository"`
-	Truncated  bool       `json:"truncated"`
-	Commits    []Commit   `json:"commits"`
-	ConnonUrl  string     `json:"canon_url"`
-	User       string     `json:"user"`
+	Truncated  bool           `json:"truncated"`
+	Commits    []Commit       `json:"commits"`
+	ConnonUrl  string         `json:"canon_url"`
+	User       string         `json:"user"`
 }
 
 type Callback interface {
@@ -43,4 +42,3 @@ func (o *HookObserver) Process(h *Hook) {
 		c.Exec(h)
 	}
 }
-

hook_test.go

@@ -4,14 +4,12 @@ import (
 	"testing"
 )
 
-
 func TestGetHookData(t *testing.T) {
 
 	json := `{"repository": {"website": "", "fork": false, "name": "Recognition / Client Admin Application", "scm": "git", "owner": "workstars", "absolute_url": "/workstars/recognition-client-admin-application/", "slug": "recognition-client-admin-application", "is_private": true}, "truncated": false, "commits": [{"node": "82342c16fb54", "files": [{"type": "modified", "file": "README.md"}], "raw_author": "Iain Cambridge <iain.cambridge@workstars.com>", "utctimestamp": "2014-03-16 17:01:56+00:00", "author": "icambridge", "timestamp": "2014-03-16 18:01:56", "raw_node": "82342c16fb54cde537a0dc5b2a4773268bfd025b", "parents": ["f61e20d74f55"], "branch": "icambridge/readmemd-edited-online-with-bitbucket-1394989053935", "message": "README.md edited online with Bitbucket", "revision": null, "size": -1}], "canon_url": "https://bitbucket.org", "user": "icambridge"}`
 
 	payload := []byte(json)
 
-
 	h, err := GetHookData(payload)
 
 	if err != nil {

info.go

@@ -1,16 +1,14 @@
 package gobucket
 
-
 type PlaceInfo struct {
 	Commit     CommitInfo `json:"commit"`
 	Repository Repository `json:"repository"`
-	Branch     BranchName     `json:"branch"`
+	Branch     BranchName `json:"branch"`
 }
 
 type CommitInfo struct {
 	Hash       string     `json:"hash"`
 	Links      SelfLinks  `json:"links"`
 	Repository Repository `json:"repository"`
-	Branch     BranchName     `json:"branch"`
+	Branch     BranchName `json:"branch"`
 }
-

links.go

@@ -10,8 +10,6 @@ type NamedLink struct {
 }
 
 type SelfLinks struct {
-	Self Link `json:"self"`
+	Self   Link `json:"self"`
 	Avatar Link `json:"avatar"`
 }
-
-

owner.go

@@ -1,7 +1,7 @@
 package gobucket
 
 type Owner struct {
-	Username string `json:"usernane"`
-	DisplayName string `json:"display_name"`
+	Username    string    `json:"usernane"`
+	DisplayName string    `json:"display_name"`
 	Links       SelfLinks `json:"links"`
 }

pull_requests.go

@@ -105,14 +105,14 @@ func (s *PullRequestsService) GetAll(owner string, repo string) ([]*PullRequest,
 		repoValues := len(pullRequests.Values)
 
 		if repoValues <= 0 {
-			break;
+			break
 		}
 
 		output = append(output, pullRequests.Values...)
 		count += repoValues
 
 		if count >= pullRequests.Size {
-			break;
+			break
 		}
 
 		page++
@@ -159,11 +159,10 @@ type PullRequest struct {
 	CreatedOn         string           `json:"created_on"`
 	UpdatedOn         string           `json:"updated_on"`
 	Reviewers         []User           `json:"reviewers"`
-	Participants	  []Participant    `json:"participants"`
+	Participants      []Participant    `json:"participants"`
 	Id                int              `json:"id"`
 }
 
-
 type PullRequestLinks struct {
 	Decline  Link `json:"decline"`
 	Commits  Link `json:"commits"`
@@ -177,9 +176,9 @@ type PullRequestLinks struct {
 }
 
 type Participant struct {
-	Role string `json:"role"`
-	User User `json:"user"`
-	Approved bool `json:"approved"`
+	Role     string `json:"role"`
+	User     User   `json:"user"`
+	Approved bool   `json:"approved"`
 }
 
 func (pr *PullRequest) GetApprovals() []User {
@@ -194,7 +193,7 @@ func (pr *PullRequest) GetApprovals() []User {
 
 func (pr *PullRequest) GetOwner() string {
 
-	parts := strings.Split(pr.Destination.Repository.FullName ,"/")
+	parts := strings.Split(pr.Destination.Repository.FullName, "/")
 
 	if len(parts) < 1 || parts[0] == "" {
 		return "unknown owner"
@@ -205,7 +204,7 @@ func (pr *PullRequest) GetOwner() string {
 
 func (pr *PullRequest) GetRepoName() string {
 
-	parts := strings.Split(pr.Destination.Repository.FullName ,"/")
+	parts := strings.Split(pr.Destination.Repository.FullName, "/")
 
 	if len(parts) < 2 {
 		return "unknown repo"
@@ -215,8 +214,8 @@ func (pr *PullRequest) GetRepoName() string {
 }
 
 type PullRequestMerge struct {
-	Title string `json:"title"`
-	Description string `json:"title"`
-	Source PlaceInfo `json:"source"`
+	Title       string    `json:"title"`
+	Description string    `json:"title"`
+	Source      PlaceInfo `json:"source"`
 	Destination PlaceInfo `json:"destination"`
 }