Merge in coreos/gexpect?

README.md

@@ -23,7 +23,7 @@ It makes it simpler to create and control other terminal applications.
 
 `ReadLine`, `ReadUntil` and `SendLine` send strings from/to `stdout/stdin` respectively
 
-	child := gexpect.Spawn("cat")
+	child, _ := gexpect.Spawn("cat")
 	child.SendLine("echoing process_stdin") //  SendLine(command string) (error)
 	msg, _ := child.ReadLine() // msg = echoing process_stdin
 
@@ -34,24 +34,24 @@ It makes it simpler to create and control other terminal applications.
 
 `AsyncInteractChannels` spawns two go routines to pipe into and from `stdout`/`stdin`, allowing for some usecases to be a little simpler.
 
-	child := gexpect.spawn("sh")
+	child, _ := gexpect.Spawn("sh")
 	sender, receiver := child.AsyncInteractChannels()
 	sender <- "echo Hello World\n" // Send to stdin
 	line, open := <- receiver // Recieve a line from stdout/stderr
 	// When the subprocess stops (e.g. with child.Close()) , receiver is closed
 	if open {
-		fmt.Printf("Received %s", line)]
+		fmt.Printf("Received %s", line)
 	}
 
 `ExpectRegex` uses golang's internal regex engine to wait until a match from the process with the given regular expression (or an error on process termination with no match).
 
-	child := gexpect.Spawn("echo accb")	
+	child, _ := gexpect.Spawn("echo accb")	
 	match, _ := child.ExpectRegex("a..b")
 	// (match=true)
 
 `ExpectRegexFind` allows for groups to be extracted from process stdout. The first element is an array of containing the total matched text, followed by each subexpression group match.
 
-	child := gexpect.Spawn("echo 123 456 789")
+	child, _ := gexpect.Spawn("echo 123 456 789")
 	result, _ := child.ExpectRegexFind("\d+ (\d+) (\d+)")
 	// result = []string{"123 456 789", "456", "789"}
 
@@ -61,4 +61,4 @@ See `gexpect_test.go` and the `examples` folder for full syntax
 
 	github.com/kballard/go-shellquote	
 	github.com/kr/pty
-	KMP Algorithm: "http://blog.databigbang.com/searching-for-substrings-in-streams-a-slight-modification-of-the-knuth-morris-pratt-algorithm-in-haxe/"
+	KMP Algorithm: "http://blog.databigbang.com/searching-for-substrings-in-streams-a-slight-modification-of-the-knuth-morris-pratt-algorithm-in-haxe/"

examples/ftp.go

@@ -1,6 +1,6 @@
 package main
 
-import gexpect "github.com/ThomasRooney/gexpect"
+import gexpect "github.com/coreos/gexpect"
 import "log"
 
 func main() {

examples/ping.go

@@ -1,6 +1,6 @@
 package main
 
-import gexpect "github.com/ThomasRooney/gexpect"
+import gexpect "github.com/coreos/gexpect"
 import "log"
 
 func main() {

examples/python.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/ThomasRooney/gexpect"
+import "github.com/coreos/gexpect"
 import "fmt"
 
 func main() {

examples/screen.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/ThomasRooney/gexpect"
+import "github.com/coreos/gexpect"
 import "fmt"
 import "strings"
 

gexpect.go

@@ -19,7 +19,6 @@ import (
 
 var (
 	ErrEmptySearch = errors.New("empty search string")
-	ErrTimeout     = errors.New("expect timed out")
 )
 
 type ExpectSubprocess struct {
@@ -72,7 +71,7 @@ func (buf *buffer) ReadRune() (r rune, size int, err error) {
 		if err != nil {
 			return 0, 0, err
 		}
-		if utf8.FullRune(chunk) {
+		if utf8.FullRune(chunk[:n]) {
 			r, rL := utf8.DecodeRune(chunk)
 			if n > rL {
 				buf.PutBack(chunk[rL:n])
@@ -91,7 +90,7 @@ func (buf *buffer) ReadRune() (r rune, size int, err error) {
 		}
 		l = l + fn
 
-		if utf8.FullRune(chunk) {
+		if utf8.FullRune(chunk[:l]) {
 			r, rL := utf8.DecodeRune(chunk)
 			if buf.collect {
 				buf.collection.WriteRune(r)
@@ -319,7 +318,7 @@ func (expect *ExpectSubprocess) Expect(searchString string) (e error) {
 
 	for {
 		n, err := expect.buf.Read(chunk)
-		if err != nil {
+		if n == 0 && err != nil {
 			return err
 		}
 		if expect.outputBuffer != nil {

gexpect_test.go

@@ -3,7 +3,9 @@
 package gexpect
 
 import (
+	"bytes"
 	"fmt"
+	"io/ioutil"
 	"strings"
 	"testing"
 	"time"
@@ -117,6 +119,7 @@ var regexMatchTests = []struct {
 	{`a+hello`, `aaaahello`, `bhello`},
 	{`(hello|world)`, `hello`, `unknown`},
 	{`(hello|world)`, `world`, `unknown`},
+	{"\u00a9", "\u00a9", `unknown`}, // 2 bytes long unicode character "copyright sign"
 }
 
 func TestRegexMatch(t *testing.T) {
@@ -153,6 +156,7 @@ var regexFindTests = []struct {
 	{`so.. (hello|world)`, `so.. hello`, []string{"so.. hello", "hello"}},
 	{`(a+)hello`, `aaaahello`, []string{"aaaahello", "aaaa"}},
 	{`\d+ (\d+) (\d+)`, `123 456 789`, []string{"123 456 789", "456", "789"}},
+	{`\d+ (\d+) (\d+)`, "\u00a9 123 456 789 \u00a9", []string{"123 456 789", "456", "789"}}, // check unicode characters
 }
 
 func TestRegexFind(t *testing.T) {
@@ -360,3 +364,56 @@ func TestRegexFindNoExcessBytes(t *testing.T) {
 		}
 	}
 }
+
+func TestBufferReadRune(t *testing.T) {
+	tests := []struct {
+		bufferContent []byte
+		fileContent   []byte
+		expectedRune  rune
+	}{
+		// unicode "copyright char" is \u00a9 is encoded as two bytes in utf8 0xc2 0xa9
+		{[]byte{0xc2, 0xa9}, []byte{}, '\u00a9'}, // whole rune is already in buffer.b
+		{[]byte{0xc2}, []byte{0xa9}, '\u00a9'},   // half of is in the buffer.b and another half still in buffer.f (file)
+		{[]byte{}, []byte{0xc2, 0xa9}, '\u00a9'}, // whole rune is the file
+		// some random noise in the end of file
+		{[]byte{0xc2, 0xa9}, []byte{0x20, 0x20, 0x20, 0x20}, '\u00a9'},
+		{[]byte{0xc2}, []byte{0xa9, 0x20, 0x20, 0x20, 0x20}, '\u00a9'},
+		{[]byte{}, []byte{0xc2, 0xa9, 0x20, 0x20, 0x20, 0x20}, '\u00a9'},
+	}
+
+	for i, tt := range tests {
+
+		// prepare tmp file with fileContent
+		f, err := ioutil.TempFile("", "")
+		if err != nil {
+			t.Fatal(err)
+		}
+		n, err := f.Write(tt.fileContent)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if n != len(tt.fileContent) {
+			t.Fatal("expected fileContent written to temp file")
+		}
+		_, err = f.Seek(0, 0)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		// new buffer
+		buf := buffer{f: f, b: *bytes.NewBuffer(tt.bufferContent)}
+
+		// call ReadRune
+		r, size, err := buf.ReadRune()
+
+		if r != tt.expectedRune {
+			t.Fatalf("#%d: expected rune %+q but go is %+q", i, tt.expectedRune, r)
+		}
+
+		if size != len(string(tt.expectedRune)) {
+			t.Fatalf("#%d: expected rune %d bytes long but got just %d bytes long", i, len(string(tt.expectedRune)), size)
+		}
+
+	}
+
+}