Merge pull request #31 from Automattic/fix/search-replace-with-no-trailing-newline

Don't ignore last line with no trailing newline

Author: chriszarate

main_test.go

@@ -0,0 +1,86 @@
+package main
+
+import (
+	"bytes"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+)
+
+var (
+	_, b, _, _ = runtime.Caller(0)
+	basePath   = filepath.Dir(b)
+)
+
+func doMainTest(t *testing.T, input string, expected string, mainArgs []string) {
+	execArgs := append([]string{"run", basePath}, mainArgs...)
+	cmd := exec.Command("go", execArgs...)
+
+	cmd.Stdin = strings.NewReader(input)
+	var out bytes.Buffer
+	cmd.Stdout = &out
+
+	if err := cmd.Run(); err != nil {
+		t.Errorf("%v", err)
+	}
+	actual := out.String()
+
+	if actual != expected {
+		t.Errorf("%v does not match expected: %v", actual, expected)
+	}
+}
+
+func TestSimpleReplaceWithNewlineAtEOF(t *testing.T) {
+	mainArgs := []string{
+		"http://uss-enterprise.com",
+		"https://ncc-1701-d.space",
+	}
+
+	input := "Space, the final frontier!\nCheck out: http://uss-enterprise.com/decks/10/sections/forward\n"
+	expected := "Space, the final frontier!\nCheck out: https://ncc-1701-d.space/decks/10/sections/forward\n"
+	doMainTest(t, input, expected, mainArgs)
+}
+
+func TestSimpleReplaceWithoutNewlineAtEOF(t *testing.T) {
+	mainArgs := []string{
+		"http://uss-enterprise.com",
+		"https://ncc-1701-d.space",
+	}
+	input := "I tend bar, and I listen.\nhttp://uss-enterprise.com/personnel/guinan"
+	expected := "I tend bar, and I listen.\nhttps://ncc-1701-d.space/personnel/guinan"
+	doMainTest(t, input, expected, mainArgs)
+}
+
+func TestMultipleReplaceWithNewlineAtEOF(t *testing.T) {
+	mainArgs := []string{
+		"http://uss-enterprise.com",
+		"https://ncc-1701-d.space",
+
+		"sections",
+		"areas",
+
+		"https",
+		"warp",
+	}
+	input := "Space, the final frontier!\nCheck out: http://uss-enterprise.com/decks/10/sections/forward\n"
+	expected := "Space, the final frontier!\nCheck out: warp://ncc-1701-d.space/decks/10/areas/forward\n"
+	doMainTest(t, input, expected, mainArgs)
+}
+
+func TestMultipleReplaceWithoutNewlineAtEOF(t *testing.T) {
+	mainArgs := []string{
+		"http://uss-enterprise.com",
+		"https://ncc-1701-d.space",
+
+		"sections",
+		"areas",
+
+		"https",
+		"warp",
+	}
+	input := "Space, the final frontier!\nCheck out: http://uss-enterprise.com/decks/10/sections/forward"
+	expected := "Space, the final frontier!\nCheck out: warp://ncc-1701-d.space/decks/10/areas/forward"
+	doMainTest(t, input, expected, mainArgs)
+}

search-replace.go

@@ -96,13 +96,15 @@ func main() {
 		for {
 			line, err := r.ReadBytes('\n')
 
-			if err == io.EOF {
-				break
-			}
-
 			if err != nil {
-				fmt.Fprintln(os.Stderr, err.Error())
-				break
+				if err == io.EOF {
+					if 0 == len(line) {
+						break
+					}
+				} else {
+					fmt.Fprintln(os.Stderr, err.Error())
+					break
+				}
 			}
 
 			wg.Add(1)