Adding context version of Check and Response.Apply methods. (#8)

* Adding context version of Check and Response.Apply methods.
* Adding Go 1.10-1.11 + tip on Travis.
* Fixing Go versions on Travis.
* sdk test: fixing assertion.

Author: henvic

.travis.yml

@@ -1,5 +1,13 @@
 language: go
 go:
-  - 1.4
-  - 1.5
+  - "1.4"
+  - "1.5"
+  - "1.7"
+  - "1.9"
+  - "1.10"
+  - "1.11"
+  - "tip"
+matrix:
+  allow_failures:
+    - go: tip
 script: go test -v github.com/equinox-io/equinox github.com/equinox-io/equinox/proto

sdk.go

@@ -131,16 +131,24 @@ func (o *Options) SetPublicKeyPEM(pembytes []byte) error {
 // a successful check that found no update from other errors like a failed
 // network connection.
 func Check(appID string, opts Options) (Response, error) {
-	var r Response
+	var req, err = checkRequest(appID, &opts)
 
+	if err != nil {
+		return Response{}, err
+	}
+
+	return doCheckRequest(opts, req)
+}
+
+func checkRequest(appID string, opts *Options) (*http.Request, error) {
 	if opts.Channel == "" {
 		opts.Channel = "stable"
 	}
 	if opts.TargetPath == "" {
 		var err error
 		opts.TargetPath, err = osext.Executable()
 		if err != nil {
-			return r, err
+			return nil, err
 		}
 	}
 	if opts.OS == "" {
@@ -172,12 +180,17 @@ func Check(appID string, opts Options) (Response, error) {
 
 	req, err := http.NewRequest("POST", opts.CheckURL, bytes.NewReader(payload))
 	if err != nil {
-		return r, err
+		return nil, err
 	}
+
 	req.Header.Set("Accept", fmt.Sprintf("application/json; q=1; version=%s; charset=utf-8", protocolVersion))
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
 	req.Close = true
 
+	return req, err
+}
+
+func doCheckRequest(opts Options, req *http.Request) (r Response, err error) {
 	resp, err := opts.HTTPClient.Do(req)
 	if err != nil {
 		return r, err
@@ -237,6 +250,16 @@ func computeChecksum(path string) string {
 //
 // Error is nil if and only if the entire update completes successfully.
 func (r Response) Apply() error {
+	var req, opts, err = r.applyRequest()
+
+	if err != nil {
+		return err
+	}
+
+	return r.applyUpdate(req, opts)
+}
+
+func (r Response) applyRequest() (*http.Request, update.Options, error) {
 	opts := update.Options{
 		TargetPath: r.opts.TargetPath,
 		TargetMode: r.opts.TargetMode,
@@ -251,14 +274,14 @@ func (r Response) Apply() error {
 	}
 
 	if err := opts.CheckPermissions(); err != nil {
-		return err
+		return nil, opts, err
 	}
 
 	req, err := http.NewRequest("GET", r.downloadURL, nil)
-	if err != nil {
-		return err
-	}
+	return req, opts, err
+}
 
+func (r Response) applyUpdate(req *http.Request, opts update.Options) error {
 	// fetch the update
 	req.Close = true
 	resp, err := r.opts.HTTPClient.Do(req)

sdk_ctx.go

@@ -0,0 +1,29 @@
+// +build go1.7
+
+package equinox
+
+import (
+	"context"
+)
+
+// CheckContext is like Check but includes a context.
+func CheckContext(ctx context.Context, appID string, opts Options) (Response, error) {
+	var req, err = checkRequest(appID, &opts)
+
+	if err != nil {
+		return Response{}, err
+	}
+
+	return doCheckRequest(opts, req.WithContext(ctx))
+}
+
+// ApplyContext is like Apply but includes a context.
+func (r Response) ApplyContext(ctx context.Context) error {
+	var req, opts, err = r.applyRequest()
+
+	if err != nil {
+		return err
+	}
+
+	return r.applyUpdate(req.WithContext(ctx), opts)
+}

sdk_ctx_test.go

@@ -0,0 +1,45 @@
+// +build go1.7
+
+package equinox
+
+import (
+	"bytes"
+	"context"
+	"io/ioutil"
+	"testing"
+	"time"
+
+	"github.com/equinox-io/equinox/proto"
+)
+
+func TestEndToEndContext(t *testing.T) {
+	opts := setup(t, "TestEndtoEnd", proto.Response{
+		Available: true,
+		Release: proto.Release{
+			Version:     "0.1.2.3",
+			Title:       "Release Title",
+			Description: "Release Description",
+			CreateDate:  time.Now(),
+		},
+		Checksum:  newSHA,
+		Signature: signature,
+	})
+	defer cleanup(opts)
+
+	resp, err := CheckContext(context.Background(), fakeAppID, opts)
+	if err != nil {
+		t.Fatalf("Failed check: %v", err)
+	}
+	err = resp.ApplyContext(context.Background())
+	if err != nil {
+		t.Fatalf("Failed apply: %v", err)
+	}
+
+	buf, err := ioutil.ReadFile(opts.TargetPath)
+	if err != nil {
+		t.Fatalf("Failed to read file: %v", err)
+	}
+	if !bytes.Equal(buf, newFakeBinary) {
+		t.Fatalf("Binary did not update to new expected value. Got %v, expected %v", buf, newFakeBinary)
+	}
+}

sdk_test.go

@@ -139,7 +139,7 @@ func setup(t *testing.T, name string, resp proto.Response) Options {
 		}
 		if resp.Available {
 			if req.AppID != fakeAppID {
-				t.Fatalf("Unexpected app ID. Got %v, expected %v", err)
+				t.Fatalf("Unexpected app ID. Got %v, expected %v", req.AppID, fakeAppID)
 			}
 			if req.CurrentSHA256 != sha {
 				t.Fatalf("Unexpected request SHA: %v", sha)