Skip to content

Commit fc9cc72

Browse files
committed
Dependency Updates
1 parent 7ae1adb commit fc9cc72

10 files changed

Lines changed: 39 additions & 37 deletions

File tree

.rubocop.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ AllCops:
88
Exclude:
99
- 'build/**/*'
1010
- Gemfile # TODO: Remove when upgrading to any version after 0.48.1
11+
Layout/EmptyLinesAroundBlockBody:
12+
Exclude:
13+
- 'spec/**/*.rb'
14+
Layout/EmptyLinesAroundClassBody:
15+
Enabled: false
16+
Layout/EmptyLinesAroundModuleBody:
17+
Enabled: false
18+
Layout/IndentHeredoc: # TODO: Remove when dropping 2.2.x support
19+
Enabled: false
20+
Layout/MultilineOperationIndentation:
21+
Enabled: false
1122
Metrics/AbcSize:
1223
Max: 22
1324
Metrics/BlockLength:
@@ -39,16 +50,5 @@ RSpec/NestedGroups:
3950
Max: 4
4051
Style/Documentation:
4152
Enabled: false
42-
Style/EmptyLinesAroundBlockBody:
43-
Exclude:
44-
- 'spec/**/*.rb'
45-
Style/EmptyLinesAroundClassBody:
46-
Enabled: false
47-
Style/EmptyLinesAroundModuleBody:
48-
Enabled: false
49-
Style/IndentHeredoc: # TODO: Remove when dropping 2.2.x support
50-
Enabled: false
5153
Style/MethodMissing:
5254
Enabled: false
53-
Style/MultilineOperationIndentation:
54-
Enabled: false

Gemfile.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ GEM
88
safe_yaml (~> 1.0.0)
99
diff-lcs (1.3)
1010
hashdiff (0.3.4)
11+
parallel (1.11.2)
1112
parser (2.4.0.0)
1213
ast (~> 2.2)
1314
powerpack (0.1.1)
@@ -29,7 +30,8 @@ GEM
2930
diff-lcs (>= 1.2.0, < 2.0)
3031
rspec-support (~> 3.6.0)
3132
rspec-support (3.6.0)
32-
rubocop (0.48.1)
33+
rubocop (0.49.1)
34+
parallel (~> 1.10)
3335
parser (>= 2.3.3.1, < 3.0)
3436
powerpack (~> 0.1)
3537
rainbow (>= 1.99.1, < 3.0)
@@ -41,9 +43,9 @@ GEM
4143
rubyzip (1.2.1)
4244
safe_yaml (1.0.4)
4345
tee (1.0.0)
44-
terminal-table (1.7.3)
45-
unicode-display_width (~> 1.1.1)
46-
unicode-display_width (1.1.3)
46+
terminal-table (1.8.0)
47+
unicode-display_width (~> 1.1, >= 1.1.1)
48+
unicode-display_width (1.2.1)
4749
webmock (3.0.1)
4850
addressable (>= 2.3.6)
4951
crack (>= 0.3.2)
@@ -66,4 +68,4 @@ DEPENDENCIES
6668
yard
6769

6870
BUNDLED WITH
69-
1.14.6
71+
1.15.1

spec/component_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
cache_fixture = example.metadata[:cache_fixture]
5555
if cache_fixture
5656
allow(application_cache).to receive(:get).with(uri)
57-
.and_yield(Pathname.new("spec/fixtures/#{cache_fixture}").open, false)
57+
.and_yield(Pathname.new("spec/fixtures/#{cache_fixture}").open, false)
5858
end
5959
end
6060

spec/java_buildpack/buildpack_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
before do
8888
allow(JavaBuildpack::Util::ConfigurationUtils)
8989
.to receive(:load).with('components')
90-
.and_return(
91-
'containers' => [],
92-
'frameworks' => ['JavaBuildpack::Framework::JavaOpts'],
93-
'jres' => []
94-
)
90+
.and_return(
91+
'containers' => [],
92+
'frameworks' => ['JavaBuildpack::Framework::JavaOpts'],
93+
'jres' => []
94+
)
9595
end
9696

9797
it 'requires files needed for components' do

spec/java_buildpack/buildpack_version_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
before do |example|
2929
configuration = example.metadata[:configuration] || {}
3030
allow(JavaBuildpack::Util::ConfigurationUtils).to receive(:load).with('version', true, true)
31-
.and_return(configuration)
31+
.and_return(configuration)
3232
end
3333

3434
it 'creates offline version string from config/version.yml',

spec/java_buildpack/container/tomcat/tomcat_redis_store_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
before do
3838
allow(services).to receive(:one_service?).with(/session-replication/, %w[hostname host], 'port', 'password')
39-
.and_return(true)
39+
.and_return(true)
4040
allow(services).to receive(:find_service).and_return('credentials' => { 'hostname' => 'test-host',
4141
'port' => 'test-port',
4242
'password' => 'test-password' })
@@ -71,7 +71,7 @@
7171

7272
before do
7373
allow(services).to receive(:one_service?).with(/session-replication/, %w[hostname host], 'port', 'password')
74-
.and_return(true)
74+
.and_return(true)
7575
allow(services).to receive(:find_service).and_return('credentials' => { 'host' => 'test-host',
7676
'port' => 'test-port',
7777
'password' => 'test-password' })

spec/java_buildpack/logging/logger_factory_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183

184184
before do
185185
allow(JavaBuildpack::Util::ConfigurationUtils).to receive(:load).with('logging', true, false)
186-
.and_return('default_log_level' => 'DEBUG')
186+
.and_return('default_log_level' => 'DEBUG')
187187
described_class.instance.setup app_dir
188188
end
189189

spec/java_buildpack/repository/repository_index_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535

3636
it 'loads index' do
3737
allow(application_cache).to receive(:get).with(%r{/test-uri/index\.yml})
38-
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
38+
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
3939
allow(JavaBuildpack::Repository::VersionResolver).to receive(:resolve).with('test-version', %w[resolved-version])
40-
.and_return('resolved-version')
40+
.and_return('resolved-version')
4141

4242
repository_index = described_class.new('{platform}/{architecture}/test-uri')
4343

@@ -46,9 +46,9 @@
4646

4747
it 'copes with trailing slash in repository URI' do
4848
allow(application_cache).to receive(:get).with(%r{/test-uri/index\.yml})
49-
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
49+
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
5050
allow(JavaBuildpack::Repository::VersionResolver).to receive(:resolve).with('test-version', %w[resolved-version])
51-
.and_return('resolved-version')
51+
.and_return('resolved-version')
5252

5353
repository_index = described_class.new('{platform}/{architecture}/test-uri/')
5454

@@ -59,7 +59,7 @@
5959
allow(JavaBuildpack::Util::ConfigurationUtils)
6060
.to receive(:load).with('repository').and_return('default_repository_root' => 'http://default-repository-root/')
6161
allow(application_cache).to receive(:get).with('http://default-repository-root/test-uri/index.yml')
62-
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
62+
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
6363

6464
described_class.new('{default.repository.root}/test-uri')
6565
end
@@ -75,7 +75,7 @@
7575
allow(redhat_release).to receive(:exist?).and_return(true)
7676
allow(redhat_release).to receive(:read).and_return('CentOS release 6.4 (Final)')
7777
allow(application_cache).to receive(:get).with('centos6/x86_64/test-uri/index.yml')
78-
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
78+
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
7979

8080
described_class.new('{platform}/{architecture}/test-uri')
8181

@@ -90,7 +90,7 @@
9090
allow_any_instance_of(described_class).to receive(:`).with('uname -s').and_return('Darwin')
9191
allow_any_instance_of(described_class).to receive(:`).with('uname -m').and_return('x86_64')
9292
allow(application_cache).to receive(:get).with('mountainlion/x86_64/test-uri/index.yml')
93-
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
93+
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
9494

9595
described_class.new('{platform}/{architecture}/test-uri')
9696

@@ -105,10 +105,10 @@
105105
allow_any_instance_of(described_class).to receive(:`).with('uname -s').and_return('Linux')
106106
allow_any_instance_of(described_class).to receive(:`).with('uname -m').and_return('x86_64')
107107
allow_any_instance_of(described_class).to receive(:`).with('which lsb_release 2> /dev/null')
108-
.and_return('/usr/bin/lsb_release')
108+
.and_return('/usr/bin/lsb_release')
109109
allow_any_instance_of(described_class).to receive(:`).with('lsb_release -cs').and_return('precise')
110110
allow(application_cache).to receive(:get).with('precise/x86_64/test-uri/index.yml')
111-
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
111+
.and_yield(Pathname.new('spec/fixtures/test-index.yml').open)
112112

113113
described_class.new('{platform}/{architecture}/test-uri')
114114

spec/java_buildpack/util/cache/internet_availability_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
before do
3333
allow(JavaBuildpack::Util::ConfigurationUtils).to receive(:load).with('cache')
34-
.and_return('remote_downloads' => 'disabled')
34+
.and_return('remote_downloads' => 'disabled')
3535
described_class.instance.send :initialize
3636
end
3737

spec/java_buildpack/util/java_main_utils_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
it 'uses a main class configuration in a configuration file' do
2929
allow(JavaBuildpack::Util::ConfigurationUtils).to receive(:load).with('java_main')
30-
.and_return('java_main_class' => test_class_name)
30+
.and_return('java_main_class' => test_class_name)
3131

3232
expect(described_class.main_class(application)).to eq(test_class_name)
3333
end

0 commit comments

Comments
 (0)