Skip to content

Commit 473221f

Browse files
nebhalenebhale
committed
Dependency Updates
Signed-off-by: Ben Hale <bhale@pivotal.io>
1 parent 63b6277 commit 473221f

File tree

6 files changed

+46
-51
lines changed

6 files changed

+46
-51
lines changed

‎.rubocop.yml

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ Metrics/PerceivedComplexity:
3636
Max: 10
3737
Naming/UncommunicativeMethodParamName:
3838
Enabled: false
39-
Performance/RegexpMatch:
40-
Enabled: false
4139
RSpec/AnyInstance:
4240
Enabled: false
4341
RSpec/ExampleLength:

‎Gemfile.lock

+22-24
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,55 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.2)
4+
addressable (2.6.0)
55
public_suffix (>= 2.0.2, < 4.0)
66
ast (2.4.0)
77
crack (0.4.3)
88
safe_yaml (~> 1.0.0)
99
diff-lcs (1.3)
10-
hashdiff (0.3.8)
11-
jaro_winkler (1.5.2)
12-
parallel (1.12.1)
13-
parser (2.5.3.0)
10+
hashdiff (1.0.0)
11+
jaro_winkler (1.5.3)
12+
parallel (1.17.0)
13+
parser (2.6.3.0)
1414
ast (~> 2.4.0)
15-
powerpack (0.1.2)
16-
public_suffix (3.0.3)
15+
public_suffix (3.1.1)
1716
rainbow (3.0.0)
1817
rake (12.3.2)
1918
redcarpet (3.4.0)
2019
rspec (3.8.0)
2120
rspec-core (~> 3.8.0)
2221
rspec-expectations (~> 3.8.0)
2322
rspec-mocks (~> 3.8.0)
24-
rspec-core (3.8.0)
23+
rspec-core (3.8.2)
2524
rspec-support (~> 3.8.0)
26-
rspec-expectations (3.8.2)
25+
rspec-expectations (3.8.4)
2726
diff-lcs (>= 1.2.0, < 2.0)
2827
rspec-support (~> 3.8.0)
29-
rspec-mocks (3.8.0)
28+
rspec-mocks (3.8.1)
3029
diff-lcs (>= 1.2.0, < 2.0)
3130
rspec-support (~> 3.8.0)
32-
rspec-support (3.8.0)
33-
rubocop (0.62.0)
31+
rspec-support (3.8.2)
32+
rubocop (0.72.0)
3433
jaro_winkler (~> 1.5.1)
3534
parallel (~> 1.10)
36-
parser (>= 2.5, != 2.5.1.1)
37-
powerpack (~> 0.1)
35+
parser (>= 2.6)
3836
rainbow (>= 2.2.2, < 4.0)
3937
ruby-progressbar (~> 1.7)
40-
unicode-display_width (~> 1.4.0)
41-
rubocop-rspec (1.31.0)
38+
unicode-display_width (>= 1.4.0, < 1.7)
39+
rubocop-rspec (1.33.0)
4240
rubocop (>= 0.60.0)
43-
ruby-progressbar (1.10.0)
44-
rubyzip (1.2.2)
45-
safe_yaml (1.0.4)
41+
ruby-progressbar (1.10.1)
42+
rubyzip (1.2.3)
43+
safe_yaml (1.0.5)
4644
tee (1.0.0)
4745
terminal-table (1.8.0)
4846
unicode-display_width (~> 1.1, >= 1.1.1)
49-
unicode-display_width (1.4.1)
50-
webmock (3.5.1)
47+
unicode-display_width (1.6.0)
48+
webmock (3.6.0)
5149
addressable (>= 2.3.6)
5250
crack (>= 0.3.2)
53-
hashdiff
54-
yard (0.9.16)
51+
hashdiff (>= 0.4.0, < 2.0.0)
52+
yard (0.9.20)
5553

5654
PLATFORMS
5755
ruby
@@ -69,4 +67,4 @@ DEPENDENCIES
6967
yard
7068

7169
BUNDLED WITH
72-
2.0.1
70+
2.0.2

‎java-buildpack.iml

+14-15
Original file line numberDiff line numberDiff line change
@@ -267,33 +267,32 @@
267267
</content>
268268
<orderEntry type="jdk" jdkName="rbenv: 2.3.8" jdkType="RUBY_SDK" />
269269
<orderEntry type="sourceFolder" forTests="false" />
270-
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.5.2, rbenv: 2.3.8) [gem]" level="application" />
270+
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.6.0, rbenv: 2.3.8) [gem]" level="application" />
271271
<orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, rbenv: 2.3.8) [gem]" level="application" />
272-
<orderEntry type="library" scope="PROVIDED" name="bundler (v2.0.1, rbenv: 2.3.8) [gem]" level="application" />
272+
<orderEntry type="library" scope="PROVIDED" name="bundler (v2.0.2, rbenv: 2.3.8) [gem]" level="application" />
273273
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, rbenv: 2.3.8) [gem]" level="application" />
274274
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.3.8) [gem]" level="application" />
275-
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v0.3.8, rbenv: 2.3.8) [gem]" level="application" />
276-
<orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.2, rbenv: 2.3.8) [gem]" level="application" />
277-
<orderEntry type="library" scope="PROVIDED" name="parallel (v1.12.1, rbenv: 2.3.8) [gem]" level="application" />
278-
<orderEntry type="library" scope="PROVIDED" name="parser (v2.5.3.0, rbenv: 2.3.8) [gem]" level="application" />
279-
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.2, rbenv: 2.3.8) [gem]" level="application" />
280-
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v3.0.3, rbenv: 2.3.8) [gem]" level="application" />
275+
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v1.0.0, rbenv: 2.3.8) [gem]" level="application" />
276+
<orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.3, rbenv: 2.3.8) [gem]" level="application" />
277+
<orderEntry type="library" scope="PROVIDED" name="parallel (v1.17.0, rbenv: 2.3.8) [gem]" level="application" />
278+
<orderEntry type="library" scope="PROVIDED" name="parser (v2.6.3.0, rbenv: 2.3.8) [gem]" level="application" />
279+
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v3.1.1, rbenv: 2.3.8) [gem]" level="application" />
281280
<orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, rbenv: 2.3.8) [gem]" level="application" />
282281
<orderEntry type="library" scope="PROVIDED" name="rake (v12.3.2, rbenv: 2.3.8) [gem]" level="application" />
283282
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.4.0, rbenv: 2.3.8) [gem]" level="application" />
284283
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.8.0, rbenv: 2.3.8) [gem]" level="application" />
285-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.8.0, rbenv: 2.3.8) [gem]" level="application" />
286-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.8.2, rbenv: 2.3.8) [gem]" level="application" />
287-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.8.0, rbenv: 2.3.8) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.8.0, rbenv: 2.3.8) [gem]" level="application" />
284+
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.8.2, rbenv: 2.3.8) [gem]" level="application" />
285+
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.8.4, rbenv: 2.3.8) [gem]" level="application" />
286+
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.8.1, rbenv: 2.3.8) [gem]" level="application" />
287+
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.8.2, rbenv: 2.3.8) [gem]" level="application" />
289288
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.62.0, rbenv: 2.3.8) [gem]" level="application" />
290289
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.31.0, rbenv: 2.3.8) [gem]" level="application" />
291-
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.0, rbenv: 2.3.8) [gem]" level="application" />
290+
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, rbenv: 2.3.8) [gem]" level="application" />
292291
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.2, rbenv: 2.3.8) [gem]" level="application" />
293-
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, rbenv: 2.3.8) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.5, rbenv: 2.3.8) [gem]" level="application" />
294293
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 2.3.8) [gem]" level="application" />
295294
<orderEntry type="library" scope="PROVIDED" name="terminal-table (v1.8.0, rbenv: 2.3.8) [gem]" level="application" />
296-
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.4.1, rbenv: 2.3.8) [gem]" level="application" />
295+
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.0, rbenv: 2.3.8) [gem]" level="application" />
297296
<orderEntry type="library" scope="PROVIDED" name="webmock (v3.5.1, rbenv: 2.3.8) [gem]" level="application" />
298297
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.16, rbenv: 2.3.8) [gem]" level="application" />
299298
</component>

‎lib/java_buildpack/util/configuration_utils.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ def load_configuration(file, user_provided, var_name, clean_nil_values, should_l
120120
begin
121121
user_provided_value = YAML.safe_load(user_provided)
122122
configuration = merge_configuration(configuration, user_provided_value, var_name, should_log)
123-
rescue Psych::SyntaxError => ex
124-
raise "User configuration value in environment variable #{var_name} has invalid syntax: #{ex}"
123+
rescue Psych::SyntaxError => e
124+
raise "User configuration value in environment variable #{var_name} has invalid syntax: #{e}"
125125
end
126126
logger.debug { "Configuration from #{file} modified with: #{user_provided}" } if should_log
127127
end

‎lib/java_buildpack/util/format_duration.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ def duration
4646

4747
MILLISECOND = 0.001
4848

49-
TENTH = (100 * MILLISECOND).freeze
49+
TENTH = 100 * MILLISECOND
5050

51-
SECOND = (10 * TENTH).freeze
51+
SECOND = 10 * TENTH
5252

53-
MINUTE = (60 * SECOND).freeze
53+
MINUTE = 60 * SECOND
5454

55-
HOUR = (60 * MINUTE).freeze
55+
HOUR = 60 * MINUTE
5656

5757
private_constant :MILLISECOND, :TENTH, :SECOND, :MINUTE, :HOUR
5858

‎spec/java_buildpack/util/format_duration_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747

4848
MILLISECOND = 0.001
4949

50-
TENTH = (100 * MILLISECOND).freeze
50+
TENTH = 100 * MILLISECOND
5151

52-
SECOND = (10 * TENTH).freeze
52+
SECOND = 10 * TENTH
5353

54-
MINUTE = (60 * SECOND).freeze
54+
MINUTE = 60 * SECOND
5555

56-
HOUR = (60 * MINUTE).freeze
56+
HOUR = 60 * MINUTE
5757

5858
def expect_time_string(expected, time)
5959
expect(time.duration).to eq(expected)

0 commit comments

Comments
 (0)