Skip to content

Commit 177e504

Browse files
committed
Dependency Updates
This change updates the dependencies of the buildpack. It makes some changes to the code in order to accommodate Rubocop.
1 parent 9ae536a commit 177e504

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ RSpec/FilePath:
2626
Enabled: false
2727
Style/Documentation:
2828
Enabled: false
29+
Style/EmptyLinesAroundBlockBody:
30+
Enabled: false
2931
Style/EmptyLinesAroundClassBody:
3032
Enabled: false
3133
Style/EmptyLinesAroundModuleBody:

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GEM
1818
powerpack (0.0.9)
1919
rainbow (2.0.0)
2020
rake (10.4.2)
21-
redcarpet (3.2.1)
21+
redcarpet (3.2.2)
2222
rspec (3.1.0)
2323
rspec-core (~> 3.1.0)
2424
rspec-expectations (~> 3.1.0)
@@ -31,7 +31,7 @@ GEM
3131
rspec-mocks (3.1.3)
3232
rspec-support (~> 3.1.0)
3333
rspec-support (3.1.2)
34-
rubocop (0.27.1)
34+
rubocop (0.28.0)
3535
astrolabe (~> 1.3)
3636
parser (>= 2.2.0.pre.7, < 3.0)
3737
powerpack (~> 0.0.6)

lib/java_buildpack/util/start_script.rb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,14 @@ module Util
2525
# @param [Pathname] root the root to search from
2626
# @return [Pathname, nil] the start script or +nil+ if one does not exist
2727
def start_script(root)
28-
if root
29-
candidates = (root + 'bin/*').glob
28+
return nil unless root
3029

31-
if candidates.size == 1
32-
candidates.first
33-
else
34-
candidates.find { |candidate| Pathname.new("#{candidate}.bat").exist? }
35-
end
30+
candidates = (root + 'bin/*').glob
31+
32+
if candidates.size == 1
33+
candidates.first
3634
else
37-
nil
35+
candidates.find { |candidate| Pathname.new("#{candidate}.bat").exist? }
3836
end
3937
end
4038

0 commit comments

Comments
 (0)