docker-sync 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb070a930f4ed696ff77d215964bc8b072befa4e
-  data.tar.gz: b28aa8a79ce842c345616df3a7c036a106c6a9a1
+  metadata.gz: 2f8b70cd8eadb981ebb2d30dbb2aa82ed2457a24
+  data.tar.gz: e5b01b4e856a62db95006063eb10e13bccfba9f5
 SHA512:
-  metadata.gz: 8fea6207b55d99adf4f400ea6feff7ddd3a261487bbf9e656c03026d8cb34c011883c57f24045de8358248071e9407d9d31485d6e0a1cd72e02f808c7e3fea7a
-  data.tar.gz: 7905e062de45685bc43bb98863aba020c37fe80bbd8d04b02cd8ebc9047ee679ab6d9d9c4dc16c5c0b3f57ffdca482892de74e168d2bfdf641efefe376db5be2
+  metadata.gz: a84e897db840254b726b4fbefc20905b4b186f8c46053c5d3b8f34e48749c0bd6d9b12f4e579caa3ff34ea6e03f5428fbc876d92a878e1964cd735c6c39943af
+  data.tar.gz: 4917fb9c501ff074d3266d56557fe2859880e2383f46acb6c14efbdf54267e4baf7c868be7b39fef3d1e41524867a0761331d9d319a01da3c5ded71f141395e5

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/docker-sync/sync_strategy/unison.rb

@@ -119,11 +119,10 @@ module DockerSync
         args.push("'#{@options['src']}'")
         args.push('-auto')
         args.push('-batch')
-        sync_host_port = get_host_port(get_container_name, UNISON_CONTAINER_PORT)
-        dest = "socket://#{@options['sync_host_ip']}:#{sync_host_port}"
-        args.push(sync_prefer(dest))
+        args.push(sync_prefer)
         args.push(@options['sync_args']) if @options.key?('sync_args')
-        args.push(dest)
+        sync_host_port = get_host_port(get_container_name, UNISON_CONTAINER_PORT)
+        args.push("socket://#{@options['sync_host_ip']}:#{sync_host_port}")
 
         if @options.key?('sync_group') || @options.key?('sync_groupid')
           raise('Unison does not support sync_group, sync_groupid - please use rsync if you need that')
@@ -132,15 +131,16 @@ module DockerSync
       end
 
       # cares about conflict resolution
-      def sync_prefer dest
+      def sync_prefer
         case @options.fetch('sync_prefer', 'default')
           when 'default' then "-prefer '#{@options['src']}' -copyonconflict" # thats our default, if nothing is set
           when 'src' then "-prefer '#{@options['src']}'"
-          when 'dest' then "-prefer '#{dest}'"
+          when 'dest' then "-prefer 'socket://#{@options['sync_host_ip']}:#{sync_host_port}'"
           else "-prefer '#{@options['sync_prefer']}'"
         end
       end
 
+
       def start_container
         say_status 'ok', "Starting unison for sync #{@sync_name}", :white
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor