docker-sync 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99de3e53b469050cd1cf2afd597aa4fabcc23338e4d6d5cd67ebb833fa1ff184
-  data.tar.gz: 4aadccbadd4ebeade4b3b5d214a900a411198c74aff3e813f71c9a6c4f297aaa
+  metadata.gz: b8371762410da11cfc2409b78d7e3bc302958a8a15bc027386f2878178166b3b
+  data.tar.gz: 4f5a9b2c252d75ac44457b73394a71abf557cef2cb53c991213dd2e491819068
 SHA512:
-  metadata.gz: df858a48916d036de531a04ad6707cb71e5212f9883c0df2f6ad8d326ecf349b64c4f4d859794ccc2afc35d2fd9fba31c17afaeebcb395df2cf1c91b548d617b
-  data.tar.gz: 311975e4eacca8e19f2d5a3dc1f707850b5719e5ddb02d6f5250b777a5f738214534d691f54338d171f8e4a84d3d025e81a4a39b276758bdc2fc20c39caf4591
+  metadata.gz: 13174ba9c74a5488e560d532a4124c2b96bef98d430605181b488e3aec58e9229826e28e7710d75a835390d963b9043c63c7ad029e96605202d5ed26c16ef61b
+  data.tar.gz: 92ff8b52d5a64ad582191a944f177ed030e21a1a70270733200945d51253767d7b47d4b361b471abe481b14087e090589d42f4e5facab6118974f868dd8a1e10

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

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

@@ -176,14 +176,23 @@ module DockerSync
 
       def expand_ignore_strings
         expanded_ignore_strings = []
+        default_expanded_ignore_strings = []
 
         exclude_type = 'Name'
         unless @options['sync_excludes_type'].nil?
           exclude_type = @options['sync_excludes_type']
         end
 
+        # use the 'Name' exclude type for all default ignores
+        # to prevent conflicts with the sync_excludes_type settings
+        unless Environment.default_ignores.nil?
+          default_expanded_ignore_strings = Environment.default_ignores.map do |pattern|
+            "-ignore='Name #{pattern}'"
+          end
+        end
+        
         unless @options['sync_excludes'].nil?
-          expanded_ignore_strings = @options['sync_excludes'].append(Environment.default_ignores).flatten!.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}"
@@ -193,7 +202,7 @@ module DockerSync
             "-ignore='#{ignore_string}'"
           end
         end
-        expanded_ignore_strings
+        expanded_ignore_strings.append(default_expanded_ignore_strings).flatten!
       end
     end
   end

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

@@ -63,7 +63,8 @@ module DockerSync
         args = []
 
         unless @options['sync_excludes'].nil?
-          args = excludes_list.append(Environment.default_ignores).flatten!.map { |pattern| "--exclude='#{pattern}'" } + args
+          excludes_list = @options['sync_excludes'].append(Environment.default_ignores).flatten
+          args = excludes_list.map { |pattern| "--exclude='#{pattern}'" }
         end
         args.push('-ap')
         args.push(@options['sync_args']) if @options.key?('sync_args')

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

@@ -97,6 +97,7 @@ module DockerSync
 
       def expand_ignore_strings
         expanded_ignore_strings = []
+        default_expanded_ignore_strings = []
 
         exclude_type = 'Name'
         exclude_type = @options['sync_excludes_type'] unless @options['sync_excludes_type'].nil?
@@ -104,7 +105,7 @@ module DockerSync
         # use the 'Name' exclude type for all default ignores
         # to prevent conflicts with the sync_excludes_type settings
         unless Environment.default_ignores.nil?
-          expanded_ignore_strings = Environment.default_ignores.map do |pattern|
+          default_expanded_ignore_strings = Environment.default_ignores.map do |pattern|
             "-ignore='Name #{pattern}'"
           end
         end
@@ -120,7 +121,7 @@ module DockerSync
             "-ignore='#{ignore_string}'"
           end
         end
-        expanded_ignore_strings
+        expanded_ignore_strings.append(default_expanded_ignore_strings).flatten!
       end
 
       def sync_options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor