docker-sync 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6a66d66071e56943968e5b3581954556b94779f
-  data.tar.gz: cf4e3cbdf71ee5f7452e9f0faaa008c19563a5ba
+  metadata.gz: 25a78699ee82484750b206b8a01c8dc9d6321a3c
+  data.tar.gz: a03a06fd88f5b1f396e5cdd51423a3608b4761c2
 SHA512:
-  metadata.gz: df1b6b6c4d4af970e1654dff1d5e72fd3dd2acae216816c912c6e444276429e787d509efa482d87d83a032b690cace656fd1939851557fffc0d2293e05863519
-  data.tar.gz: 13447169d54a094279db5afe68b15c12fe43b0f383559f0a36099764742798bf74c19cac3e3d078ee1a396d9721f885bff4e56602b4575e8d480a0226feeb299
+  metadata.gz: b83b63b54356843e661d5f29aa819d53a0fbf2661f6e51bd5513530ed5c3a01683afd8f4abac2f332d3685bebcce93cda2817feddcc9c7a019370162fa26af19
+  data.tar.gz: bfd090b4b29ce2be0b875ba66ab31764c92e9a6e70fd104d7282e40b6b4c0c806bba17cc66df4994f869127a96f8ed70afe0f73e486b69b4c83100387aa87efe

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

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

@@ -93,15 +93,16 @@ module Docker_Sync
         end
       end
 
-      def sync_options
-        args = []
+      def expand_ignore_strings
+        expanded_ignore_strings = []
+
         exclude_type = 'Path'
         unless @options['sync_excludes_type'].nil?
           exclude_type = @options['sync_excludes_type']
         end
 
         unless @options['sync_excludes'].nil?
-          args = @options['sync_excludes'].map do |pattern|
+          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}"
@@ -109,8 +110,14 @@ module Docker_Sync
               ignore_string = "#{exclude_type} #{pattern}"
             end
             "-ignore='#{ignore_string}'"
-          end + args
+          end
         end
+        expanded_ignore_strings
+      end
+
+      def sync_options
+        args = []
+        args = expand_ignore_strings + args
         args.push(@options['src'])
         args.push('-auto')
         args.push('-batch')
@@ -129,8 +136,8 @@ module Docker_Sync
         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')
+        ignore_strings = expand_ignore_strings
+        env['UNISON_EXCLUDES'] = ignore_strings.join(' ')
         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'

data/lib/docker-sync/update_check.rb

@@ -5,8 +5,11 @@ require 'docker-sync/config'
 class UpdateChecker
   include Thor::Shell
   @config
+  @newer_image_found
+
   def initialize
     @config = DockerSyncConfig::global_config
+    @newer_image_found = false
   end
 
   def run
@@ -17,9 +20,21 @@ class UpdateChecker
     unless should_run
       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
+
+    # do not check the image if its the first run - since this it will be downloaded anyway
+    unless DockerSyncConfig::is_first_run
+      check_rsync_image
+      check_unison_onesided_image
+      check_unison_image
+
+      # stop if there was an update
+      if @newer_image_found
+        say_status 'warning', 'One or more images have been updated. Please use "docker-sync clean" before you start docker-sync again', :red
+        exit 0
+      end
+
+    end
+
     check_and_warn(@config['update_enforce'])
   end
 
@@ -38,36 +53,36 @@ class UpdateChecker
     say_status 'ok','Checking if a newer rsync image is available'
 
     if system("docker pull eugenmayer/rsync | grep 'Downloaded newer image for'")
-      say_status 'warning', 'Downloaded newer image for rsync', :red
-      say_status 'warning', 'Please use "docker-sync clean" before you start docker-sync again', :red
-
-      exit 0
+      say_status 'ok', 'Downloaded newer image for rsync', :green
+      @newer_image_found = true
+    else
+      say_status 'ok', 'No newer image found - current image is up to date.'
     end
-    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
+      say_status 'ok', 'Downloaded newer image for unison', :green
+      @newer_image_found = true
+    else
+      say_status 'ok', 'No newer image found - current image is up to date.'
     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
+      say_status 'ok', 'Downloaded newer image for unison:onesided', :green
+      @newer_image_found = true
+    else
+      say_status 'ok', 'No newer image found - current image is up to date.'
     end
-    say_status 'success','Image is (now) up to date'
+
   end
 
   def get_current_version
@@ -100,4 +115,4 @@ class UpdateChecker
       end
     end
   end
-end
+end

data/tasks/stack/stack.thor

@@ -89,7 +89,7 @@ class Stack < Thor
 
     # now shutdown sync
     @sync_manager.clean(options[:sync_name])
-    say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed there volumes', :green
+    say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed their volumes', :green
   end
 end
 

data/tasks/sync/sync.thor

@@ -82,7 +82,7 @@ class Sync < Thor
     end
     @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
+    say_status 'success', 'Finished cleanup. Removed stopped, removed sync container and removed their volumes', :green
   end
 
   desc 'list', 'List all sync-points of the project configuration path'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor