dpl-s3 1.10.3.travis.3014.6 → 1.10.3.travis.3017.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dpl/provider/s3.rb +4 -15
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f718561315a6a9d2739e56d29531ba19014838d21d2301f30026d146f32df10c
|
4
|
+
data.tar.gz: fd4991964b78781026fc172d2ee6d4931147199136cb2d15f562b766b89e2e74
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 256b6dc2904c4c8af02456187dcc449a14e0858f62ead7ef99ff231fdfa4b293cf50e05b23194958701c17b89633cc30b0990d6a4079517b30937feff3677ec0
|
7
|
+
data.tar.gz: 2d57533d13ff63684c2ca24b9c1176a0230c2152c21b8bdea8f8fcd203927370215479198a3ff34ddee76e63054437aaeb76a9b55d2d46405f83ed0e8746d3e9
|
data/lib/dpl/provider/s3.rb
CHANGED
@@ -26,7 +26,7 @@ module DPL
|
|
26
26
|
|
27
27
|
def check_app
|
28
28
|
end
|
29
|
-
|
29
|
+
|
30
30
|
def needs_key?
|
31
31
|
false
|
32
32
|
end
|
@@ -72,7 +72,7 @@ module DPL
|
|
72
72
|
glob_args = ["**/*"]
|
73
73
|
glob_args << File::FNM_DOTMATCH if options[:dot_match]
|
74
74
|
files = Dir.glob(*glob_args).reject {|f| File.directory?(f)}
|
75
|
-
|
75
|
+
upload_multithreaded(files)
|
76
76
|
|
77
77
|
if suffix = options[:index_document_suffix]
|
78
78
|
api.bucket(option(:bucket)).website.put(
|
@@ -85,7 +85,6 @@ module DPL
|
|
85
85
|
end
|
86
86
|
|
87
87
|
Dir.chdir(old_pwd)
|
88
|
-
result
|
89
88
|
end
|
90
89
|
|
91
90
|
def upload_multithreaded(files)
|
@@ -93,7 +92,6 @@ module DPL
|
|
93
92
|
mutex = Mutex.new
|
94
93
|
threads = []
|
95
94
|
log "Beginning upload of #{files.length} files with #{max_threads} threads."
|
96
|
-
failures = []
|
97
95
|
|
98
96
|
max_threads.times do |i|
|
99
97
|
threads[i] = Thread.new {
|
@@ -112,19 +110,14 @@ module DPL
|
|
112
110
|
opts[:storage_class] = options[:storage_class] if options[:storage_class]
|
113
111
|
opts[:server_side_encryption] = "AES256" if options[:server_side_encryption]
|
114
112
|
unless File.directory?(filename)
|
115
|
-
log "uploading #{filename.inspect} with #{opts.inspect}"
|
113
|
+
log "uploading #{filename.inspect} with #{opts.inspect}"
|
116
114
|
result = api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
|
117
|
-
unless result
|
118
|
-
warn "error while uploading #{filename.inspect}"
|
119
|
-
failures << filename
|
120
|
-
end
|
115
|
+
warn "error while uploading #{filename.inspect}" unless result
|
121
116
|
end
|
122
117
|
end
|
123
118
|
}
|
124
119
|
end
|
125
120
|
threads.each { |t| t.join }
|
126
|
-
|
127
|
-
failures.empty?
|
128
121
|
end
|
129
122
|
|
130
123
|
def deploy
|
@@ -174,10 +167,6 @@ module DPL
|
|
174
167
|
preferred_value = option_values.select {|value| value.kind_of?(String) }.last if preferred_value.nil?
|
175
168
|
return preferred_value
|
176
169
|
end
|
177
|
-
|
178
|
-
def quiet?
|
179
|
-
options[:quiet]
|
180
|
-
end
|
181
170
|
end
|
182
171
|
end
|
183
172
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dpl-s3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.10.3.travis.
|
4
|
+
version: 1.10.3.travis.3017.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Konstantin Haase
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.10.3.travis.
|
19
|
+
version: 1.10.3.travis.3017.6
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.10.3.travis.
|
26
|
+
version: 1.10.3.travis.3017.6
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: aws-sdk
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|