Merge pull request #12 from taybart/feature/runtime-vars

Runtime variables

builder.go

@@ -10,12 +10,34 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
+
+	"github.com/taybart/log"
 )
 
+type request struct {
+	label       string
+	skip        bool
+	r           *http.Request
+	delay       time.Duration
+	expectation expectation
+	outputs     map[string]string
+}
+
 // type builder struct{}
 
 // buildRequest : generate http.Request from parsed input
-func buildRequest(input metaRequest) (req request, err error) {
+func buildRequest(input metaRequest, variables map[string]restVar) (req request, err error) {
+	if input.reinterpret {
+		log.Debug("Re-interpreting request", variables)
+		l := newLexer(false)
+		l.variables = variables
+		input, err = l.parseBlock(input.block)
+		if err != nil {
+			return
+		}
+	}
+
 	if err = isValidMetaRequest(input); err != nil {
 		return
 	}

cmd/rest/main.go

@@ -55,15 +55,18 @@ func help() {
 
 func main() {
 	flag.Parse()
+
 	log.SetPlain()
 	log.SetLevel(log.WARN)
 	if verbose {
 		log.SetLevel(log.DEBUG)
 	}
+
 	if servelog || servedir {
 		serve(servedir, local, port)
 		return
 	}
+
 	r := rest.New()
 	if nocolor {
 		r.NoColor()
@@ -107,6 +110,7 @@ func main() {
 
 func readFiles(r *rest.Rest) {
 	for _, f := range fns {
+		log.Debug("Reading file %s...", f)
 		if fileExists(f) {
 			valid, err := r.IsRestFile(f)
 			if !valid {
@@ -116,12 +120,15 @@ func readFiles(r *rest.Rest) {
 			err = r.Read(f)
 			if err != nil {
 				log.Error("Read error", err)
+				continue
 			}
+			log.Debug("done\n")
 		}
 	}
 }
 
 func exec(r *rest.Rest) {
+	log.Debug("\nExecuting all requests\n")
 	if index >= 0 {
 		res, err := r.ExecIndex(index)
 		if err != nil {

go.mod

@@ -1,8 +1,8 @@
 module github.com/taybart/rest
 
-go 1.13
+go 1.15
 
 require (
 	github.com/matryer/is v1.2.0
-	github.com/taybart/log v1.1.1
+	github.com/taybart/log v1.2.2
 )

go.sum

@@ -1,4 +1,4 @@
 github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
-github.com/taybart/log v1.1.1 h1:cuYtzjywA8D1rxmmyQ7ry5fwduAcktmxr7/WZxAf1Xw=
-github.com/taybart/log v1.1.1/go.mod h1:bLpgJt6GrTPJNabumQPcFTaYJnGwj7mSMs/OQwTDAdE=
+github.com/taybart/log v1.2.2 h1:jlg3dibUsaanJLzofXzRmBMD+JHHPqbXiYpXdgXTYa8=
+github.com/taybart/log v1.2.2/go.mod h1:e9MmKdjMsNxSFbn46ag778NSmhFrx9yLC60CDRRcSOo=