docker-sync 0.2.0.beta5 → 0.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94abd2200815b1114719e58149b90ecf713ff5ee
-  data.tar.gz: f3e8d3f36eaf2046aa0f664670659aba57265e19
+  metadata.gz: 06142b9ee0f12f549b75f3671aaab289c2cb43ea
+  data.tar.gz: 1257430a3b878a2d94970480ee02114f3c6606ba
 SHA512:
-  metadata.gz: dc26e58c0a5641cd7aadb5fd6af54a07cfb7b6e3760d0f71782aae7d83273ceadfd4cbc6b8f58e396aaeda64d53f8d951c30c02a172d610fb1a9178425b3aabc
-  data.tar.gz: bad573788249515c63475299b2058b38240589ae27fce69e1ce9396729d22a6db5ea4da957dbee6932a08aae2c22b2572af088e464fb09538be8b479a7f1ec51
+  metadata.gz: e96b8b6cb06680f069f75deec3e76be6ff8aa0c46b9e50308e0817bef903caf4c30c2afa41ca4ba40f48c3d28747963b90a0b21dcd8e9f630faf2b2ea97806b0
+  data.tar.gz: 7c93d7cff89803103207818b6c0500948914482d319c9aff5bffa42e19b4911f42c482638ea3513a2c02b2a6415c77d5658b7f9f2f803e84135713d97457a288

data/VERSION

@@ -1 +1 @@
-0.2.0.beta5
+0.2.0.rc1

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

@@ -116,26 +116,17 @@ module Docker_Sync
 
       def get_user_mapping
         user_mapping = ''
-        if @options.key?('sync_user')
-          user_mapping = "-e OWNER=#{@options['sync_user']}"
-          if @options.key?('sync_userid')
-            user_mapping = "#{user_mapping} -e OWNERID=#{@options['sync_userid']}"
-          end
-        elsif @options.key?('sync_userid')
-          raise("#{get_container_name}: You have set a sync_userid but no sync_user - you need to set both")
+        if @options.key?('sync_userid')
+          user_mapping = "#{user_mapping} -e OWNER_UID=#{@options['sync_userid']}"
         end
         return user_mapping
       end
 
       def get_group_mapping
         group_mapping = ''
-        if @options.key?('sync_group')
-          group_mapping = "-e GROUP=#{@options['sync_group']}"
-          if @options.key?('sync_groupid')
-            group_mapping = "#{group_mapping} -e GROUPID=#{@options['sync_groupid']}"
-          end
-        elsif @options.key?('sync_groupid')
-          raise("#{get_container_name}: You have set a sync_groupid but no sync_group - you need to set both")
+        if @options.key?('sync_groupid')
+          raise 'for now, rsync does no longer support groupid, but for nearly all cases sync_userid should be enaugh'
+          #group_mapping = "#{group_mapping} -e GROUP_ID=#{@options['sync_groupid']}"
         end
         return group_mapping
       end

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

@@ -23,11 +23,12 @@ module Docker_Sync
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison:unox'
+          @docker_image = 'eugenmayer/unison'
         end
         begin
           Preconditions::unison_available
           Preconditions::unox_available
+          Preconditions::macfsevents_available
         rescue Exception => e
           say_status 'error', "#{@sync_name} has been configured to sync with unison, but no unison available", :red
           say_status 'error', e.message, :red
@@ -121,7 +122,7 @@ module Docker_Sync
         args.push(@options['src'])
         args.push('-auto')
         args.push('-batch')
-        args.push(sync_prefer) if @options.key?('sync_prefer')
+        args.push(sync_prefer)
         args.push(@options['sync_args']) if @options.key?('sync_args')
         sync_host_port = get_host_port(get_container_name, UNISON_CONTAINER_PORT)
         args.push("socket://#{@options['sync_host_ip']}:#{sync_host_port}")
@@ -132,11 +133,17 @@ module Docker_Sync
         return args
       end
 
+      # cares about conflict resolution
       def sync_prefer
+        # thats our default, if nothing is set
+        unless @options.key?('sync_prefer') || @options['sync_prefer'] == 'default'
+          return "-prefer '#{@options['src']}' -copyonconflict"
+        end
+
         case @options['sync_prefer']
-        when 'src' then "-prefer #{@options['src']}"
-        when 'dest' then "-prefer #{@options['dest']}"
-        else "-prefer #{@options['sync_prefer']}"
+          when 'src' then "-prefer #{@options['src']}"
+          when 'dest' then "-prefer #{@options['dest']}"
+          else "-prefer #{@options['sync_prefer']}"
         end
       end
 
@@ -145,14 +152,15 @@ module Docker_Sync
         container_name = get_container_name
         volume_name = get_volume_name
         env = {}
+        say_status 'ok', 'sync_user is no longer supported, since it ise no needed, use sync_userid only please', :yellow if @options.key?('sync_user')
+
         ignore_strings = expand_ignore_strings
         env['UNISON_EXCLUDES'] = ignore_strings.join(' ')
-        env['UNISON_OWNER'] = @options['sync_user'] if @options.key?('sync_user')
         env['MAX_INOTIFY_WATCHES'] = @options['max_inotify_watches'] if @options.key?('max_inotify_watches')
         if @options['sync_userid'] == 'from_host'
-          env['UNISON_OWNER_UID'] = Process.uid
+          env['OWNER_UID'] = Process.uid
         else
-          env['UNISON_OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
+          env['OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
         end
 
         additional_docker_env = env.map{ |key,value| "-e #{key}=\"#{value}\"" }.join(' ')
@@ -165,7 +173,7 @@ module Docker_Sync
             run_privileged = '--privileged' if @options.key?('max_inotify_watches') #TODO: replace by the minimum capabilities required
             cmd = "docker run -p '#{@options['sync_host_ip']}::#{UNISON_CONTAINER_PORT}' \
                               -v #{volume_name}:#{@options['dest']} \
-                              -e UNISON_DIR=#{@options['dest']} \
+                              -e VOLUME=#{@options['dest']} \
                               -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} \
                               #{additional_docker_env} \
                               #{run_privileged} \
@@ -200,7 +208,7 @@ module Docker_Sync
 
       def get_host_port(container_name, container_port)
         File.exist?('/usr/bin/sed') ? sed = '/usr/bin/sed' : sed = `which sed`.chomp # use macOS native sed in /usr/bin/sed first, fallback to sed in $PATH if it's not there
-        cmd = 'docker inspect --format=" {{ .NetworkSettings.Ports }} " ' + container_name + " | #{sed} " + '-E "s/.*map\[' + container_port + '[^ ]+ ([0-9]*)[^0-9].*/\1/"'
+        cmd = 'docker inspect --format=\'{{(index (index .NetworkSettings.Ports "5000/tcp") 0).HostPort}}\' ' + container_name
         say_status 'command', cmd, :white if @options['verbose']
         stdout, stderr, exit_status = Open3.capture3(cmd)
         if not exit_status.success?

data/lib/docker-sync/update_check.rb

@@ -63,7 +63,7 @@ class UpdateChecker
   def check_unison_image
     say_status 'ok','Checking if a newer unison image is available'
 
-    if system("docker pull eugenmayer/unison:unox | grep 'Downloaded newer image for'")
+    if system("docker pull eugenmayer/unison | grep 'Downloaded newer image for'")
       say_status 'ok', 'Downloaded newer image for unison', :green
       @newer_image_found = true
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta5
+  version: 0.2.0.rc1
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor