docker-sync 0.4.2 → 0.4.3.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc6a6d17b0c061b6f089c82f25fccdee21b477f
-  data.tar.gz: 52d4daa5b8b9aab3e6bb9fd218dd7d324ff55a94
+  metadata.gz: 4f78caf8b3bc7851078c085475d5fe1e58d1db1b
+  data.tar.gz: 133d39b0788b5b97621c975fc75a52b86220a12e
 SHA512:
-  metadata.gz: 9b1c17a21b47ef1bc4445ad5cfe705e78c64ada480e9f677c0adf1485fe184415b27e94a467b9520da759513baf0fa26f6e23ae03305166ea67e4934ab6b66b1
-  data.tar.gz: d1eed5aba038bcfb69f49f49ad09782bdf0b54e435cc539455950fd4860c539e8b194f7dd7a41c0152fa640206a50fcce4a00c7c5867ffcd6d5ab6f4bbb0b2f0
+  metadata.gz: bed20da2fc7277bd372206f171c8548696d7c6ee2d7ab7dc427e6def8b2fe4ff91de1bc759c439beae1dbd93fde3cccf98dd33909943dc93f1668f6b0df869bf
+  data.tar.gz: ba30747b246f8f6f2f3c9fa5ed6efe9b0466cb180890d67e2a19f9e6051a20a4c229d027b5b3ca3bdfd51dc93dac8c373bd598545e5cb91f86a97c34124fdd50

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3-beta1

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

@@ -45,6 +45,7 @@ module Docker_Sync
 
         ignore_strings = expand_ignore_strings
         env['UNISON_EXCLUDES'] = ignore_strings.join(' ')
+        env['UNISON_ARGS'] = @options['sync_args']
         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'
@@ -106,6 +107,10 @@ module Docker_Sync
         end
       end
 
+      def get_container_name
+        @sync_name.to_s
+      end
+
       private
 
       def reset_container
@@ -115,10 +120,6 @@ module Docker_Sync
       end
 
 
-      def get_container_name
-        return "#{@sync_name}"
-      end
-
       def get_volume_name
         return @sync_name
       end
@@ -137,6 +138,8 @@ module Docker_Sync
             '-prefer /host_sync'
           when 'dest' then
             '-prefer /app_sync'
+          when 'newer' then
+            '-prefer newer'
           else
             raise 'sync_pref can only be: src or dest, no path - path is no longer needed it abstracted'
         end

data/lib/docker-sync/upgrade_check.rb

@@ -99,13 +99,18 @@ class UpgradeChecker
       checker = UpdateChecker.new
       checker.check_unison_hostsync_image
 
-      Thor::Shell::Basic.new.say_status 'warning', "The native_osx is NOW ONLY for docker-for-mac, this is due to https://github.com/EugenMayer/docker-sync/issues/346\n\nThat means, that unison is picked as a default automatically, if you use docker-machine", :red
+      Thor::Shell::Basic.new.say_status 'warning', "The native_osx is NOW ONLY for docker-for-mac, this is due to https://github.com/EugenMayer/docker-sync/issues/346\n\nThat means that unison is picked as a default automatically if you use docker-machine", :red
 
-      unless Thor::Shell::Basic.new.yes?('Just wanted you to no that! (y/N)')
+      unless Thor::Shell::Basic.new.yes?('Just wanted you to know that! (y/N)')
         exit 1
       end
     end
 
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.3')
+      checker = UpdateChecker.new
+      checker.check_unison_hostsync_image
+    end
+
     # update the upgrade_status
     @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"
   end

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

@@ -17,7 +17,7 @@ module Docker_Sync
         @sync_name = sync_name
         @watch_fork = nil
         @watch_thread = nil
-        @unison = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
+        @unison = Docker_Sync::SyncStrategy::NativeOsx.new(@sync_name, @options)
       end
 
       def run

data/tasks/sync/sync.thor

@@ -39,7 +39,7 @@ class Sync < Thor
     start_dir = Dir.pwd # Set start_dir variable to be equal to pre-daemonized folder, since daemonizing will change dir to '/'
 
     if  options['daemon']
-      puts 'WARNING: --daemon is deprecated and now the default. Just start without --daemom'
+      puts 'WARNING: --daemon is deprecated and now the default. Just start without --daemon'
     end
 
     if options['foreground']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3.pre.beta1
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -193,9 +193,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1