Upgrade enhancement

CHANGELOG.md

@@ -7,6 +7,7 @@ The exercism CLI follows [semantic versioning](http://semver.org/).
 ## Next Release
 
 * [#200](https://github.com/exercism/cli/pull/200): Add guard to unsubmit command - [@kytrinyx](https://github.com/kytrinyx)
+* [#204](https://github.com/exercism/cli/pull/204): Improve upgrade failure messages and increase timeout - [@Tonkpils](https://github.com/Tonkpils)
 * **Your contribution here**
 
 ## v2.2.0 (2015-06-27)

cmd/debug.go

@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"encoding/json"
-	"errors"
 	"fmt"
 	"log"
 	"net/http"
@@ -23,9 +21,9 @@ func Debug(ctx *cli.Context) {
 	fmt.Printf("\n**** Debug Information ****\n")
 	fmt.Printf("Exercism CLI Version: %s\n", ctx.App.Version)
 
-	rel, err := checkLatestRelease(client)
+	rel, err := fetchLatestRelease(client)
 	if err != nil {
-		log.Println(err)
+		log.Println("unable to fetch latest release: " + err.Error())
 	} else {
 		if rel.Version() != ctx.App.Version {
 			defer fmt.Printf("\nA newer version of the CLI (%s) can be downloaded here: %s\n", rel.TagName, rel.Location)
@@ -72,20 +70,6 @@ func Debug(ctx *cli.Context) {
 	fmt.Printf("Exercises Directory: %s\n", c.Dir)
 }
 
-func checkLatestRelease(client http.Client) (*release, error) {
-	resp, err := client.Get("https://api.github.com/repos/exercism/cli/releases/latest")
-	if err != nil {
-		return nil, errors.New("unable to get latest CLI release: " + err.Error())
-	}
-
-	var rel release
-	if err := json.NewDecoder(resp.Body).Decode(&rel); err != nil {
-		return nil, errors.New("error decoding latest release response: " + err.Error())
-	}
-
-	return &rel, nil
-}
-
 func pingURL(client http.Client, url string) string {
 	res, err := client.Get(url)
 	if err != nil {

cmd/release_utils.go

@@ -0,0 +1,143 @@
+package cmd
+
+import (
+	"archive/tar"
+	"archive/zip"
+	"bytes"
+	"compress/gzip"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"strings"
+)
+
+var (
+	osMap = map[string]string{
+		"darwin":  "mac",
+		"linux":   "linux",
+		"windows": "windows",
+	}
+
+	archMap = map[string]string{
+		"amd64": "64bit",
+		"386":   "32bit",
+		"arm":   "arm",
+	}
+)
+
+type asset struct {
+	ID          int    `json:"id"`
+	Name        string `json:"name"`
+	ContentType string `json:"content_type"`
+}
+
+func (a *asset) Download() (*bytes.Reader, error) {
+	downloadURL := fmt.Sprintf("https://api.github.com/repos/exercism/cli/releases/assets/%d", a.ID)
+	req, err := http.NewRequest("GET", downloadURL, nil)
+	if err != nil {
+		return nil, err
+	}
+	// https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
+	req.Header.Set("Accept", "application/octet-stream")
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	bs, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	return bytes.NewReader(bs), nil
+}
+
+type release struct {
+	Location string  `json:"html_url"`
+	TagName  string  `json:"tag_name"`
+	Assets   []asset `json:"assets"`
+}
+
+func (r *release) Version() string {
+	return strings.TrimPrefix(r.TagName, "v")
+}
+
+const installFlag = os.O_RDWR | os.O_CREATE | os.O_TRUNC
+
+func installTgz(source *bytes.Reader, dest string) error {
+	gr, err := gzip.NewReader(source)
+	if err != nil {
+		return err
+	}
+	defer gr.Close()
+
+	tr := tar.NewReader(gr)
+	for {
+		hdr, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return err
+		}
+
+		fileCopy, err := os.OpenFile(dest, installFlag, hdr.FileInfo().Mode())
+		if err != nil {
+			return err
+		}
+		defer fileCopy.Close()
+
+		if _, err = io.Copy(fileCopy, tr); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func installZip(source *bytes.Reader, dest string) error {
+	zr, err := zip.NewReader(source, int64(source.Len()))
+	if err != nil {
+		return err
+	}
+
+	for _, f := range zr.File {
+		fileCopy, err := os.OpenFile(dest, installFlag, f.Mode())
+		if err != nil {
+			return err
+		}
+		defer fileCopy.Close()
+
+		rc, err := f.Open()
+		if err != nil {
+			return err
+		}
+		defer rc.Close()
+
+		_, err = io.Copy(fileCopy, rc)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func fetchLatestRelease(client http.Client) (*release, error) {
+	resp, err := client.Get("https://api.github.com/repos/exercism/cli/releases/latest")
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var rel release
+	if err := json.NewDecoder(resp.Body).Decode(&rel); err != nil {
+		return nil, err
+	}
+
+	return &rel, nil
+}

cmd/upgrade.go

@@ -1,16 +1,10 @@
 package cmd
 
 import (
-	"archive/tar"
-	"archive/zip"
 	"bytes"
-	"compress/gzip"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
-	"os"
 	"runtime"
 	"strings"
 	"time"
@@ -30,10 +24,10 @@ var (
 
 // Upgrade command allows the user to upgrade to the latest CLI version
 func Upgrade(ctx *cli.Context) {
-	client := http.Client{Timeout: 5 * time.Second}
-	rel, err := checkLatestRelease(client)
+	client := http.Client{Timeout: 10 * time.Second}
+	rel, err := fetchLatestRelease(client)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal("unable to check latest release version: " + err.Error())
 	}
 
 	// TODO: This checks strings against string
@@ -94,116 +88,3 @@ func Upgrade(ctx *cli.Context) {
 
 	fmt.Println("Successfully upgraded!")
 }
-
-var (
-	osMap = map[string]string{
-		"darwin":  "mac",
-		"linux":   "linux",
-		"windows": "windows",
-	}
-
-	archMap = map[string]string{
-		"amd64": "64bit",
-		"386":   "32bit",
-		"arm":   "arm",
-	}
-)
-
-const installFlag = os.O_RDWR | os.O_CREATE | os.O_TRUNC
-
-func installTgz(source *bytes.Reader, dest string) error {
-	gr, err := gzip.NewReader(source)
-	if err != nil {
-		return err
-	}
-	defer gr.Close()
-
-	tr := tar.NewReader(gr)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		fileCopy, err := os.OpenFile(dest, installFlag, hdr.FileInfo().Mode())
-		if err != nil {
-			return err
-		}
-		defer fileCopy.Close()
-
-		if _, err = io.Copy(fileCopy, tr); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func installZip(source *bytes.Reader, dest string) error {
-	zr, err := zip.NewReader(source, int64(source.Len()))
-	if err != nil {
-		return err
-	}
-
-	for _, f := range zr.File {
-		fileCopy, err := os.OpenFile(dest, installFlag, f.Mode())
-		if err != nil {
-			return err
-		}
-		defer fileCopy.Close()
-
-		rc, err := f.Open()
-		if err != nil {
-			return err
-		}
-		defer rc.Close()
-
-		_, err = io.Copy(fileCopy, rc)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type asset struct {
-	ID          int    `json:"id"`
-	Name        string `json:"name"`
-	ContentType string `json:"content_type"`
-}
-
-func (a *asset) Download() (*bytes.Reader, error) {
-	downloadURL := fmt.Sprintf("https://api.github.com/repos/exercism/cli/releases/assets/%d", a.ID)
-	req, err := http.NewRequest("GET", downloadURL, nil)
-	if err != nil {
-		return nil, err
-	}
-	// https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
-	req.Header.Set("Accept", "application/octet-stream")
-	res, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	bs, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	return bytes.NewReader(bs), nil
-}
-
-type release struct {
-	Location string  `json:"html_url"`
-	TagName  string  `json:"tag_name"`
-	Assets   []asset `json:"assets"`
-}
-
-func (r *release) Version() string {
-	return strings.TrimPrefix(r.TagName, "v")
-}