docker-sync 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f91f3a2eb84005eb9ecd865282ace48c86f2f2c4
-  data.tar.gz: 3a5ca77ceab1cbe91ae630c6cd7c102db467f0c2
+  metadata.gz: 6cb5e3a077d9de57cad162afbdab55c0aa2ed36f
+  data.tar.gz: 73b3b75811e54265c180c4e6cc540a23f762a394
 SHA512:
-  metadata.gz: 35de54d7b90e0dd76617a8ad102cea41ff8c837904790f96313c8943eb5b9c7e13249bfa3209673788fec538eb9784f173393dddfeff6f81e8a967be10feceda
-  data.tar.gz: 30776d4c9c53279ffa349ac44f50efb9b204a7577678d67c44baaeef5131f94eab02e62d28ae423dbd641e3a62f7ae5fe7d0f9b8f86bf8a6bc38ba799adac901
+  metadata.gz: 420ff17cc42f4d5422e85604f5e28b1ff10e6a820435130bca44dccf6f970c349583d068195ca5f460a9c89b230ad94f255f56dac03f9b79b95036c54cb60eed
+  data.tar.gz: 0d1284902dcb5b72fe1cde3c28f9279efba62db2990f2c9c9837e3461b8f0032f2c61b6b2f1b588ba4fc6936cf220b195be25b3c3221d17d7e952674a77e6d61

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.1.0

data/lib/docker-sync/execution.rb

@@ -34,4 +34,23 @@ module Execution
 
   end
 
+  # unison doesn't work when ran in a new thread
+  # this functions creates a full new process instead
+  def forkexec(command, prefix = nil, color = nil)
+
+    if prefix.nil?
+      # TODO: probably pick the command name without args
+      prefix = 'unknown'
+    end
+
+    if color.nil?
+      color = :cyan
+    end
+
+    Process.fork  {
+      `#{command}` || raise(command + ' failed')
+    }
+
+  end
+
 end

data/lib/docker-sync/preconditions.rb

@@ -43,4 +43,20 @@ module Preconditions
       raise('Could not find unison binary in path. Please install it, e.g. using "brew install unison"')
     end
   end
-end
+
+  def self.unox_available
+    if (find_executable0 'unison-fsmonitor').nil?
+      cmd1 = 'curl "https://raw.githubusercontent.com/hnsl/unox/master/unox.py" -o "/usr/local/bin/unison-fsmonitor" \
+      && chmod +x /usr/local/bin/unison-fsmonitor'
+      cmd2 = 'easy_install pip && pip install macfsevents'
+      Thor::Shell::Basic.new.say_status 'warning', 'Could not find unison-fsmonitor (for file watching) binary in $PATH. Please install unox before you continue, see https://github.com/hnsl/unox.', :yellow
+      if Thor::Shell::Basic.new.yes?('Shall I install unison-fsmonitor for you?')
+        `#{cmd1}`
+        Thor::Shell::Basic.new.say_status 'ok','install macfsevents using pip', :yellow
+        `#{cmd2}`
+      else
+        raise("Please install it, see https://github.com/hnsl/unox, or simply run :\n #{cmd1} && #{cmd2}")
+      end
+    end
+  end
+end

data/lib/docker-sync/sync_manager.rb

@@ -5,7 +5,7 @@ require 'docker-sync/sync_process'
 require 'docker-sync/execution'
 require 'yaml'
 
-module Docker_Rsync
+module Docker_sync
   class SyncManager
     include Thor::Shell
 
@@ -79,7 +79,9 @@ module Docker_Rsync
     end
 
     def validate_sync_config(name, sync_config)
-      %w[src dest sync_host_port].each do |key|
+      config_mandatory = %w[src dest]
+      config_mandatory.push('sync_host_port') unless sync_config['sync_strategy'] == 'unison' #TODO: Implement autodisovery for other strategies
+      config_mandatory.each do |key|
         raise ("#{name} does not have #{key} condiguration value set - this is mandatory") unless sync_config.key?(key)
       end
     end
@@ -123,7 +125,12 @@ module Docker_Rsync
     def join_threads
       begin
         @sync_processes.each do |sync_process|
-          sync_process.watch_thread.join unless sync_process.watch_thread.nil?
+          if sync_process.watch_thread
+            sync_process.watch_thread.join
+          end
+          if sync_process.watch_fork
+            Process.wait(sync_process.watch_fork)
+          end
         end
 
       rescue SystemExit, Interrupt

data/lib/docker-sync/sync_process.rb

@@ -1,11 +1,12 @@
 require 'thor/shell'
 # noinspection RubyResolve
 require 'docker-sync/sync_strategy/rsync'
+require 'docker-sync/sync_strategy/unison-onesided'
 require 'docker-sync/sync_strategy/unison'
-require 'docker-sync/sync_strategy/unison-dualside'
 # noinspection RubyResolve
 require 'docker-sync/watch_strategy/fswatch'
 require 'docker-sync/watch_strategy/dummy'
+require 'docker-sync/watch_strategy/unison'
 
 module Docker_Sync
   class SyncProcess
@@ -35,10 +36,10 @@ module Docker_Sync
         case @options['sync_strategy']
           when 'rsync'
             @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
+          when 'unison-onesided'
+            @sync_strategy = Docker_Sync::SyncStrategy::Unison_Onesided.new(@sync_name, @options)
           when 'unison'
             @sync_strategy = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
-          when 'unison-dualside'
-            @sync_strategy = Docker_Sync::SyncStrategy::Unison_DualSide.new(@sync_name, @options)
           else
             @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
         end
@@ -54,11 +55,17 @@ module Docker_Sync
             @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
           when 'disable','dummy'
             @watch_strategy = Docker_Sync::WatchStrategy::Dummy.new(@sync_name, @options)
+          when 'unison'
+            @watch_strategy = Docker_Sync::WatchStrategy::Unison.new(@sync_name, @options)
           else
             @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
         end
       else
-        @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
+        if @options['sync_strategy'] == 'unison'
+          @watch_strategy = Docker_Sync::WatchStrategy::Unison.new(@sync_name, @options)
+        else
+          @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
+        end
       end
     end
 
@@ -90,6 +97,10 @@ module Docker_Sync
       @watch_strategy.run
     end
 
+    def watch_fork
+      return @watch_strategy.watch_fork
+    end
+
     def watch_thread
       return @watch_strategy.watch_thread
     end

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

@@ -87,17 +87,17 @@ module Docker_Sync
         say_status 'ok', 'Starting rsync', :white
         container_name = get_container_name
         volume_name = get_volume_name
-        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | grep #{container_name}`
+        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
         if running == '' # container is yet not running
           say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
-          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | grep #{container_name}`
+          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
           if exists == '' # container has yet not been created
             say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
 
             user_mapping = get_user_mapping
             group_mapping = get_group_mapping
 
-            cmd = "docker run -p '#{@options['sync_host_port']}:873' -v #{volume_name}:#{@options['dest']} #{user_mapping} #{group_mapping} -e VOLUME=#{@options['dest']} --name #{container_name} -d #{@docker_image}"
+            cmd = "docker run -p '#{@options['sync_host_port']}:873' -v #{volume_name}:#{@options['dest']} #{user_mapping} #{group_mapping} -e VOLUME=#{@options['dest']} -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} --name #{container_name} -d #{@docker_image}"
           else # container already created, just start / reuse it
             say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
             cmd = "docker start #{container_name}"

data/lib/docker-sync/sync_strategy/{unison-dualside.rb → unison-onesided.rb}

@@ -1,18 +1,16 @@
 require 'thor/shell'
 require 'docker-sync/preconditions'
 require 'open3'
-require 'socket'
 require 'terminal-notifier'
 
 module Docker_Sync
   module SyncStrategy
-    class Unison_DualSide
+    class Unison_Onesided
       include Thor::Shell
 
       @options
       @sync_name
       @watch_thread
-      @local_server_pid
       UNISON_CONTAINER_PORT = '5000'
       def initialize(sync_name, options)
         @sync_name = sync_name
@@ -21,7 +19,7 @@ module Docker_Sync
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison:dualside'
+          @docker_image = 'eugenmayer/unison:onesided'
         end
         begin
           Preconditions::unison_available
@@ -34,7 +32,6 @@ module Docker_Sync
 
       def run
         start_container
-        start_local_server
         sync
       end
 
@@ -68,16 +65,11 @@ module Docker_Sync
         args.push(@options['src'])
         args.push('-auto')
         args.push('-batch')
-        args.push('-owner') if @options['sync_userid'] == 'from_host'
-        args.push('-numericids') if @options['sync_userid'] == 'from_host'
         args.push(@options['sync_args']) if @options.key?('sync_args')
         args.push("socket://#{@options['sync_host_ip']}:#{@options['sync_host_port']}/")
         args.push('-debug all') if @options['verbose']
-        if @options.key?('sync_user') || @options.key?('sync_group') || @options.key?('sync_groupid')
-          raise('Unison does not support sync_user, sync_group, sync_groupid - please use rsync if you need that')
-        end
-        if  @options.key?('sync_userid') && @options['sync_userid'] != 'from_host'
-          raise('Unison does not support sync_userid with a parameter different than \'from_host\'')
+        if @options.key?('sync_user') || @options.key?('sync_group') || @options.key?('sync_groupid') || @options.key?('sync_userid')
+          raise('Unison does not support sync_user, sync_group, sync_groupid or sync_userid - please use rsync if you need that')
         end
         return args
       end
@@ -86,33 +78,13 @@ module Docker_Sync
         say_status 'ok', 'Starting unison', :white
         container_name = get_container_name
         volume_name = get_volume_name
-        env = {}
-
-        env['ENABLE_WATCH'] = 'true'
-        # Excludes for fswatch and unison uses the same value both in the host and in the container
-        env['FSWATCH_EXCLUDES'] = @options['watch_excludes'].map { |pattern| "--exclude='#{pattern}'" }.join(' ') if @options.key?('watch_excludes')
-        env['UNISON_EXCLUDES'] = @options['sync_excludes'].map { |pattern| "-ignore='Path #{pattern}'" }.join(' ') if @options.key?('sync_excludes')
-        # Specify the IP of the host to call the host unison server from the container
-        env['HOST_IP'] = get_host_ip
-        env['UNISON_HOST_PORT'] = @options['unison-dualside_host_server_port']
-
-        if @options['sync_userid'] == 'from_host'
-          env['UNISON_DIR_OWNER'] = Process.uid
-        end
-
-        additional_docker_env = env.map{ |key,value| "-e #{key}=\"#{value}\"" }.join(' ')
-        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | grep #{container_name}`
+        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
         if running == ''
           say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
-          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | grep #{container_name}`
+          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
           if exists == ''
             say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
-            cmd = "docker run -p '#{@options['sync_host_port']}:#{UNISON_CONTAINER_PORT}' \
-                              -v #{volume_name}:#{@options['dest']} \
-                              -e UNISON_DIR=#{@options['dest']} \
-                              #{additional_docker_env} \
-                              --name #{container_name} \
-                              -d #{@docker_image}"
+            cmd = "docker run -p '#{@options['sync_host_port']}:#{UNISON_CONTAINER_PORT}' -v #{volume_name}:#{@options['dest']} -e UNISON_DIR=#{@options['dest']} -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} --name #{container_name} -d #{@docker_image}"
           else
             say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
             cmd = "docker start #{container_name}"
@@ -124,48 +96,11 @@ module Docker_Sync
         end
         say_status 'ok', "starting initial sync of #{container_name}", :white if @options['verbose']
         # this sleep is needed since the container could be not started
-        sleep 5 # TODO: replace with unison -testserver
+        sleep 1
         sync
         say_status 'success', 'Unison server started', :green
       end
 
-      # Start an unison server on the host
-      def start_local_server
-        say_status 'ok', 'Starting local unison server', :white
-
-        if not @options.key?('unison-dualside_host_server_port')
-          raise('Missing unison-dualside_host_server_port option. In order to get files synced back automatically from the
-          container, you must specify the port of the local unison server.')
-        end
-        cmd = "unison -socket #{@options['unison-dualside_host_server_port']}"
-        say_status 'command', cmd, :white if @options['verbose']
-
-        # Store the pid of the local unison server, to kill it when docker-sync stops
-        @local_server_pid = Process.fork do
-          # Run the local unison server in the source folder
-          Dir.chdir(@options['src']){
-            `#{cmd}` || raise('Start of local unison server failed')
-          }
-        end
-      end
-
-      # Try to guess the IP of the host to call the unison server from the container
-      # Or use the value specified in the config option
-      def get_host_ip
-        if @options['unison-dualside_host_ip'] != 'auto' && @options.key?('unison-dualside_host_ip')
-          host_ip = @options['host_ip']
-        elsif @options['unison-dualside_host_ip'] == 'auto' || (not @options.key?('unison-dualside_host_ip'))
-          host_ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
-        end
-        return host_ip
-      end
-
-      # Kill the local unison server
-      def stop_local_server
-        Process.kill "TERM", @local_server_pid
-        Process.wait @local_server_pid
-      end
-
       def get_container_name
         return "#{@sync_name}"
       end
@@ -192,7 +127,6 @@ module Docker_Sync
         say_status 'ok', "Stopping sync container #{get_container_name}"
         begin
           stop_container
-          stop_local_server
         rescue Exception => e
           say_status 'error', "Stopping failed of #{get_container_name}:", :red
           puts e.message

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

@@ -1,28 +1,33 @@
 require 'thor/shell'
 require 'docker-sync/preconditions'
+require 'docker-sync/execution'
 require 'open3'
+require 'socket'
 require 'terminal-notifier'
 
 module Docker_Sync
   module SyncStrategy
     class Unison
       include Thor::Shell
+      include Execution
 
       @options
       @sync_name
       @watch_thread
+      @local_server_pid
       UNISON_CONTAINER_PORT = '5000'
       def initialize(sync_name, options)
-        @sync_name = sync_name
         @options = options
+        @sync_name = sync_name
         # if a custom image is set, apply it
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison'
+          @docker_image = 'eugenmayer/unison:unox'
         end
         begin
           Preconditions::unison_available
+          Preconditions::unox_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
@@ -31,10 +36,41 @@ module Docker_Sync
       end
 
       def run
+        increase_watcher_limit if @options.key?('max_inotify_watches')
         start_container
         sync
       end
 
+      def increase_watcher_limit
+        current_max_files_per_proc = `sysctl kern.maxfilesperproc | awk '{print $2}'`
+        if current_max_files_per_proc.to_f < @options['max_inotify_watches']
+          cmd = 'sudo sysctl -w kern.maxfilesperproc=' + @options['max_inotify_watches'].to_s
+          say_status 'command', cmd, :white
+          `#{cmd}` || raise('Unable to increase maxfilesperproc')
+        else
+          say_status 'command', 'Current maxfilesperproc set to ' + current_max_files_per_proc.to_s, :white
+        end
+        current_max_files = `sysctl kern.maxfiles | awk '{print $2}'`
+        if current_max_files.to_f < @options['max_inotify_watches']
+          cmd = 'sudo sysctl -w kern.maxfiles=' + @options['max_inotify_watches'].to_s
+          say_status 'command', cmd, :white
+          `#{cmd}` || raise('Unable to increase maxfiles')
+        else
+          say_status 'command', 'Current maxfiles set to ' + current_max_files.to_s, :white
+        end
+      end
+
+      def watch
+        args = sync_options
+        args.push("-repeat watch")
+        cmd = ''
+        cmd = cmd + 'ulimit -n ' + @options['max_inotify_watches'].to_s + ' && ' if @options.key?('max_inotify_watches')
+        cmd = cmd + 'unison ' + args.join(' ')
+
+        say_status 'command', cmd, :white if @options['verbose']
+        forkexec(cmd, "Sync #{@sync_name}", :blue)
+      end
+
       def sync
         args = sync_options
         cmd = 'unison ' + args.join(' ')
@@ -47,7 +83,7 @@ module Docker_Sync
           say_status 'message', stderr
         else
           TerminalNotifier.notify(
-            "Synced #{@options['src']}", :title => @sync_name
+              "Synced #{@options['src']}", :title => @sync_name
           ) if @options['notify_terminal']
           say_status 'ok', "Synced #{@options['src']}", :white
           if @options['verbose']
@@ -66,10 +102,11 @@ module Docker_Sync
         args.push('-auto')
         args.push('-batch')
         args.push(@options['sync_args']) if @options.key?('sync_args')
-        args.push("socket://#{@options['sync_host_ip']}:#{@options['sync_host_port']}/")
-        args.push('-debug all') if @options['verbose']
-        if @options.key?('sync_user') || @options.key?('sync_group') || @options.key?('sync_groupid') || @options.key?('sync_userid')
-          raise('Unison does not support sync_user, sync_group, sync_groupid or sync_userid - please use rsync if you need that')
+        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_user, sync_group, sync_groupid - please use rsync if you need that')
         end
         return args
       end
@@ -78,30 +115,62 @@ module Docker_Sync
         say_status 'ok', 'Starting unison', :white
         container_name = get_container_name
         volume_name = get_volume_name
+        env = {}
+
+        env['UNISON_EXCLUDES'] = @options['sync_excludes'].map { |pattern| "-ignore='Path #{pattern}'" }.join(' ') if @options.key?('sync_excludes')
+        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
+        else
+          env['UNISON_OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
+        end
 
-        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | grep #{container_name}`
+        additional_docker_env = env.map{ |key,value| "-e #{key}=\"#{value}\"" }.join(' ')
+        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
         if running == ''
           say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
-          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | grep #{container_name}`
+          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
           if exists == ''
             say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
-            cmd = "docker run -p '#{@options['sync_host_port']}:#{UNISON_CONTAINER_PORT}' -v #{volume_name}:#{@options['dest']} -e UNISON_DIR=#{@options['dest']} --name #{container_name} -d #{@docker_image}"
+            run_privileged = '--privileged' if @options.key?('max_inotify_watches') #TODO: replace by the minimum capabilities required
+            cmd = "docker run -p '127.0.0.1::#{UNISON_CONTAINER_PORT}' \
+                              -v #{volume_name}:#{@options['dest']} \
+                              -e UNISON_DIR=#{@options['dest']} \
+                              -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} \
+                              #{additional_docker_env} \
+                              #{run_privileged} \
+                              --name #{container_name} \
+                              -d #{@docker_image}"
           else
             say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
-            cmd = "docker start #{container_name}"
+            cmd = "docker start #{container_name} && docker exec #{container_name} supervisorctl restart unison"
           end
-          say_status 'command', cmd, :white if @options['verbose']
-          `#{cmd}` || raise('Start failed')
         else
-          say_status 'ok', "#{container_name} container still running", :blue
+          say_status 'ok', "#{container_name} container still running, restarting unison in container", :blue
+          cmd = "docker exec #{container_name} supervisorctl restart unison"
         end
+        say_status 'command', cmd, :white if @options['verbose']
+        `#{cmd}` || raise('Start failed')
         say_status 'ok', "starting initial sync of #{container_name}", :white if @options['verbose']
         # this sleep is needed since the container could be not started
-        sleep 1
+        sleep 5 # TODO: replace with unison -testserver
         sync
         say_status 'success', 'Unison server started', :green
       end
 
+      def get_host_port(container_name, container_port)
+        cmd = 'docker inspect --format=" {{ .NetworkSettings.Ports }} " ' + container_name + ' | sed "s/.*map\[' + container_port + '[^ ]\+\s\([0-9]\+\).*/\1/"'
+        say_status 'command', cmd, :white if @options['verbose']
+        stdout, stderr, exit_status = Open3.capture3(cmd)
+        if not exit_status.success?
+          say_status 'command', cmd
+          say_status 'error', "Error getting mapped port, exit code #{$?.exitstatus}", :red
+          say_status 'message', stderr
+        end
+        return stdout.gsub("\n",'')
+      end
+
       def get_container_name
         return "#{@sync_name}"
       end

data/lib/docker-sync/update_check.rb

@@ -18,6 +18,8 @@ class UpdateChecker
       return
     end
     check_rsync_image unless DockerSyncConfig::is_first_run # do not check the image if its the first run - since this it will be downloaded anyway
+    check_unison_onesided_image unless DockerSyncConfig::is_first_run
+    check_unison_image unless DockerSyncConfig::is_first_run
     check_and_warn(@config['update_enforce'])
   end
 
@@ -44,6 +46,30 @@ class UpdateChecker
     say_status 'success','Image is (now) up to date'
   end
 
+  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'")
+      say_status 'warning', 'Downloaded newer image for unison', :red
+      say_status 'warning', 'Please use "docker-sync clean" before you start docker-sync again', :red
+
+      exit 0
+    end
+    say_status 'success','Image is (now) up to date'
+  end
+
+  def check_unison_onesided_image
+    say_status 'ok','Checking if a newer unison:onesided image is available'
+
+    if system("docker pull eugenmayer/unison:onesided | grep 'Downloaded newer image for'")
+      say_status 'warning', 'Downloaded newer image for unison:onesided', :red
+      say_status 'warning', 'Please use "docker-sync clean" before you start docker-sync again', :red
+
+      exit 0
+    end
+    say_status 'success','Image is (now) up to date'
+  end
+
   def get_current_version
     path = File.expand_path('../../../', __FILE__)
     return File.read("#{path}/VERSION")

data/lib/docker-sync/upgrade_check.rb

@@ -0,0 +1,59 @@
+require 'gem_update_checker'
+require 'thor/actions'
+require 'docker-sync/config'
+
+class UpgradeChecker
+  include Thor::Shell
+  @config
+  def initialize
+    @config = DockerSyncConfig::global_config
+  end
+
+  def run
+    unless should_run
+      return
+    end
+    check_and_warn
+  end
+
+  def last_upgraded_version
+    @config['upgrade_status'] || ''
+  end
+
+  def should_run
+    # get the update_status which is the version of the update hook which has been run already
+    upgrade_status = last_upgraded_version
+    if upgrade_status == '' || Gem::Version.new(upgrade_status) < Gem::Version.new(get_current_version) # thats how we compare the version
+      return true
+    end
+
+    return false
+  end
+
+
+  def get_current_version
+    path = File.expand_path('../../../', __FILE__)
+    return File.read("#{path}/VERSION")
+  end
+
+  def docker_sync_update_check
+    gem_name = 'docker-sync'
+    current_version = get_current_version
+    checker = GemUpdateChecker::Client.new(gem_name, current_version)
+    return checker
+  end
+
+  def check_and_warn
+    # this is the upgrade hook for the unison-unox introduction / rename of unison
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.1.0')
+      Thor::Shell::Basic.new.say_status 'warning', 'Please be aware that with the strategy "unison" is now called unison-onesided and you might need to migrate. See https://github.com/EugenMayer/docker-sync/wiki/Migration-Guide for more informations', :red
+      unless Thor::Shell::Basic.new.yes?('Shall we continue?')
+        exit 1
+      end
+    end
+
+    # update the upgrade_status
+    @config['upgrade_status'] = "#{get_current_version}"
+    DockerSyncConfig::global_config_save(@config)
+  end
+end

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

@@ -0,0 +1,53 @@
+require 'thor/shell'
+require 'docker-sync/execution'
+require 'docker-sync/preconditions'
+require 'docker-sync/sync_strategy/unison'
+
+module Docker_Sync
+  module WatchStrategy
+    class Unison
+      include Execution
+
+      @options
+      @sync_name
+      @watch_fork
+
+      def initialize(sync_name, options)
+        @options = options
+        @sync_name = sync_name
+        @watch_fork = nil
+        # instantiate the sync task to easily access all common parameters between
+        # unison sync and watch
+        # basically unison watch is the command with the additionnal -repeat watch option
+        # note: this doesn't run a sync
+        @unison = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
+      end
+
+      def run
+        @watch_fork = @unison.watch
+      end
+
+      def stop
+        Process.kill "TERM", @watch_fork
+        Process.wait @watch_fork
+      end
+
+      def clean
+      end
+
+      def watch
+      end
+
+      def watch_options
+      end
+
+      def watch_fork
+        return @watch_fork
+      end
+
+      def watch_thread
+        return nil
+      end
+    end
+  end
+end

data/tasks/stack/stack.thor

@@ -2,6 +2,7 @@ require 'docker-sync/sync_manager'
 require 'docker-sync/config'
 require 'docker-sync/preconditions'
 require 'docker-sync/update_check'
+require 'docker-sync/upgrade_check'
 require 'docker/compose'
 require 'docker-sync/compose'
 class Stack < Thor
@@ -15,6 +16,9 @@ class Stack < Thor
     updates = UpdateChecker.new
     updates.run
 
+    upgrades = UpgradeChecker.new
+    upgrades.run
+
     begin
       Preconditions::check_all_preconditions
     rescue Exception => e
@@ -33,7 +37,7 @@ class Stack < Thor
       end
     end
 
-    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
     @sync_manager.run(options[:sync_name])
     global_options = @sync_manager.global_options
     @compose_manager = ComposeManager.new(global_options)
@@ -76,7 +80,7 @@ class Stack < Thor
         return
       end
     end
-    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
     global_options = @sync_manager.global_options
     # shutdown compose first
     @compose_manager = ComposeManager.new(global_options)

data/tasks/sync/sync.thor

@@ -2,6 +2,7 @@ require 'docker-sync/sync_manager'
 require 'docker-sync/config'
 require 'docker-sync/preconditions'
 require 'docker-sync/update_check'
+require 'docker-sync/upgrade_check'
 
 class Sync < Thor
 
@@ -13,7 +14,8 @@ class Sync < Thor
     # do run update check in the start command only
     updates = UpdateChecker.new
     updates.run
-
+    upgrades = UpgradeChecker.new
+    upgrades.run
     begin
       Preconditions::check_all_preconditions
     rescue Exception => e
@@ -31,7 +33,7 @@ class Sync < Thor
         return
       end
     end
-    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
     @sync_manager.run(options[:sync_name])
     @sync_manager.join_threads
   end
@@ -55,7 +57,7 @@ class Sync < Thor
         return
       end
     end
-    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
     @sync_manager.sync(options[:sync_name])
   end
 
@@ -78,7 +80,7 @@ class Sync < Thor
         return
       end
     end
-    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
     @sync_manager.clean(options[:sync_name])
     say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed there volumes', :green
   end
@@ -105,12 +107,18 @@ class Sync < Thor
     end
 
     say_status 'ok',"Found configuration at #{config_path}"
-    @sync_manager = Docker_Rsync::SyncManager.new(:config_path => config_path)
+    @sync_manager = Docker_sync::SyncManager.new(:config_path => config_path)
     @sync_manager.get_sync_points.each do |name, config|
       say_status name, "On address #{config['sync_host_ip']}:#{config['sync_host_port']}",:white unless options['verbose']
       puts "\n---------------[#{name}] #{config['sync_host_ip']}:#{config['sync_host_port']} ---------------\n" if options['verbose']
       print_table(config) if options['verbose']
     end
   end
+  desc 'start', 'Start all sync configurations in this project'
+  def upgrade
+    # do run update check in the start command only
+    upgrades = UpgradeChecker.new
+    upgrades.run
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -98,11 +98,13 @@ files:
 - lib/docker-sync/sync_manager.rb
 - lib/docker-sync/sync_process.rb
 - lib/docker-sync/sync_strategy/rsync.rb
-- lib/docker-sync/sync_strategy/unison-dualside.rb
+- lib/docker-sync/sync_strategy/unison-onesided.rb
 - lib/docker-sync/sync_strategy/unison.rb
 - lib/docker-sync/update_check.rb
+- lib/docker-sync/upgrade_check.rb
 - lib/docker-sync/watch_strategy/dummy.rb
 - lib/docker-sync/watch_strategy/fswatch.rb
+- lib/docker-sync/watch_strategy/unison.rb
 - tasks/stack/stack.thor
 - tasks/sync/sync.thor
 homepage: https://github.com/EugenMayer/docker_sync
@@ -117,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="