docker-sync 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eed0747e91c906265ba2db4aa7d107e57ff7e7b4
-  data.tar.gz: 2bb897e106bfe71558e5c62839e8204a589eb511
+  metadata.gz: fb070a930f4ed696ff77d215964bc8b072befa4e
+  data.tar.gz: b28aa8a79ce842c345616df3a7c036a106c6a9a1
 SHA512:
-  metadata.gz: bfe66d93fa26cfd9fdb29bf370c040fcde6b9e51e45e21b37a043099bacedf6b014a4a9ef6f9d70a904da7481c22bfdcffb563a465d3f5e80deebc8967de5ecc
-  data.tar.gz: 877492b5050771c86594ca1ad5c0cc99fc64a1424726b3360ad083f59b0409de4f83d5df4d661e23c9caf65392d4f58040ca4f5768ef9b75ab543bb2bd12069d
+  metadata.gz: 8fea6207b55d99adf4f400ea6feff7ddd3a261487bbf9e656c03026d8cb34c011883c57f24045de8358248071e9407d9d31485d6e0a1cd72e02f808c7e3fea7a
+  data.tar.gz: 7905e062de45685bc43bb98863aba020c37fe80bbd8d04b02cd8ebc9047ee679ab6d9d9c4dc16c5c0b3f57ffdca482892de74e168d2bfdf641efefe376db5be2

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/docker-sync/dependencies/docker_driver.rb

@@ -5,7 +5,7 @@ module DockerSync
         def self.docker_for_mac?
           return false unless Environment.mac?
           return @docker_for_mac if defined? @docker_for_mac
-          @docker_for_mac = system('ps x | grep MacOS | grep -q com.docker.osx.hyperkit.linux')
+          @docker_for_mac = system('pgrep -q com.docker.hyperkit')
         end
 
         def self.docker_toolbox?

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

@@ -23,7 +23,7 @@ module DockerSync
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison:hostsync_0.2'
+          @docker_image = 'eugenmayer/unison:hostsync_0.3'
         end
 
         # TODO: remove this when we have a more stable image, but for now, we need this
@@ -65,6 +65,16 @@ module DockerSync
           env['OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
         end
 
+        monit_options = {
+          monit_enable: 'MONIT_ENABLE',
+          monit_interval: 'MONIT_INTERVAL',
+          monit_high_cpu_cycles: 'MONIT_HIGH_CPU_CYCLES',
+        }
+
+        monit_options.each do |key, env_key|
+          env[env_key] = @options[key.to_s] if @options.key?(key.to_s)
+        end
+
         host_disk_mount_mode = '' # see https://github.com/moby/moby/pull/31047
         host_disk_mount_mode = ":#{@options['host_disk_mount_mode']}" if @options.key?('host_disk_mount_mode')
 

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

@@ -135,7 +135,7 @@ module DockerSync
       def get_docker_env
         env_mapping = []
         env_mapping << "-e VOLUME=#{@options['dest']}"
-        env_mapping << "-e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`}"
+        env_mapping << "-e TZ=$(basename $(dirname `readlink /etc/localtime`))/$(basename `readlink /etc/localtime`)"
         env_mapping << "-e ALLOW=#{@options['sync_host_allow']}" if @options['sync_host_allow']
         env_mapping.join(' ')
       end

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

@@ -22,7 +22,7 @@ module DockerSync
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison'
+          @docker_image = 'eugenmayer/unison:0.3'
         end
         begin
           Dependencies::Unison.ensure!
@@ -119,10 +119,11 @@ module DockerSync
         args.push("'#{@options['src']}'")
         args.push('-auto')
         args.push('-batch')
-        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}")
+        dest = "socket://#{@options['sync_host_ip']}:#{sync_host_port}"
+        args.push(sync_prefer(dest))
+        args.push(@options['sync_args']) if @options.key?('sync_args')
+        args.push(dest)
 
         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')
@@ -131,11 +132,11 @@ module DockerSync
       end
 
       # cares about conflict resolution
-      def sync_prefer
+      def sync_prefer dest
         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 '#{@options['dest']}'"
+          when 'dest' then "-prefer '#{dest}'"
           else "-prefer '#{@options['sync_prefer']}'"
         end
       end

data/tasks/sync/sync.thor

@@ -22,7 +22,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 :foreground, :aliases => '-f', :default => false, :type => :boolean, :desc => 'Run in the foreground'
   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'

metadata

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