docker-sync 0.4.0.pre.beta1 → 0.4.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee30fd93932dfd458f8d77e2e4109e0f61a16269
-  data.tar.gz: 107807dec19acbc71e6807f861db99e67d52a2bc
+  metadata.gz: c66c65a38606565e60bf76aa80b33934690b6851
+  data.tar.gz: ee1aa4c4a84dfbb9eb9dfdbaa5fc31d3a27cef46
 SHA512:
-  metadata.gz: 651b6deb48778e5c9dceae3ecae2a1668b16dc820e4e63b8ad6f818b2a7d4fcc13abf117e82575c38358eb63bd06412c742ab608f3f0eba5ab3e143170a2c6f3
-  data.tar.gz: 819d3d464a51f88237d140a785a56f4e3cb4ed7745edab0ce32bd0c87eadecf9f20c14391b474cc099356b13d1ce21891fe93b6125d6cde08a392057b0899c2f
+  metadata.gz: 250dc5898a0f2e92ad7208bec4ff1c92b1a3177daf1873c8768ec634e6e4e3f1b68c2a3f8aa5e1fb8c9c9e3ca49952dcd360a41b25b1102060672727cfa52fd3
+  data.tar.gz: c59ef8da87e69dd577bb9f647de17ed9db331e6b4a6aae73210c7c1cecd05053145c89222fa8f96332d72afb794fab8e33624b203182ee22a0487e809da8b436

data/VERSION

@@ -1 +1 @@
-0.4.0-beta1
+0.4.0-beta2

data/lib/docker-sync/config/project_config.rb

@@ -126,7 +126,7 @@ module DockerSync
         watch_strategy = sync_config['watch_strategy']
         watch_strategy = 'dummy' if watch_strategy == 'disable'
 
-        if ['fswatch', 'unison', 'dummy'].include?(watch_strategy)
+        if %w(fswatch unison dummy).include?(watch_strategy)
           watch_strategy
         else
           default_watch_strategy(sync_config)
@@ -136,7 +136,7 @@ module DockerSync
       def default_sync_strategy
         case true
         when OS.linux? then 'native'
-        else 'unison'
+        else 'native_osx'
         end
       end
 

data/lib/docker-sync/sync_manager.rb

@@ -130,6 +130,7 @@ module Docker_sync
     end
 
     def stop
+      init_sync_processes
       @sync_processes.each { |sync_process|
         sync_process.stop
         unless sync_process.watch_thread.nil?

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

@@ -35,52 +35,17 @@ module Docker_Sync
         end
       end
 
-      def run
-        start_container
-        sync
-      end
-
-      def watch
-        # nop
-      end
-
-      def sync
-        # nop
-      end
-
-      def expand_ignore_strings
-        expanded_ignore_strings = []
-
-        exclude_type = 'Name'
-        unless @options['sync_excludes_type'].nil?
-          exclude_type = @options['sync_excludes_type']
-        end
-
-        unless @options['sync_excludes'].nil?
-          expanded_ignore_strings = @options['sync_excludes'].map do |pattern|
-            if exclude_type == 'none'
-              # the ignore type like Name / Path are part of the pattern
-              ignore_string = "#{pattern}"
-            else
-              ignore_string = "#{exclude_type} #{pattern}"
-            end
-            "-ignore='#{ignore_string}'"
-          end
-        end
-        expanded_ignore_strings
-      end
-
       def start_container
-        say_status 'ok', 'Starting unison', :white
+        say_status 'ok', 'Starting native_osx', :white
         container_name = get_container_name
-        #create_volume
         host_sync_src = @options['src']
         volume_app_sync_name = @sync_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')
+        raise '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_SYNC_PREFER'] = sync_prefer
         env['MAX_INOTIFY_WATCHES'] = @options['max_inotify_watches'] if @options.key?('max_inotify_watches')
         if @options['sync_userid'] == 'from_host'
           env['OWNER_UID'] = Process.uid
@@ -95,6 +60,7 @@ module Docker_Sync
           exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" --format "{{.Names}}" | grep '^#{container_name}$'`
           if exists == ''
             say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
+            run_privileged = ''
             run_privileged = '--privileged' if @options.key?('max_inotify_watches') #TODO: replace by the minimum capabilities required
             cmd = "docker run -v #{volume_app_sync_name}:/app_sync -v #{host_sync_src}:/host_sync -e VOLUME=#{@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
@@ -109,26 +75,22 @@ module Docker_Sync
         `#{cmd}` || raise('Start failed')
         say_status 'ok', "starting initial sync of #{container_name}", :white if @options['verbose']
         # wait until container is started, then sync:
-        say_status 'success', 'Unison container started', :green
+        say_status 'success', 'Sync container started', :green
       end
 
-      def get_container_name
-        return "#{@sync_name}"
+      def run
+        start_container
+        sync
       end
 
-      def get_volume_name
-        return @sync_name
+      def watch
+        # nop
       end
 
-      def stop_container
-        `docker ps | grep #{get_container_name} && docker stop #{get_container_name} && docker wait #{get_container_name}`
+      def sync
+        # nop
       end
 
-      def reset_container
-        stop_container
-        `docker ps -a | grep #{get_container_name} && docker rm #{get_container_name}`
-        `docker volume ls -q | grep #{get_volume_name} && docker volume rm #{get_volume_name}`
-      end
 
       def clean
         reset_container
@@ -143,6 +105,64 @@ module Docker_Sync
           puts e.message
         end
       end
+
+      private
+
+      def reset_container
+        stop_container
+        `docker ps -a | grep #{get_container_name} && docker rm #{get_container_name}`
+        `docker volume ls -q | grep #{get_volume_name} && docker volume rm #{get_volume_name}`
+      end
+
+
+      def get_container_name
+        return "#{@sync_name}"
+      end
+
+      def get_volume_name
+        return @sync_name
+      end
+
+      def stop_container
+        `docker ps | grep #{get_container_name} && docker stop #{get_container_name} && docker wait #{get_container_name}`
+      end
+
+
+      # cares about conflict resolution
+      def sync_prefer
+        case @options.fetch('sync_prefer', 'default')
+          when 'default' then
+            '-prefer /host_sync' # thats our default, if nothing is set
+          when 'src' then
+            '-prefer /host_sync'
+          when 'dest' then
+            '-prefer /app_sync'
+          else
+            raise 'sync_pref can only be: src or dest, no path - path is no longer needed it abstracted'
+        end
+      end
+
+      def expand_ignore_strings
+        expanded_ignore_strings = []
+
+        exclude_type = 'Name'
+        unless @options['sync_excludes_type'].nil?
+          exclude_type = @options['sync_excludes_type']
+        end
+
+        unless @options['sync_excludes'].nil?
+          expanded_ignore_strings = @options['sync_excludes'].map do |pattern|
+            if exclude_type == 'none'
+              # the ignore type like Name / Path are part of the pattern
+              ignore_string = "#{pattern}"
+            else
+              ignore_string = "#{exclude_type} #{pattern}"
+            end
+            "-ignore='#{ignore_string}'"
+          end
+        end
+        expanded_ignore_strings
+      end
     end
   end
 end

data/tasks/sync/sync.thor

@@ -23,6 +23,7 @@ class Sync < Thor
 
   desc 'start', 'Start all sync configurations in this project'
   method_option :daemon, :aliases => '-d', :default => false, :type => :boolean, :desc => 'Run in the background'
+  method_option :foreground, :aliases => '-d', :default => false, :type => :boolean, :desc => 'Run in the background'
   method_option :app_name, :aliases => '--name', :default => 'daemon', :type => :string, :desc => 'App name used in PID and OUTPUT file name for Daemon'
   method_option :dir, :aliases => '--dir', :default => './.docker-sync', :type => :string, :desc => 'Path to PID and OUTPUT file Directory'
   method_option :logd, :aliases => '--logd', :default => true, :type => :boolean, :desc => 'To log OUPUT to file on Daemon or not'
@@ -36,10 +37,15 @@ class Sync < Thor
     @sync_manager = Docker_sync::SyncManager.new(config: config)
 
     start_dir = Dir.pwd # Set start_dir variable to be equal to pre-daemonized folder, since daemonizing will change dir to '/'
-    if options['daemon']
-      daemonize
+
+    if  options['daemon']
+      puts 'WARNING: --daemon is deprecated and now the default. Just start without --daemom'
+    end
+
+    if options['foreground']
+      say_status 'note:', 'Starting in foreground mode', :white
     else
-      say_status 'note:', 'You can also run docker-sync in the background with --daemon', :white
+      daemonize
     end
 
     Dir.chdir(start_dir) do # We want run these in pre-daemonized folder/directory since provided config_path might not be full_path
@@ -56,16 +62,22 @@ class Sync < Thor
 
     config = config_preconditions
     sync_manager = Docker_sync::SyncManager.new(config: config)
-
-    begin
-      pid = File.read("#{options['dir']}/#{options['app_name']}.pid") # Read PID from PIDFILE created by Daemons
-      Process.kill(:INT, -(Process.getpgid(pid.to_i))) # Send INT signal to group PID, which means INT will be sent to all sub-processes and Threads spawned by docker-sync
-      wait_for_process_termination(pid.to_i)
-    rescue Errno::ESRCH, Errno::ENOENT => e
-      say_status 'error', e.message, :red # Rescue incase PIDFILE does not exist or there is no process with such PID
-      say_status 'error', 'Check if your PIDFILE and process with such PID exists', :red
-      exit(69) # EX_UNAVAILABLE (see `man sysexits` or `/usr/include/sysexits.h`)
+    sync_manager.stop
+    pid_file_path="#{options['dir']}/#{options['app_name']}.pid"
+    if File.exist?(pid_file_path)
+      begin
+        pid = File.read("#{options['dir']}/#{options['app_name']}.pid") # Read PID from PIDFILE created by Daemons
+        Process.kill(:INT, -(Process.getpgid(pid.to_i))) # Send INT signal to group PID, which means INT will be sent to all sub-processes and Threads spawned by docker-sync
+        wait_for_process_termination(pid.to_i)
+      rescue Errno::ESRCH, Errno::ENOENT => e
+        say_status 'error', e.message, :red # Rescue incase PIDFILE does not exist or there is no process with such PID
+        say_status 'error', 'Check if your PIDFILE and process with such PID exists', :red
+        exit(69) # EX_UNAVAILABLE (see `man sysexits` or `/usr/include/sysexits.h`)
+      end
+    else
+      # there was no watcher started / needed, e.g. dummy. Nothing to worry about
     end
+
   end
 
   desc 'sync', 'just sync - do not start a watcher though'
@@ -90,7 +102,7 @@ class Sync < Thor
     files.each do |pid_file|
       pid = File.read(pid_file).to_i
       Process.kill(:INT, -(Process.getpgid(pid))) if Daemons::Pid.running?(pid)
-      say_status 'shutdown', 'Background dsync has been stopped'
+      say_status 'shutdown', 'Background sync has been stopped'
     end
     # Remove the .docker-sync directory
     FileUtils.rm_r dir if File.directory?(dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.beta1
+  version: 0.4.0.pre.beta2
 platform: ruby
 authors:
 - Eugen Mayer