Tidy up internal package

Author: stilvoid

internal/http.go

@@ -35,8 +35,8 @@ func MakeRequest(method string, url string, input io.Reader, headersIncluded boo
 			return nil, err
 		}
 
-		body, err := ioutil.ReadAll(inputReader)
-
+		var body []byte
+		body, err = ioutil.ReadAll(inputReader)
 		if err != nil {
 			return nil, err
 		}
@@ -46,6 +46,10 @@ func MakeRequest(method string, url string, input io.Reader, headersIncluded boo
 		req.Header = headers
 	}
 
+	if err != nil {
+		return nil, err
+	}
+
 	//return http.DefaultClient.Do(req)
 
 	return http.DefaultTransport.RoundTrip(req)

internal/map_test.go

@@ -1,8 +1,10 @@
-package internal
+package internal_test
 
 import (
 	"reflect"
 	"testing"
+
+	"github.com/stilvoid/please/internal"
 )
 
 func TestForceStringKeys(t *testing.T) {
@@ -36,7 +38,7 @@ func TestForceStringKeys(t *testing.T) {
 		"null": "derf",
 	}
 
-	actual := ForceStringKeys(input)
+	actual := internal.ForceStringKeys(input)
 
 	if !reflect.DeepEqual(actual, expected) {
 		t.Errorf("unexpected result:\n%#v\nvs\n%#v\n", actual, expected)
@@ -63,7 +65,7 @@ func TestArraysToMaps(t *testing.T) {
 		},
 	}
 
-	actual := ArraysToMaps(input)
+	actual := internal.ArraysToMaps(input)
 
 	if !reflect.DeepEqual(actual, expected) {
 		t.Errorf("unexpected:\n%#v\nwant:\n%#v", actual, expected)
@@ -97,7 +99,7 @@ func TestSortedKeys(t *testing.T) {
 	}
 
 	for i, input := range inputs {
-		actual := SortedKeys(input)
+		actual := internal.SortedKeys(input)
 
 		expected := expecteds[i]
 

internal/munge_test.go

@@ -1,8 +1,10 @@
-package internal
+package internal_test
 
 import (
 	"reflect"
 	"testing"
+
+	"github.com/stilvoid/please/internal"
 )
 
 type mungeCase struct {
@@ -64,7 +66,7 @@ func TestMunge(t *testing.T) {
 	}
 
 	for _, testCase := range cases {
-		actual := Munge(testCase.left, testCase.right)
+		actual := internal.Munge(testCase.left, testCase.right)
 
 		if !reflect.DeepEqual(actual, testCase.expected) {
 			t.Errorf("Falsely munged %T '%v' and %T '%v' into %T '%v'",
@@ -104,7 +106,7 @@ func TestFilteredMunge(t *testing.T) {
 	}
 
 	for _, testCase := range cases {
-		actual := MungeWithFilter(testCase.left, testCase.right, myFilter)
+		actual := internal.MungeWithFilter(testCase.left, testCase.right, myFilter)
 
 		if !reflect.DeepEqual(actual, testCase.expected) {
 			t.Errorf("Falsely munged %T '%v' and %T '%v' into %T '%v'",