Add list command; Make GistReponse & FileResponse

Author: Artur Kh

gist.go

@@ -3,7 +3,6 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 )
@@ -21,6 +20,21 @@ type Gist struct {
 	Public      bool             `json:"public"`
 }
 
+type FileResponse struct {
+	Size     int    `json:"size"`
+	Type     string `json:"type"`
+	Language string `json:"laguage"`
+}
+
+type GistResponse struct {
+	Description string                   `json:"description"`
+	Files       map[string]*FileResponse `json:"files"`
+	HtmlUrl     string                   `json:"html_url"`
+	Id          string                   `json:"id"`
+	Public      bool                     `json:"public"`
+	User        string                   `json:"user"`
+}
+
 func (gist *Gist) Create(anonymous bool) (string, error) {
 	buf := bytes.NewBuffer(nil)
 	e := json.NewEncoder(buf)
@@ -34,7 +48,7 @@ func (gist *Gist) Create(anonymous bool) (string, error) {
 	}
 
 	req.Header.Add("Content-type", "application/json")
-	if !anonymous {
+	if config.APIKey != "" && !anonymous {
 		req.Header.Add("Authorization", "token "+config.APIKey)
 	}
 
@@ -50,15 +64,86 @@ func (gist *Gist) Create(anonymous bool) (string, error) {
 		return "", err
 	}
 
-	fmt.Println(string(body))
+	var gistResp GistResponse
+	err = json.Unmarshal(body, &gistResp)
+	if err != nil {
+		return "", err
+	}
 
-	return "", nil
+	return gistResp.HtmlUrl, nil
 }
 
 func (gist *Gist) Update(uid string) (string, error) {
-	return "", nil
+	buf := bytes.NewBuffer(nil)
+	e := json.NewEncoder(buf)
+	if err := e.Encode(gist); err != nil {
+		return "", err
+	}
+
+	req, err := http.NewRequest("PATCH", GitHubAPIURL+"/gists/"+uid, buf)
+	if err != nil {
+		return "", err
+	}
+
+	req.Header.Add("Content-type", "application/json")
+	if config.APIKey != "" {
+		req.Header.Add("Authorization", "token "+config.APIKey)
+	}
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	var gistResp GistResponse
+	err = json.Unmarshal(body, &gistResp)
+	if err != nil {
+		return "", err
+	}
+
+	return gistResp.HtmlUrl, nil
 }
 
-func GistList(user string) ([]*Gist, error) {
-	return nil, nil
+func GistList(user string) ([]*GistResponse, error) {
+	var uri string
+	if user != "" {
+		uri = "/users/" + user + "/gists"
+	}
+
+	req, err := http.NewRequest("GET", GitHubAPIURL+uri, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Add("Content-type", "application/json")
+	if config.APIKey != "" {
+		req.Header.Add("Authorization", "token "+config.APIKey)
+	}
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	var gistResp []*GistResponse
+	err = json.Unmarshal(body, &gistResp)
+	if err != nil {
+		return nil, err
+	}
+
+	return gistResp, nil
 }

go-gist.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"strings"
 )
 
 var config = ConfigNew()
@@ -14,40 +15,82 @@ func main() {
 		panic(err)
 	}
 
-	login := flag.Bool("login", false, "Authenticate gist on this computer.")
-	private := flag.Bool("p", false, "Indicates whether the gist is private.")
+	anonymousFlag := flag.Bool("a", false, "Create an anonymous gist.")
 	description := flag.String("d", "", "A description of the gist.")
-	update := flag.String("u", "", "Update an existing gist.")
-	list := flag.String("l", "", "List gists for user.")
-	anonymous := flag.Bool("a", false, "Create an anonymous gist.")
 	gistType := flag.String("t", "", "Sets the file extension and syntax type.")
+	loginFlag := flag.Bool("login", false, "Authenticate gist on this computer.")
+	privateFlag := flag.Bool("p", false, "Indicates whether the gist is private.")
+	update := flag.String("u", "", "Update an existing gist. Takes ID as an argument.")
+	user := flag.String("l", "", "List gists for user.")
+
 	flag.Parse()
 
+	if *loginFlag {
+		login()
+	} else if *user != "" {
+		list(*user)
+	} else if flag.NArg() > 0 {
+		create(*update, *anonymousFlag, !*privateFlag, *description, *gistType, flag.Args())
+	}
+}
+
+func list(user string) {
+	resp, err := GistList(user)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	for _, r := range resp {
+		var files []string
+		for f := range r.Files {
+			files = append(files, f)
+		}
+
+		var secret string
+		if r.Public == false {
+			secret = "(secret)"
+		}
+
+		fmt.Printf("%s %s %s\n", r.HtmlUrl, strings.Join(files, " "), secret)
+	}
+}
+
+func create(uid string, anonymous bool, public bool, desc string, gistType string, args []string) {
 	gist := &Gist{
 		make(map[string]*File),
-		*description,
-		!*private,
+		desc,
+		public,
 	}
 
 	for _, name := range flag.Args() {
 		content, err := ioutil.ReadFile(name)
 		if err != nil {
 			panic(err)
 		}
+
+		if gistType != "" {
+			name += "." + gistType
+		}
+
 		gist.Files[name] = &File{name, string(content)}
 	}
 
-	var gistUrl string
+	var url string
+	var err error
 
-	if *update != "" {
-		gistUrl, err = gist.Update(*update)
+	if uid != "" {
+		url, err = gist.Update(uid)
 	} else {
-		gistUrl, err = gist.Create(*anonymous)
+		url, err = gist.Create(anonymous)
 	}
 
 	if err != nil {
 		panic(err)
 	}
 
-	fmt.Println(gistUrl)
+	fmt.Println(url)
+}
+
+func login() {
+
 }