fix a bug where pipe messages were dropped by accident

main.go

@@ -10,7 +10,6 @@ import (
 	pipep "github.com/mattes/migrate/pipe"
 	"os"
 	"strconv"
-	"strings"
 	"time"
 )
 
@@ -97,9 +96,9 @@ func writePipe(pipe chan interface{}) {
 						f := item.(file.File)
 
 						if f.Direction == direction.Up {
-							fmt.Print("[-> ]")
+							fmt.Print("o--> ")
 						} else if f.Direction == direction.Down {
-							fmt.Print("[ <-]")
+							fmt.Print(" <--o")
 						}
 						fmt.Printf(" %s\n", f.FileName)
 

migrate/migrate.go

@@ -92,8 +92,7 @@ func DownSync(url, migrationsPath string) (err []error, ok bool) {
 func Redo(pipe chan interface{}, url, migrationsPath string) {
 	pipe1 := pipep.New()
 	go Migrate(pipe1, url, migrationsPath, -1)
-	go pipep.Redirect(pipe1, pipe)
-	pipep.Wait(pipe1)
+	pipep.WaitAndRedirect(pipe1, pipe)
 	go Migrate(pipe, url, migrationsPath, +1)
 }
 
@@ -107,8 +106,7 @@ func RedoSync(url, migrationsPath string) (err []error, ok bool) {
 func Reset(pipe chan interface{}, url, migrationsPath string) {
 	pipe1 := pipep.New()
 	go Down(pipe1, url, migrationsPath)
-	go pipep.Redirect(pipe1, pipe)
-	pipep.Wait(pipe1)
+	pipep.WaitAndRedirect(pipe1, pipe)
 	go Up(pipe, url, migrationsPath)
 }
 

pipe/pipe.go

@@ -1,9 +1,11 @@
 package pipe
 
+// New creates a new pipe. A pipe is basically a channel.
 func New() chan interface{} {
 	return make(chan interface{}, 0)
 }
 
+// Close closes pipe and optionally sends an error
 func Close(pipe chan interface{}, err error) {
 	if err != nil {
 		pipe <- err
@@ -11,35 +13,26 @@ func Close(pipe chan interface{}, err error) {
 	close(pipe)
 }
 
-func Redirect(fromPipe, toPipe chan interface{}) {
-	if fromPipe != nil && toPipe != nil {
+// WaitAndRedirect waits for pipe to be closed and
+// redirects all messages from pipe to redirectPipe
+// while it waits.
+func WaitAndRedirect(pipe, redirectPipe chan interface{}) {
+	if pipe != nil && redirectPipe != nil {
 		for {
 			select {
-			case item, ok := <-fromPipe:
+			case item, ok := <-pipe:
 				if !ok {
 					return
 				} else {
-					toPipe <- item
+					redirectPipe <- item
 				}
 			}
 		}
 	}
 }
 
-func Wait(pipe chan interface{}) {
-	if pipe != nil {
-		for {
-			select {
-			case _, ok := <-pipe:
-				if !ok {
-					return
-				}
-			}
-		}
-	}
-}
-
-// getErrorsFromPipe selects all received errors and returns them
+// ReadErrors selects all received errors and returns them.
+// This is helpful for synchronous migration functions.
 func ReadErrors(pipe chan interface{}) []error {
 	err := make([]error, 0)
 	if pipe != nil {