Skip to content

Commit 6986fd5

Browse files
nebhalenebhale
committed
Dependency Updates
Signed-off-by: Ben Hale <[email protected]>
1 parent 1ce926f commit 6986fd5

File tree

5 files changed

+61
-61
lines changed

5 files changed

+61
-61
lines changed

‎.rubocop.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
require: rubocop-rspec
33

44
AllCops:
5-
# Include:
6-
# - '**/Rakefile'
7-
# - 'rakelib/**/*'
5+
NewCops: enable
86
Exclude:
97
- 'build/**/*'
10-
# - Gemfile
118
Layout/EmptyLinesAroundBlockBody:
129
Exclude:
1310
- 'spec/**/*.rb'
1411
Layout/EmptyLinesAroundClassBody:
1512
Enabled: false
1613
Layout/EmptyLinesAroundModuleBody:
1714
Enabled: false
15+
Layout/LineLength:
16+
Max: 120
1817
Layout/MultilineOperationIndentation:
1918
Enabled: false
2019
Metrics/AbcSize:
@@ -26,16 +25,14 @@ Metrics/ClassLength:
2625
Max: 250
2726
Metrics/CyclomaticComplexity:
2827
Max: 10
29-
Metrics/LineLength:
30-
Max: 120
3128
Metrics/MethodLength:
3229
Max: 25
30+
Naming/MethodParameterName:
31+
Enabled: false
3332
Metrics/ParameterLists:
3433
Max: 10
3534
Metrics/PerceivedComplexity:
3635
Max: 10
37-
Naming/UncommunicativeMethodParamName:
38-
Enabled: false
3936
RSpec/AnyInstance:
4037
Enabled: false
4138
RSpec/ExampleLength:

‎Gemfile.lock

+22-20
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,51 @@ GEM
77
crack (0.4.3)
88
safe_yaml (~> 1.0.0)
99
diff-lcs (1.3)
10-
hashdiff (1.0.0)
11-
jaro_winkler (1.5.3)
12-
parallel (1.18.0)
13-
parser (2.6.5.0)
10+
hashdiff (1.0.1)
11+
jaro_winkler (1.5.4)
12+
parallel (1.19.1)
13+
parser (2.7.1.1)
1414
ast (~> 2.4.0)
15-
public_suffix (4.0.1)
15+
public_suffix (4.0.4)
1616
rainbow (3.0.0)
17-
rake (13.0.0)
17+
rake (13.0.1)
1818
redcarpet (3.5.0)
19+
rexml (3.2.4)
1920
rspec (3.9.0)
2021
rspec-core (~> 3.9.0)
2122
rspec-expectations (~> 3.9.0)
2223
rspec-mocks (~> 3.9.0)
23-
rspec-core (3.9.0)
24-
rspec-support (~> 3.9.0)
25-
rspec-expectations (3.9.0)
24+
rspec-core (3.9.1)
25+
rspec-support (~> 3.9.1)
26+
rspec-expectations (3.9.1)
2627
diff-lcs (>= 1.2.0, < 2.0)
2728
rspec-support (~> 3.9.0)
28-
rspec-mocks (3.9.0)
29+
rspec-mocks (3.9.1)
2930
diff-lcs (>= 1.2.0, < 2.0)
3031
rspec-support (~> 3.9.0)
31-
rspec-support (3.9.0)
32-
rubocop (0.75.1)
32+
rspec-support (3.9.2)
33+
rubocop (0.82.0)
3334
jaro_winkler (~> 1.5.1)
3435
parallel (~> 1.10)
35-
parser (>= 2.6)
36+
parser (>= 2.7.0.1)
3637
rainbow (>= 2.2.2, < 4.0)
38+
rexml
3739
ruby-progressbar (~> 1.7)
38-
unicode-display_width (>= 1.4.0, < 1.7)
39-
rubocop-rspec (1.36.0)
40+
unicode-display_width (>= 1.4.0, < 2.0)
41+
rubocop-rspec (1.38.1)
4042
rubocop (>= 0.68.1)
4143
ruby-progressbar (1.10.1)
42-
rubyzip (1.3.0)
44+
rubyzip (2.3.0)
4345
safe_yaml (1.0.5)
4446
tee (1.0.0)
4547
terminal-table (1.8.0)
4648
unicode-display_width (~> 1.1, >= 1.1.1)
47-
unicode-display_width (1.6.0)
48-
webmock (3.7.6)
49+
unicode-display_width (1.7.0)
50+
webmock (3.8.3)
4951
addressable (>= 2.3.6)
5052
crack (>= 0.3.2)
5153
hashdiff (>= 0.4.0, < 2.0.0)
52-
yard (0.9.20)
54+
yard (0.9.24)
5355

5456
PLATFORMS
5557
ruby
@@ -67,4 +69,4 @@ DEPENDENCIES
6769
yard
6870

6971
BUNDLED WITH
70-
2.0.2
72+
2.1.4

‎java-buildpack.iml

+30-29
Original file line numberDiff line numberDiff line change
@@ -265,36 +265,37 @@
265265
<excludeFolder url="file://$MODULE_DIR$/build" />
266266
<excludeFolder url="file://$MODULE_DIR$/doc" />
267267
</content>
268-
<orderEntry type="jdk" jdkName="rbenv: 2.3.8" jdkType="RUBY_SDK" />
268+
<orderEntry type="jdk" jdkName="rbenv: 2.5.8" jdkType="RUBY_SDK" />
269269
<orderEntry type="sourceFolder" forTests="false" />
270-
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.7.0, rbenv: 2.3.8) [gem]" level="application" />
271-
<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.2, rbenv: 2.3.8) [gem]" level="application" />
273-
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, rbenv: 2.3.8) [gem]" level="application" />
274-
<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 (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.18.0, rbenv: 2.3.8) [gem]" level="application" />
278-
<orderEntry type="library" scope="PROVIDED" name="parser (v2.6.5.0, rbenv: 2.3.8) [gem]" level="application" />
279-
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.1, rbenv: 2.3.8) [gem]" level="application" />
280-
<orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, rbenv: 2.3.8) [gem]" level="application" />
281-
<orderEntry type="library" scope="PROVIDED" name="rake (v13.0.0, rbenv: 2.3.8) [gem]" level="application" />
282-
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.5.0, rbenv: 2.3.8) [gem]" level="application" />
283-
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
284-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
285-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
286-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
287-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.75.1, rbenv: 2.3.8) [gem]" level="application" />
289-
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.36.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" />
291-
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.3.0, 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" />
293-
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 2.3.8) [gem]" level="application" />
294-
<orderEntry type="library" scope="PROVIDED" name="terminal-table (v1.8.0, 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" />
296-
<orderEntry type="library" scope="PROVIDED" name="webmock (v3.7.6, rbenv: 2.3.8) [gem]" level="application" />
297-
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.20, rbenv: 2.3.8) [gem]" level="application" />
270+
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.7.0, rbenv: 2.5.8) [gem]" level="application" />
271+
<orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, rbenv: 2.5.8) [gem]" level="application" />
272+
<orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, rbenv: 2.5.8) [gem]" level="application" />
273+
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, rbenv: 2.5.8) [gem]" level="application" />
274+
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.5.8) [gem]" level="application" />
275+
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v1.0.1, rbenv: 2.5.8) [gem]" level="application" />
276+
<orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, rbenv: 2.5.8) [gem]" level="application" />
277+
<orderEntry type="library" scope="PROVIDED" name="parallel (v1.19.1, rbenv: 2.5.8) [gem]" level="application" />
278+
<orderEntry type="library" scope="PROVIDED" name="parser (v2.7.1.1, rbenv: 2.5.8) [gem]" level="application" />
279+
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.4, rbenv: 2.5.8) [gem]" level="application" />
280+
<orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, rbenv: 2.5.8) [gem]" level="application" />
281+
<orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, rbenv: 2.5.8) [gem]" level="application" />
282+
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.5.0, rbenv: 2.5.8) [gem]" level="application" />
283+
<orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.4, rbenv: 2.5.8) [gem]" level="application" />
284+
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, rbenv: 2.5.8) [gem]" level="application" />
285+
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, rbenv: 2.5.8) [gem]" level="application" />
286+
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.1, rbenv: 2.5.8) [gem]" level="application" />
287+
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, rbenv: 2.5.8) [gem]" level="application" />
288+
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.2, rbenv: 2.5.8) [gem]" level="application" />
289+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.82.0, rbenv: 2.5.8) [gem]" level="application" />
290+
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.38.1, rbenv: 2.5.8) [gem]" level="application" />
291+
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, rbenv: 2.5.8) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v2.3.0, rbenv: 2.5.8) [gem]" level="application" />
293+
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.5, rbenv: 2.5.8) [gem]" level="application" />
294+
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 2.5.8) [gem]" level="application" />
295+
<orderEntry type="library" scope="PROVIDED" name="terminal-table (v1.8.0, rbenv: 2.5.8) [gem]" level="application" />
296+
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.7.0, rbenv: 2.5.8) [gem]" level="application" />
297+
<orderEntry type="library" scope="PROVIDED" name="webmock (v3.8.3, rbenv: 2.5.8) [gem]" level="application" />
298+
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.24, rbenv: 2.5.8) [gem]" level="application" />
298299
</component>
299300
<component name="RModuleSettingsStorage">
300301
<LOAD_PATH number="4" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" string2="$MODULE_DIR$/bin" string3="$MODULE_DIR$/spec/bin" />

‎lib/java_buildpack/framework/app_dynamics_agent.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ def check_if_resource_exists(resource_uri, conf_file)
155155

156156
case response
157157
when Net::HTTPSuccess
158-
return true
158+
true
159159
when Net::HTTPRedirection
160160
location = response['location']
161161
@logger.info { "redirected to #{location}" }
162-
return check_if_resource_exists(location, conf_file)
162+
check_if_resource_exists(location, conf_file)
163163
else
164164
@logger.info { "Could not retrieve #{resource_uri}. Code: #{response.code} Message: #{response.message}" }
165-
return false
165+
false
166166
end
167167
end
168168

‎lib/java_buildpack/framework/introscope_agent.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def agent_manager_credential(credentials)
125125
end
126126

127127
def export_all_properties(credentials, java_opts)
128-
credentials.keys.each do |key|
128+
credentials.each_key do |key|
129129
correct_key = key.tr('_', '.')
130130
if %w[agentManager.url.1 agent.manager.url].include?(correct_key)
131131
add_url(credentials, java_opts)

0 commit comments

Comments
 (0)