Merge branch 'master' of github.com:skx/deployr

Author: skx

README.md

@@ -111,17 +111,17 @@ The following variables are defined by default:
 
 
 
-
 ## Template Expansion
 
 In addition to copying files literally from the local system to the remote
 host it is also possible perform some limited template-expansion.
 
-To copy a file literally you'd use the `CopyFile` primitive:
+To copy a file literally you'd use the `CopyFile` primitive which copies the
+file with no regards to the contents (handling binary content):
 
     CopyFile local.txt /tmp/remote.txt
 
-To copy a file with template-expansion performed upon its contents you use the `CopyTemplate` primitive instead:
+To copy a file with template-expansion you should use the `CopyTemplate` primitive instead:
 
     CopyTemplate local.txt /tmp/remote.txt
 
@@ -136,9 +136,11 @@ which means you can access values like so:
     # at {{now.UTC.Day}} {{now.UTC.Month}} {{now.UTC.Year}}
     #
 
-In short you write `{{get "variable-name-here}}` and the value of the variable
+In short you write `{{get "variable-name-here"}}` and the value of the variable
 will be output inline.
 
+Any variable defined with `Set` will be available to you, as well as the
+[predefined variables](#predefined-variables) noted above.
 
 
 

parser/parser.go

@@ -321,7 +321,7 @@ func (p *Parser) GetArguments(expected []token.Token) ([]token.Token, error) {
 
 		next := p.Tokenizer.NextToken()
 		if next.Type != arg.Type {
-			return nil, fmt.Errorf("Expected %v as argument %d - Got %v", arg.Type, i, next.Type)
+			return nil, fmt.Errorf("Expected %v as argument %d - Got %v", arg.Type, i+1, next.Type)
 		}
 
 		ret = append(ret, next)

parser/parser_test.go

@@ -213,7 +213,7 @@ func TestCopy(t *testing.T) {
 			t.Fatalf("Expected to receive an error, got none")
 		}
 
-		if !strings.Contains(err.Error(), "as argument 0") {
+		if !strings.Contains(err.Error(), "as argument 1") {
 			t.Fatalf("Our error was misleading: %s", err.Error())
 		}
 
@@ -238,7 +238,7 @@ func TestCopy(t *testing.T) {
 			t.Fatalf("Expected to receive an error, got none")
 		}
 
-		if !strings.Contains(err.Error(), "as argument 1") {
+		if !strings.Contains(err.Error(), "as argument 2") {
 			t.Fatalf("Our error was misleading %s", err.Error())
 		}
 
@@ -421,7 +421,7 @@ func TestSet(t *testing.T) {
 		t.Fatalf("Expected to receive an error, got none")
 	}
 
-	if !strings.Contains(err.Error(), "as argument 0") {
+	if !strings.Contains(err.Error(), "as argument 1") {
 		t.Fatalf("Our error was misleading:%s", err.Error())
 	}
 
@@ -446,7 +446,7 @@ func TestSet(t *testing.T) {
 		t.Fatalf("Expected to receive an error, got none")
 	}
 
-	if !strings.Contains(err.Error(), "as argument 1") {
+	if !strings.Contains(err.Error(), "as argument 2") {
 		t.Fatalf("Our error was misleading: %s", err.Error())
 	}
 }