docker-sync 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b015ea9a91c28a2a853b611f3f0ffc69897cf3
-  data.tar.gz: 932bbd68a8ea5543626dd4be5e70bdc541efd4c9
+  metadata.gz: 5a467b9dee71d933110ea66148ac480c7ed3d9b0
+  data.tar.gz: 1533c522f6aa5db93e15d85e4b8a53f61f350e2a
 SHA512:
-  metadata.gz: abdd92bb2321085d92b156968a9dd2ece9a65a1dfb655baf2a427308b21cda65a67326d15c2b7a805dfd3e351f378825427c0036706866750458eb305b1fb13b
-  data.tar.gz: a8ea319b00c764d183baffe56de3ab2ada13b02df3291d304dd7c0ee1d59415d239e1a4af71d3ff2e351963b4bda44fb53f702b3fd5a9c73fa0fa92873a1fcd4
+  metadata.gz: 3dfb30f05807f691089c1e106934a29e2bfa54794994b6d7180789824052e1f18532e239058b91f1989b8779c27bbfe58a2adf7db6eaa7c06c1ebc72b2b41004
+  data.tar.gz: c09c3b2a2e6615302bf5593e6f5472fa7f364a96e3183a421c09d911042fd20bad5ae0a2e83005f821b0e2883eebd15d4307aa178564b28f1256119b94785c5a

data/Thorfile

@@ -1,6 +1,7 @@
-#lib = File.expand_path('./lib', __dir__)
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-thor = File.expand_path('../tasks', __FILE__)
+file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+file = File.expand_path(File.dirname(file))
+$LOAD_PATH.unshift File.expand_path('./lib', file)
+thor = File.expand_path('./tasks', file)
 
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   load taskfile

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/bin/docker-sync

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-$LOAD_PATH.unshift File.expand_path('../../lib', file)
+file = File.expand_path(File.dirname(file))
+$LOAD_PATH.unshift File.expand_path('../lib', file)
 
 require 'thor'
 require 'docker-sync/update_check'
 
-thor = File.expand_path('../../tasks/sync', file)
+thor = File.expand_path('../tasks/sync', file)
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   load taskfile
 }

data/bin/docker-sync-stack

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-$LOAD_PATH.unshift File.expand_path('../../lib', file)
+file = File.expand_path(File.dirname(file))
+$LOAD_PATH.unshift File.expand_path('../lib', file)
 
 
 require 'thor'
@@ -16,7 +17,7 @@ require 'docker-sync/update_check'
 #  exit 0
 #end
 
-thor = File.expand_path('../../tasks/stack', file)
+thor = File.expand_path('../tasks/stack', file)
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   # noinspection RubyResolve
   load taskfile

data/lib/docker-sync/sync_manager.rb

@@ -45,7 +45,7 @@ module Docker_Rsync
       @config_syncs.each do |name, config|
         @config_syncs[name]['config_path'] = @config_path
         # expand the sync source to remove ~ and similar expressions in the path
-        @config_syncs[name]['src'] = File.expand_path(@config_syncs[name]['src'])
+        @config_syncs[name]['src'] = File.expand_path(@config_syncs[name]['src'], File.dirname(@config_path))
 
         # set the global verbose setting, if the sync-endpoint does not define a own one
         unless config.key?('verbose')
@@ -150,5 +150,17 @@ module Docker_Rsync
         end
       }
     end
+
+    def watch_stop
+      @sync_processes.each { |sync_process|
+        sync_process.watch_thread.kill unless sync_process.watch_thread.nil?
+      }
+    end
+
+    def watch_start
+      @sync_processes.each { |sync_process|
+        sync_process.watch
+      }
+    end
   end
 end

data/lib/docker-sync/sync_process.rb

@@ -2,6 +2,7 @@ require 'thor/shell'
 # noinspection RubyResolve
 require 'docker-sync/sync_strategy/rsync'
 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'
@@ -36,6 +37,8 @@ module Docker_Sync
             @sync_strategy = Docker_Sync::SyncStrategy::Rsync.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
@@ -49,9 +52,7 @@ module Docker_Sync
         case @options['watch_strategy']
           when 'fswatch'
             @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
-          when 'disable'
-            @watch_strategy = Docker_Sync::WatchStrategy::Dummy.new(@sync_name, @options)
-          when 'dummy'
+          when 'disable','dummy'
             @watch_strategy = Docker_Sync::WatchStrategy::Dummy.new(@sync_name, @options)
           else
             @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)

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

@@ -0,0 +1,199 @@
+require 'thor/shell'
+require 'docker-sync/preconditions'
+require 'open3'
+require 'socket'
+
+module Docker_Sync
+  module SyncStrategy
+    class Unison_DualSide
+      include Thor::Shell
+
+      @options
+      @sync_name
+      @watch_thread
+      @local_server_pid
+      UNISON_CONTAINER_PORT = '5000'
+      def initialize(sync_name, options)
+        @sync_name = sync_name
+        @options = options
+        # if a custom image is set, apply it
+        if @options.key?('image')
+          @docker_image = @options['image']
+        else
+          @docker_image = 'eugenmayer/unison:dualside'
+        end
+        begin
+          Preconditions::unison_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
+          exit 1
+        end
+      end
+
+      def run
+        start_container
+        start_local_server
+        sync
+      end
+
+      def sync
+        args = sync_options
+        cmd = 'unison ' + args.join(' ')
+
+        say_status 'command', cmd, :white if @options['verbose']
+
+        stdout, stderr, exit_status = Open3.capture3(cmd)
+        if not exit_status.success?
+          say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
+          say_status 'message', stderr
+        else
+          say_status 'ok', "Synced #{@options['src']}", :white
+          if @options['verbose']
+            say_status 'output', stdout
+          end
+        end
+      end
+
+      def sync_options
+        args = []
+
+        unless @options['sync_excludes'].nil?
+          args = @options['sync_excludes'].map { |pattern| "-ignore='Path #{pattern}'" } + args
+        end
+        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\'')
+        end
+        return args
+      end
+
+      def start_container
+        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}`
+        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}`
+          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}"
+          else
+            say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
+            cmd = "docker start #{container_name}"
+          end
+          say_status 'command', cmd, :white if @options['verbose']
+          `#{cmd}` || raise('Start failed')
+        else
+          say_status 'ok', "#{container_name} container still running", :blue
+        end
+        say_status 'ok', "starting initial #{container_name} of src", :white if @options['verbose']
+        # this sleep is needed since the container could be not started
+        sleep 5 # TODO: replace with unison -testserver
+        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
+
+      def get_volume_name
+        return @sync_name
+      end
+
+      def stop_container
+        `docker stop #{get_container_name}`
+      end
+
+      def reset_container
+        stop_container
+        `docker rm #{get_container_name}`
+        `docker volume rm #{get_volume_name}`
+      end
+
+      def clean
+        reset_container
+      end
+
+      def stop
+        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
+        end
+      end
+    end
+  end
+end

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

@@ -63,7 +63,7 @@ module Docker_Sync
         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 verbose') if @options['verbose']
+        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')
         end

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

@@ -1,6 +1,7 @@
 require 'thor/shell'
 require 'docker-sync/execution'
 require 'docker-sync/preconditions'
+require 'pathname'
 
 module Docker_Sync
   module WatchStrategy
@@ -15,6 +16,7 @@ module Docker_Sync
       def initialize(sync_name, options)
         @sync_name = sync_name
         @options = options
+        @events_to_watch = %w(AttributeModified Created Link MovedFrom MovedTo Renamed Removed Updated)
 
         begin
           Preconditions::fswatch_available
@@ -50,17 +52,16 @@ module Docker_Sync
           args = @options['watch_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
         end
         args.push('-orIE')
+        args.push(@events_to_watch.map { |pattern| "--event #{pattern}" })
         args.push(@options['watch_args']) if @options.key?('watch_args')
         args.push(@options['src'])
 
         sync_command = 'thor sync:sync'
-        begin
-          Preconditions::docker_sync_available
+        exec_name =File.basename($PROGRAM_NAME)
+        if exec_name != 'thor'
           sync_command = 'docker-sync sync'
-        rescue Exception => e
-          say_status 'warning', 'docker-sync not available, assuming dev mode, using thor', :yellow
-          puts e.message
-          sync_command = 'thor sync:sync'
+        else
+          say_status 'warning', 'Called user thor, not docker-sync* wise, assuming dev mode, using thor', :yellow
         end
         args.push(" | xargs -I -n1 #{sync_command} -n #{@sync_name} --config='#{@options['config_path']}'")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,6 +84,7 @@ 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.rb
 - lib/docker-sync/update_check.rb
 - lib/docker-sync/watch_strategy/dummy.rb