Skip to content

Commit 074fd9a

Browse files
committed
Version updates
This change updates dependency versions. This update includes an update to Rubocop necessitating changes to the source code.
1 parent 2462730 commit 074fd9a

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

.rubocop.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
AllCops:
33
Include:
44
- Rakefile
5-
- rakelib/**
5+
- rakelib/**/*
66
Exclude:
7-
- build/**
8-
- vendor/**
7+
- build/**/*
8+
- vendor/**/*
99
ClassLength:
1010
Max: 200
1111
CyclomaticComplexity:

Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GEM
1111
diff-lcs (1.2.5)
1212
docile (1.1.3)
1313
json (1.8.1)
14-
multi_json (1.9.2)
14+
multi_json (1.9.3)
1515
parser (2.1.9)
1616
ast (>= 1.1, < 3.0)
1717
slop (~> 3.4, >= 3.4.5)
@@ -31,9 +31,9 @@ GEM
3131
rspec-mocks (3.0.0.beta2)
3232
rspec-support (= 3.0.0.beta2)
3333
rspec-support (3.0.0.beta2)
34-
rubocop (0.20.1)
34+
rubocop (0.21.0)
3535
json (>= 1.7.7, < 2)
36-
parser (~> 2.1.7)
36+
parser (~> 2.1.9)
3737
powerpack (~> 0.0.6)
3838
rainbow (>= 1.99.1, < 3.0)
3939
ruby-progressbar (~> 1.4)

java-buildpack.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 1.9.3-p545) [gem]" level="application" />
279279
<orderEntry type="library" scope="PROVIDED" name="docile (v1.1.3, rbenv: 1.9.3-p545) [gem]" level="application" />
280280
<orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, rbenv: 1.9.3-p545) [gem]" level="application" />
281-
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.9.2, rbenv: 1.9.3-p545) [gem]" level="application" />
281+
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.9.3, rbenv: 1.9.3-p545) [gem]" level="application" />
282282
<orderEntry type="library" scope="PROVIDED" name="parser (v2.1.9, rbenv: 1.9.3-p545) [gem]" level="application" />
283283
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.0.9, rbenv: 1.9.3-p545) [gem]" level="application" />
284284
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.0.0, rbenv: 1.9.3-p545) [gem]" level="application" />
@@ -289,7 +289,7 @@
289289
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
290290
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
291291
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
292-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.20.1, rbenv: 1.9.3-p545) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.21.0, rbenv: 1.9.3-p545) [gem]" level="application" />
293293
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p545) [gem]" level="application" />
294294
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p545) [gem]" level="application" />
295295
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.4.2, rbenv: 1.9.3-p545) [gem]" level="application" />

lib/java_buildpack/component/base_component.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def release
8282
# @param [String] uri
8383
# @param [String] name an optional name for the download. Defaults to +@component_name+.
8484
# @return [Void]
85-
def download(version, uri, name = @component_name, &block)
85+
def download(version, uri, name = @component_name)
8686
download_start_time = Time.now
8787
print "-----> Downloading #{name} #{version} from #{uri} "
8888

lib/java_buildpack/component/modular_component.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ModularComponent < BaseComponent
3535
# @param [Hash] context a collection of utilities used by components
3636
# @param [Block, nil] version_validator an optional version validation block
3737
def initialize(context, &version_validator)
38-
super(context)
38+
super(context, &version_validator)
3939
@sub_components = supports? ? sub_components(context) : []
4040
end
4141

@@ -70,7 +70,7 @@ def command
7070
# @param [Hash] context the context of the component
7171
# @return [Array<BaseComponent>] a collection of +BaseComponent+s that make up the sub_components of this
7272
# component
73-
def sub_components(context)
73+
def sub_components(_context)
7474
fail "Method 'sub_components' must be defined"
7575
end
7676

lib/java_buildpack/logging/logger_factory.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def get_logger(klass)
102102
def console_logger
103103
logger = Logger.new($stderr)
104104
logger.level = severity
105-
logger.formatter = lambda do |severity, datetime, klass, message|
105+
logger.formatter = lambda do |severity, _datetime, klass, message|
106106
"#{klass.ljust(32)} #{severity.ljust(5)} #{message}\n"
107107
end
108108

lib/java_buildpack/repository/configured_item.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class << self
3838
# @param [Block, nil] version_validator an optional version validation block
3939
# @return [String] the URI of the chosen version of the file
4040
# @return [JavaBuildpack::Util::TokenizedVersion] the chosen version of the file
41-
def find_item(component_name, configuration, &version_validator)
41+
def find_item(component_name, configuration)
4242
repository_root = repository_root(configuration)
4343
version = version(configuration)
4444

lib/java_buildpack/util/filtering_pathname.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def each_child(with_directory = true, &block)
130130
end
131131

132132
# Execute this +FilteringPathname+ as a glob.
133-
def glob(flags = 0, &block)
133+
def glob(flags = 0)
134134
if block_given?
135135
Pathname.glob(@pathname, flags) do |file|
136136
yield filtered_pathname(file) if visible file

lib/java_buildpack/util/shell.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module Shell
2828
# @param [String] command the command to run
2929
# @return [Void]
3030
def shell(command)
31-
Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
31+
Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
3232
if wait_thr.value != 0
3333
puts "\nCommand '#{command}' has failed"
3434
puts "STDOUT: #{stdout.gets}"

spec/integration_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
include_context 'logging_helper'
2727

2828
def run(command)
29-
Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
29+
Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
3030
capture_output stdout, stderr
3131
yield wait_thr.value if block_given?
3232
end

spec/java_buildpack/buildpack_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
end
141141

142142
it 'handles exceptions correctly' do
143-
expect { with_buildpack { |buildpack| fail 'an exception' } }.to raise_error SystemExit
143+
expect { with_buildpack { |_buildpack| fail 'an exception' } }.to raise_error SystemExit
144144
expect(stderr.string).to match(/an exception/)
145145
end
146146

0 commit comments

Comments
 (0)