docker-sync 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440a1277f902234557ce07713930f28cf69e95fa6ff77ee095128fe407b2a6da
-  data.tar.gz: 65643b530ee3cfa703fa03140d07545a459f0e6414ccc4ef1fbb4bcc9485bb79
+  metadata.gz: 99de3e53b469050cd1cf2afd597aa4fabcc23338e4d6d5cd67ebb833fa1ff184
+  data.tar.gz: 4aadccbadd4ebeade4b3b5d214a900a411198c74aff3e813f71c9a6c4f297aaa
 SHA512:
-  metadata.gz: 1bd8e762ee2d4eaff553501371169439c5fb511670a4a6937110d16965c9da0bfdac7ec0298a8b2dc2f8548333fd120c1174986320ce314dcfcd86ffc03b3329
-  data.tar.gz: f8528c8f0747cafb57ae66f638e78128ee561adeb77b7c9d3f8cf439fb0324f5637cca4dd48d6916952bc27baa35e6fcf9e14a7da7ac888211d3670dd31cf1c0
+  metadata.gz: df858a48916d036de531a04ad6707cb71e5212f9883c0df2f6ad8d326ecf349b64c4f4d859794ccc2afc35d2fd9fba31c17afaeebcb395df2cf1c91b548d617b
+  data.tar.gz: 311975e4eacca8e19f2d5a3dc1f707850b5719e5ddb02d6f5250b777a5f738214534d691f54338d171f8e4a84d3d025e81a4a39b276758bdc2fc20c39caf4591

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

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

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

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

@@ -101,8 +101,16 @@ module DockerSync
         exclude_type = 'Name'
         exclude_type = @options['sync_excludes_type'] unless @options['sync_excludes_type'].nil?
 
+        # 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|
+            "-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|
             ignore_string = if exclude_type == 'none'
                               # the ignore type like Name / Path are part of the pattern
                               pattern.to_s

metadata

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