docker-sync 1.0.2 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 99de3e53b469050cd1cf2afd597aa4fabcc23338e4d6d5cd67ebb833fa1ff184
4
- data.tar.gz: 4aadccbadd4ebeade4b3b5d214a900a411198c74aff3e813f71c9a6c4f297aaa
3
+ metadata.gz: b8371762410da11cfc2409b78d7e3bc302958a8a15bc027386f2878178166b3b
4
+ data.tar.gz: 4f5a9b2c252d75ac44457b73394a71abf557cef2cb53c991213dd2e491819068
5
5
  SHA512:
6
- metadata.gz: df858a48916d036de531a04ad6707cb71e5212f9883c0df2f6ad8d326ecf349b64c4f4d859794ccc2afc35d2fd9fba31c17afaeebcb395df2cf1c91b548d617b
7
- data.tar.gz: 311975e4eacca8e19f2d5a3dc1f707850b5719e5ddb02d6f5250b777a5f738214534d691f54338d171f8e4a84d3d025e81a4a39b276758bdc2fc20c39caf4591
6
+ metadata.gz: 13174ba9c74a5488e560d532a4124c2b96bef98d430605181b488e3aec58e9229826e28e7710d75a835390d963b9043c63c7ad029e96605202d5ed26c16ef61b
7
+ data.tar.gz: 92ff8b52d5a64ad582191a944f177ed030e21a1a70270733200945d51253767d7b47d4b361b471abe481b14087e090589d42f4e5facab6118974f868dd8a1e10
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.2
1
+ 1.0.4
@@ -176,14 +176,23 @@ module DockerSync
176
176
 
177
177
  def expand_ignore_strings
178
178
  expanded_ignore_strings = []
179
+ default_expanded_ignore_strings = []
179
180
 
180
181
  exclude_type = 'Name'
181
182
  unless @options['sync_excludes_type'].nil?
182
183
  exclude_type = @options['sync_excludes_type']
183
184
  end
184
185
 
186
+ # use the 'Name' exclude type for all default ignores
187
+ # to prevent conflicts with the sync_excludes_type settings
188
+ unless Environment.default_ignores.nil?
189
+ default_expanded_ignore_strings = Environment.default_ignores.map do |pattern|
190
+ "-ignore='Name #{pattern}'"
191
+ end
192
+ end
193
+
185
194
  unless @options['sync_excludes'].nil?
186
- expanded_ignore_strings = @options['sync_excludes'].append(Environment.default_ignores).flatten!.map do |pattern|
195
+ expanded_ignore_strings = @options['sync_excludes'].map do |pattern|
187
196
  if exclude_type == 'none'
188
197
  # the ignore type like Name / Path are part of the pattern
189
198
  ignore_string = "#{pattern}"
@@ -193,7 +202,7 @@ module DockerSync
193
202
  "-ignore='#{ignore_string}'"
194
203
  end
195
204
  end
196
- expanded_ignore_strings
205
+ expanded_ignore_strings.append(default_expanded_ignore_strings).flatten!
197
206
  end
198
207
  end
199
208
  end
@@ -63,7 +63,8 @@ module DockerSync
63
63
  args = []
64
64
 
65
65
  unless @options['sync_excludes'].nil?
66
- args = excludes_list.append(Environment.default_ignores).flatten!.map { |pattern| "--exclude='#{pattern}'" } + args
66
+ excludes_list = @options['sync_excludes'].append(Environment.default_ignores).flatten
67
+ args = excludes_list.map { |pattern| "--exclude='#{pattern}'" }
67
68
  end
68
69
  args.push('-ap')
69
70
  args.push(@options['sync_args']) if @options.key?('sync_args')
@@ -97,6 +97,7 @@ module DockerSync
97
97
 
98
98
  def expand_ignore_strings
99
99
  expanded_ignore_strings = []
100
+ default_expanded_ignore_strings = []
100
101
 
101
102
  exclude_type = 'Name'
102
103
  exclude_type = @options['sync_excludes_type'] unless @options['sync_excludes_type'].nil?
@@ -104,7 +105,7 @@ module DockerSync
104
105
  # use the 'Name' exclude type for all default ignores
105
106
  # to prevent conflicts with the sync_excludes_type settings
106
107
  unless Environment.default_ignores.nil?
107
- expanded_ignore_strings = Environment.default_ignores.map do |pattern|
108
+ default_expanded_ignore_strings = Environment.default_ignores.map do |pattern|
108
109
  "-ignore='Name #{pattern}'"
109
110
  end
110
111
  end
@@ -120,7 +121,7 @@ module DockerSync
120
121
  "-ignore='#{ignore_string}'"
121
122
  end
122
123
  end
123
- expanded_ignore_strings
124
+ expanded_ignore_strings.append(default_expanded_ignore_strings).flatten!
124
125
  end
125
126
 
126
127
  def sync_options
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker-sync
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.2
4
+ version: 1.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eugen Mayer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-13 00:00:00.000000000 Z
11
+ date: 2022-09-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor