dpl-s3 1.10.3.travis.3002.6 → 1.10.3.travis.3014.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dpl/provider/s3.rb +15 -4
  3. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 28f8755ba4b58b2d4a2e86542bf8826f007abf348c675d98fb5e363b56112de5
4
- data.tar.gz: be59792fd4cd710ad0e04708464d32e17483c69a7a1482aa7660fdb7a9545429
3
+ metadata.gz: 1404989c4fbbf771daa5e49a4781cdd6122751bb97c7263a908eeb5bcd7a306c
4
+ data.tar.gz: 3614d80c6e22f781607d812e16f981cd5f857c05e7b2fd20b769b00aff27d062
5
5
  SHA512:
6
- metadata.gz: 3ed6c8e29e384bed7f847db1fd80d10f78d709fe586bd14a16770a44941b76baa8d16fa75637ac89de0aee6a0acdfee46cbf75e333c88d42f56fc6cb58c6df22
7
- data.tar.gz: 5fb3529fa76f006591315cbbb0cd6cbc5a990856fffceabc6513a6cb5be78c492feaccc240d2fe4d799b81d780eb1dd589240e24ff45cb74b6e7f97516093fe3
6
+ metadata.gz: 47ea142f3b95fea1c0281934f9ddf3223065666cfe8872c3d148ffa47c1a6ddddb29eefa2f8deab0ade30db7b95072bea544d613633c448a38da9a894d281198
7
+ data.tar.gz: 66b12853ce057f350f194f7576483ce2f3abef112f9065a77bfe2de762f45934d77a5a2ae73d98df911c1aa1c3efd49ae706bac128fa3278f693d67adc2423c7
@@ -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
- upload_multithreaded(files)
75
+ result = upload_multithreaded(files)
76
76
 
77
77
  if suffix = options[:index_document_suffix]
78
78
  api.bucket(option(:bucket)).website.put(
@@ -85,6 +85,7 @@ module DPL
85
85
  end
86
86
 
87
87
  Dir.chdir(old_pwd)
88
+ result
88
89
  end
89
90
 
90
91
  def upload_multithreaded(files)
@@ -92,6 +93,7 @@ module DPL
92
93
  mutex = Mutex.new
93
94
  threads = []
94
95
  log "Beginning upload of #{files.length} files with #{max_threads} threads."
96
+ failures = []
95
97
 
96
98
  max_threads.times do |i|
97
99
  threads[i] = Thread.new {
@@ -110,14 +112,19 @@ module DPL
110
112
  opts[:storage_class] = options[:storage_class] if options[:storage_class]
111
113
  opts[:server_side_encryption] = "AES256" if options[:server_side_encryption]
112
114
  unless File.directory?(filename)
113
- log "uploading #{filename.inspect} with #{opts.inspect}"
115
+ log "uploading #{filename.inspect} with #{opts.inspect}" unless quiet?
114
116
  result = api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
115
- warn "error while uploading #{filename.inspect}" unless result
117
+ unless result
118
+ warn "error while uploading #{filename.inspect}"
119
+ failures << filename
120
+ end
116
121
  end
117
122
  end
118
123
  }
119
124
  end
120
125
  threads.each { |t| t.join }
126
+
127
+ failures.empty?
121
128
  end
122
129
 
123
130
  def deploy
@@ -167,6 +174,10 @@ module DPL
167
174
  preferred_value = option_values.select {|value| value.kind_of?(String) }.last if preferred_value.nil?
168
175
  return preferred_value
169
176
  end
177
+
178
+ def quiet?
179
+ options[:quiet]
180
+ end
170
181
  end
171
182
  end
172
183
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dpl-s3
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.3.travis.3002.6
4
+ version: 1.10.3.travis.3014.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Haase
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-09-25 00:00:00.000000000 Z
11
+ date: 2018-10-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dpl
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 1.10.3.travis.3002.6
19
+ version: 1.10.3.travis.3014.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.3002.6
26
+ version: 1.10.3.travis.3014.6
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: aws-sdk
29
29
  requirement: !ruby/object:Gem::Requirement