Default targets to stdin and abstract file handling

lib/targets.go

@@ -6,25 +6,14 @@ import (
 	"io"
 	"math/rand"
 	"net/http"
-	"os"
 	"strings"
 )
 
 // Targets represents the http.Requests which will be issued during the test
 type Targets []*http.Request
 
-// NewTargetsFromFile reads and parses targets from a text file
-func NewTargetsFromFile(filename string) (Targets, error) {
-	file, err := os.Open(filename)
-	if err != nil {
-		return Targets{}, err
-	}
-	defer file.Close()
-	return readTargets(file)
-}
-
-// readTargets reads targets out of a line separated source skipping empty lines
-func readTargets(source io.Reader) (Targets, error) {
+// NewTargetsFrom reads targets out of a line separated source skipping empty lines
+func NewTargetsFrom(source io.Reader) (Targets, error) {
 	scanner := bufio.NewScanner(source)
 	lines := make([]string, 0)
 	for scanner.Scan() {

lib/targets_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 )
 
-func TestReadTargets(t *testing.T) {
+func TestNewTargetsFrom(t *testing.T) {
 	lines := bytes.NewBufferString("GET http://lolcathost:9999/\n\n      // HEAD http://lolcathost.com this is a comment \nHEAD http://lolcathost:9999/\n")
-	targets, err := readTargets(lines)
+	targets, err := NewTargetsFrom(lines)
 	if err != nil {
 		t.Fatalf("Couldn't parse valid source: %s", err)
 	}