Skip to content

Commit

Permalink
Version updates
Browse files Browse the repository at this point in the history
This change updates dependency versions.  This update includes an
update to Rubocop necessitating changes to the source code.
  • Loading branch information
nebhale committed Apr 28, 2014
1 parent 2462730 commit 074fd9a
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
AllCops:
Include:
- Rakefile
- rakelib/**
- rakelib/**/*
Exclude:
- build/**
- vendor/**
- build/**/*
- vendor/**/*
ClassLength:
Max: 200
CyclomaticComplexity:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GEM
diff-lcs (1.2.5)
docile (1.1.3)
json (1.8.1)
multi_json (1.9.2)
multi_json (1.9.3)
parser (2.1.9)
ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5)
Expand All @@ -31,9 +31,9 @@ GEM
rspec-mocks (3.0.0.beta2)
rspec-support (= 3.0.0.beta2)
rspec-support (3.0.0.beta2)
rubocop (0.20.1)
rubocop (0.21.0)
json (>= 1.7.7, < 2)
parser (~> 2.1.7)
parser (~> 2.1.9)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
Expand Down
4 changes: 2 additions & 2 deletions java-buildpack.iml
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="docile (v1.1.3, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.9.2, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.9.3, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="parser (v2.1.9, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.0.9, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.0.0, rbenv: 1.9.3-p545) [gem]" level="application" />
Expand All @@ -289,7 +289,7 @@
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.20.1, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.21.0, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p545) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.4.2, rbenv: 1.9.3-p545) [gem]" level="application" />
Expand Down
2 changes: 1 addition & 1 deletion lib/java_buildpack/component/base_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def release
# @param [String] uri
# @param [String] name an optional name for the download. Defaults to +@component_name+.
# @return [Void]
def download(version, uri, name = @component_name, &block)
def download(version, uri, name = @component_name)
download_start_time = Time.now
print "-----> Downloading #{name} #{version} from #{uri} "

Expand Down
4 changes: 2 additions & 2 deletions lib/java_buildpack/component/modular_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ModularComponent < BaseComponent
# @param [Hash] context a collection of utilities used by components
# @param [Block, nil] version_validator an optional version validation block
def initialize(context, &version_validator)
super(context)
super(context, &version_validator)
@sub_components = supports? ? sub_components(context) : []
end

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

Expand Down
2 changes: 1 addition & 1 deletion lib/java_buildpack/logging/logger_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def get_logger(klass)
def console_logger
logger = Logger.new($stderr)
logger.level = severity
logger.formatter = lambda do |severity, datetime, klass, message|
logger.formatter = lambda do |severity, _datetime, klass, message|
"#{klass.ljust(32)} #{severity.ljust(5)} #{message}\n"
end

Expand Down
2 changes: 1 addition & 1 deletion lib/java_buildpack/repository/configured_item.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class << self
# @param [Block, nil] version_validator an optional version validation block
# @return [String] the URI of the chosen version of the file
# @return [JavaBuildpack::Util::TokenizedVersion] the chosen version of the file
def find_item(component_name, configuration, &version_validator)
def find_item(component_name, configuration)
repository_root = repository_root(configuration)
version = version(configuration)

Expand Down
2 changes: 1 addition & 1 deletion lib/java_buildpack/util/filtering_pathname.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def each_child(with_directory = true, &block)
end

# Execute this +FilteringPathname+ as a glob.
def glob(flags = 0, &block)
def glob(flags = 0)
if block_given?
Pathname.glob(@pathname, flags) do |file|
yield filtered_pathname(file) if visible file
Expand Down
2 changes: 1 addition & 1 deletion lib/java_buildpack/util/shell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module Shell
# @param [String] command the command to run
# @return [Void]
def shell(command)
Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
if wait_thr.value != 0
puts "\nCommand '#{command}' has failed"
puts "STDOUT: #{stdout.gets}"
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
include_context 'logging_helper'

def run(command)
Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
capture_output stdout, stderr
yield wait_thr.value if block_given?
end
Expand Down
2 changes: 1 addition & 1 deletion spec/java_buildpack/buildpack_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
end

it 'handles exceptions correctly' do
expect { with_buildpack { |buildpack| fail 'an exception' } }.to raise_error SystemExit
expect { with_buildpack { |_buildpack| fail 'an exception' } }.to raise_error SystemExit
expect(stderr.string).to match(/an exception/)
end

Expand Down

0 comments on commit 074fd9a

Please sign in to comment.