allow to talk to rsync endpoint directly

Author: Matthias Kadenbach

README.md

@@ -1,38 +1,47 @@
 # docker-rsync
 
 docker-rsync recursively watches directories for changes and copies
-changes to a docker-machine. It is a drop in replacement for the 
+changes via rsync. It is a drop in replacement for the 
 existing boot2docker vboxsf feature.
 
-Please note though that syncing happens only in one direction, 
-from your local machine to the boot2docker machine. If you want to sync
-from a Docker container back to your local machine, docker-rsync is not
-the tool you're looking for. 
+Please note though that syncing happens only in one direction. 
+If you want to sync back from a Docker container to your local machine, 
+docker-rsync is not the tool you're looking for. 
 
 __Is it fast?__ Yes! While the initial sync might take some seconds
 (depending on the number of files you want to sync), following syncs are 
 super fast (compared to vboxsf & NFS). A one file sync usually takes less than 100ms.
 
 docker-sync relies on [FSEvents API](https://developer.apple.com/library/mac/documentation/Darwin/Reference/FSEvents_Ref/), 
-so this tool will only work under Mac OSX. You also need [docker-machine](https://github.com/docker/machine) installed.
+so this tool will only work under Mac OSX.
 
 
 ## Installation
 
 ```bash
-brew install docker-machine
-
 brew tap synack/docker
 brew install docker-rsync
 ```
 
-## Usage
+
+## Usage with docker-machine
 
 ```bash
+brew install docker-machine
 docker-machine create my-machine123 -d virtualbox
 
 cd sync-this-directory
+echo "git" >> .rsyncignore
+
 docker-rsync my-machine123
+```
+
+
+## Talk to rsync directly
 
+```bash
+cd sync-this-directory
 echo "git" >> .rsyncignore
+
+docker-rsync rsync://<IP:PORT>/<MODULE>
 ```

main.go

@@ -5,53 +5,76 @@ import (
 	"fmt"
 	"os"
 	pathpkg "path"
+	"strings"
 )
 
 func main() {
+	pwd, err := os.Getwd()
+	if err != nil {
+		fmt.Println("error: unable to get current directory:", err)
+		os.Exit(1)
+	}
+
 	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "usage: %v [-version|-initial] <machine-name>\n", os.Args[0])
+		fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
+		fmt.Fprintf(os.Stderr, "or   : %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
+		fmt.Print("\nOptions:\n")
 		flag.PrintDefaults()
 	}
 
 	var version = flag.Bool("version", false, "Print version")
 	var onetime = flag.Bool("1", false, "Sync only once")
+	var path = flag.String("path", pwd, "Sync this directory")
 	flag.Parse()
 
 	if *version {
 		fmt.Println(Version)
 		os.Exit(0)
 	}
 
-	path, err := os.Getwd()
-	if err != nil {
-		fmt.Println("error: unable to get current directory:", err)
-		os.Exit(1)
-	}
-
 	if len(flag.Args()) != 1 {
-		fmt.Printf("usage: %v [-version|-initial] <machine-name>\n", os.Args[0])
+		flag.Usage()
 		os.Exit(1)
 	}
 
-	machineName := flag.Args()[0]
+	via := flag.Args()[0]
 
-	port, err := GetSSHPort(machineName)
-	if err != nil {
-		fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
-		os.Exit(1)
-	}
+	rpath := *path
+	rpathDir := pathpkg.Dir(*path)
+
+	// TODO: refactor the following part...
 
-	Provision(machineName)
+	if strings.HasPrefix(via, "rsync://") {
+		// use rsync protocol directly
+		rsyncEndpoint := via
 
-	rpath := path
-	rpathDir := pathpkg.Dir(path)
+		Sync(rsyncEndpoint, 0, rpath, rpathDir) // initial sync
 
-	PrepareSync(machineName, port, rpath, rpathDir)
-	Sync(machineName, port, path, pathpkg.Dir(path)) // initial sync
+		if !*onetime {
+			Watch(rpath, func(id uint64, path string, flags []string) {
+				Sync(rsyncEndpoint, 0, rpath, rpathDir)
+			})
+		}
 
-	if !*onetime {
-		Watch(path, func(id uint64, path string, flags []string) {
-			Sync(machineName, port, rpath, rpathDir)
-		})
+	} else {
+		// use rsync via ssh
+		machineName := via
+
+		port, err := GetSSHPort(machineName)
+		if err != nil {
+			fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
+			os.Exit(1)
+		}
+
+		Provision(machineName)
+		RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir)
+		Sync(machineName, port, rpath, rpathDir) // initial sync
+
+		if !*onetime {
+			Watch(rpath, func(id uint64, path string, flags []string) {
+				Sync(machineName, port, rpath, rpathDir)
+			})
+		}
 	}
+
 }

rsync.go

@@ -8,34 +8,38 @@ import (
 	"strings"
 )
 
-func PrepareSync(machineName string, port uint, src, dst string) {
-	RunSSHCommand(machineName, "sudo mkdir -p "+dst)
-}
-
-func Sync(machineName string, port uint, src, dst string) {
-	homePath := os.Getenv("HOME")
-	ripath := getRsyncIgnorePath()
+var lastSyncError = ""
 
+func Sync(via string, port uint, src, dst string) {
 	args := []string{
+		// "--verbose",
+		// "--stats",
 		"--recursive",
 		"--links",
 		"--times",
 		"--inplace",
-		// "--verbose",
-		// "--stats",
 		"--itemize-changes",
 		"--delete",
 		"--force",
 		"--executability",
 		"--compress",
-		"--force",
-		fmt.Sprintf(`-e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=quiet -i "%s" -p %v'`, filepath.Join(homePath, "/.docker/machine/machines", machineName, "id_rsa"), port),
-		"--rsync-path='sudo rsync'",
 	}
+
+	ripath := getRsyncIgnorePath()
 	if ripath != "" {
 		args = append(args, `--exclude-from='`+ripath+`'`)
 	}
-	args = append(args, src, "docker@localhost:"+dst)
+
+	if strings.HasPrefix(via, "rsync://") {
+		args = append(args, filepath.Join(src)+"/.")
+		args = append(args, via)
+	} else {
+		machineName := via
+		homePath := os.Getenv("HOME")
+		args = append(args, fmt.Sprintf(`-e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=quiet -i "%s" -p %v'`, filepath.Join(homePath, "/.docker/machine/machines", machineName, "id_rsa"), port))
+		args = append(args, "--rsync-path='sudo rsync'")
+		args = append(args, src, "docker@localhost:"+dst)
+	}
 
 	command := "rsync " + strings.Join(args, " ")
 
@@ -46,7 +50,11 @@ func Sync(machineName string, port uint, src, dst string) {
 	cmd.Stderr = os.Stderr
 
 	if err := cmd.Run(); err != nil {
-		fmt.Printf("error: %v\n", err)
+		// don't show duplicate errors
+		if lastSyncError != err.Error() {
+			fmt.Printf("error: %v\n", err)
+		}
+		lastSyncError = err.Error()
 	}
 }
 

version.go

@@ -1,3 +1,3 @@
 package main
 
-const Version = "0.0.3"
+const Version = "0.0.4"