Skip to content

Commit 97d356c

Browse files
nebhalenebhale
committed
Merge 78553124-formatting-method to master
[#78553124]
2 parents 5e7d82c + 31d715b commit 97d356c

File tree

9 files changed

+38
-33
lines changed

9 files changed

+38
-33
lines changed

‎Gemfile.lock‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ GEM
33
specs:
44
addressable (2.3.6)
55
ast (2.0.0)
6+
astrolabe (1.3.0)
7+
parser (>= 2.2.0.pre.3, < 3.0)
68
codeclimate-test-reporter (0.4.0)
79
simplecov (>= 0.7.1, < 1.0.0)
810
crack (0.4.2)
@@ -20,19 +22,20 @@ GEM
2022
rainbow (2.0.0)
2123
rake (10.3.2)
2224
redcarpet (3.1.2)
23-
rspec (3.0.0)
24-
rspec-core (~> 3.0.0)
25-
rspec-expectations (~> 3.0.0)
26-
rspec-mocks (~> 3.0.0)
27-
rspec-core (3.0.4)
28-
rspec-support (~> 3.0.0)
29-
rspec-expectations (3.0.4)
25+
rspec (3.1.0)
26+
rspec-core (~> 3.1.0)
27+
rspec-expectations (~> 3.1.0)
28+
rspec-mocks (~> 3.1.0)
29+
rspec-core (3.1.4)
30+
rspec-support (~> 3.1.0)
31+
rspec-expectations (3.1.1)
3032
diff-lcs (>= 1.2.0, < 2.0)
31-
rspec-support (~> 3.0.0)
32-
rspec-mocks (3.0.4)
33-
rspec-support (~> 3.0.0)
34-
rspec-support (3.0.4)
35-
rubocop (0.25.0)
33+
rspec-support (~> 3.1.0)
34+
rspec-mocks (3.1.1)
35+
rspec-support (~> 3.1.0)
36+
rspec-support (3.1.0)
37+
rubocop (0.26.1)
38+
astrolabe (~> 1.3)
3639
parser (>= 2.2.0.pre.4, < 3.0)
3740
powerpack (~> 0.0.6)
3841
rainbow (>= 1.99.1, < 3.0)
@@ -42,12 +45,12 @@ GEM
4245
rake (>= 0.8.1)
4346
ruby-debug-ide (0.4.22)
4447
rake (>= 0.8.1)
45-
ruby-progressbar (1.5.1)
48+
ruby-progressbar (1.6.0)
4649
rubyzip (1.1.6)
4750
safe_yaml (1.0.3)
48-
simplecov (0.9.0)
51+
simplecov (0.9.1)
4952
docile (~> 1.1.0)
50-
multi_json
53+
multi_json (~> 1.0)
5154
simplecov-html (~> 0.8.0)
5255
simplecov-html (0.8.0)
5356
slop (3.6.0)

‎java-buildpack.iml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,11 @@
273273
<orderEntry type="sourceFolder" forTests="false" />
274274
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.6, rbenv: 1.9.3-p547) [gem]" level="application" />
275275
<orderEntry type="library" scope="PROVIDED" name="ast (v2.0.0, rbenv: 1.9.3-p547) [gem]" level="application" />
276+
<orderEntry type="library" scope="PROVIDED" name="astrolabe (v1.3.0, rbenv: 1.9.3-p547) [gem]" level="application" />
276277
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.3, rbenv: 1.9.3-p547) [gem]" level="application" />
277278
<orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.4.0, rbenv: 1.9.3-p547) [gem]" level="application" />
278279
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.2, rbenv: 1.9.3-p547) [gem]" level="application" />
280+
<orderEntry type="library" scope="PROVIDED" name="debase (v0.0.9, rbenv: 1.9.3-p547) [gem]" level="application" />
279281
<orderEntry type="library" scope="PROVIDED" name="debugger-ruby_core_source (v1.3.5, rbenv: 1.9.3-p547) [gem]" level="application" />
280282
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 1.9.3-p547) [gem]" level="application" />
281283
<orderEntry type="library" scope="PROVIDED" name="docile (v1.1.5, rbenv: 1.9.3-p547) [gem]" level="application" />
@@ -285,18 +287,18 @@
285287
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.0.0, rbenv: 1.9.3-p547) [gem]" level="application" />
286288
<orderEntry type="library" scope="PROVIDED" name="rake (v10.3.2, rbenv: 1.9.3-p547) [gem]" level="application" />
287289
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.1.2, rbenv: 1.9.3-p547) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.0.0, rbenv: 1.9.3-p547) [gem]" level="application" />
289-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.0.4, rbenv: 1.9.3-p547) [gem]" level="application" />
290-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.0.4, rbenv: 1.9.3-p547) [gem]" level="application" />
291-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.0.4, rbenv: 1.9.3-p547) [gem]" level="application" />
292-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.0.4, rbenv: 1.9.3-p547) [gem]" level="application" />
293-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.25.0, rbenv: 1.9.3-p547) [gem]" level="application" />
290+
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.1.0, rbenv: 1.9.3-p547) [gem]" level="application" />
291+
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.1.4, rbenv: 1.9.3-p547) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.1.1, rbenv: 1.9.3-p547) [gem]" level="application" />
293+
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.1.1, rbenv: 1.9.3-p547) [gem]" level="application" />
294+
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.1.0, rbenv: 1.9.3-p547) [gem]" level="application" />
295+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.26.1, rbenv: 1.9.3-p547) [gem]" level="application" />
294296
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p547) [gem]" level="application" />
295297
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p547) [gem]" level="application" />
296-
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.5.1, rbenv: 1.9.3-p547) [gem]" level="application" />
298+
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.6.0, rbenv: 1.9.3-p547) [gem]" level="application" />
297299
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.6, rbenv: 1.9.3-p547) [gem]" level="application" />
298300
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.3, rbenv: 1.9.3-p547) [gem]" level="application" />
299-
<orderEntry type="library" scope="PROVIDED" name="simplecov (v0.9.0, rbenv: 1.9.3-p547) [gem]" level="application" />
301+
<orderEntry type="library" scope="PROVIDED" name="simplecov (v0.9.1, rbenv: 1.9.3-p547) [gem]" level="application" />
300302
<orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.8.0, rbenv: 1.9.3-p547) [gem]" level="application" />
301303
<orderEntry type="library" scope="PROVIDED" name="slop (v3.6.0, rbenv: 1.9.3-p547) [gem]" level="application" />
302304
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 1.9.3-p547) [gem]" level="application" />

‎lib/java_buildpack/buildpack.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def compile
6060
fail 'No container can run this application' unless container
6161

6262
component_detection('JRE', @jres, true).first.compile
63-
component_detection('framework', @frameworks, false).each { |framework| framework.compile }
63+
component_detection('framework', @frameworks, false).each(&:compile)
6464
container.compile
6565
end
6666

@@ -73,7 +73,7 @@ def release
7373
fail 'No container can run this application' unless container
7474

7575
component_detection('JRE', @jres, true).first.release
76-
component_detection('framework', @frameworks, false).each { |framework| framework.release }
76+
component_detection('framework', @frameworks, false).each(&:release)
7777
command = container.release
7878

7979
payload = {

‎lib/java_buildpack/component/modular_component.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ def initialize(context, &version_validator)
4141

4242
# (see JavaBuildpack::Component::BaseComponent#detect)
4343
def detect
44-
supports? ? @sub_components.map { |m| m.detect }.flatten.compact : nil
44+
supports? ? @sub_components.map(&:detect).flatten.compact : nil
4545
end
4646

4747
# (see JavaBuildpack::Component::BaseComponent#compile)
4848
def compile
49-
@sub_components.each { |m| m.compile }
49+
@sub_components.each(&:compile)
5050
end
5151

5252
# (see JavaBuildpack::Component::BaseComponent#release)
5353
def release
54-
@sub_components.map { |m| m.release }
54+
@sub_components.map(&:release)
5555
command
5656
end
5757

‎lib/java_buildpack/util/class_file_utils.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class << self
3232
# @param [JavaBuildpack::Component::Application] application the application to search
3333
# @return [Array<Pathname>] a possibly empty list of files
3434
def class_files(application)
35-
(application.root + CLASS_FILE_PATTERN).glob.reject { |path| path.directory? }.sort
35+
(application.root + CLASS_FILE_PATTERN).glob.reject(&:directory?).sort
3636
end
3737

3838
CLASS_FILE_PATTERN = '**/*.class'.freeze

‎lib/java_buildpack/util/find_single_directory.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module Util
2323
#
2424
# @return [Pathname, nil] the single directory in the root of the droplet, otherwise +nil+
2525
def find_single_directory
26-
roots = (@droplet.root + '*').glob.select { |child| child.directory? }
26+
roots = (@droplet.root + '*').glob.select(&:directory?)
2727
roots.size == 1 ? roots.first : nil
2828
end
2929

‎lib/java_buildpack/util/groovy_utils.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def shebang?(file)
6464
# @param [JavaBuildpack::Component::Application] application the application to search
6565
# @return [Array] a possibly empty list of files
6666
def groovy_files(application)
67-
(application.root + GROOVY_FILE_PATTERN).glob.reject { |path| path.directory? }.sort
67+
(application.root + GROOVY_FILE_PATTERN).glob.reject(&:directory?).sort
6868
end
6969

7070
private

‎lib/java_buildpack/util/play/factory.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def create(droplet)
4141
Post22Staged.new(droplet),
4242
Pre22Dist.new(droplet),
4343
Pre22Staged.new(droplet)
44-
].select { |candidate| candidate.supports? }
44+
].select(&:supports?)
4545

4646
fail "Play Framework application version cannot be determined: #{candidates}" if candidates.size > 1
4747
candidates.empty? ? nil : candidates.first

‎lib/java_buildpack/util/properties.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Properties < Hash
2828
def initialize(file_name)
2929
return self if file_name.nil?
3030

31-
contents = file_name.open { |file| file.read }
31+
contents = file_name.open(&:read)
3232
contents.gsub!(/[\r\n\f]+ /, '')
3333

3434
contents.each_line do |line|

0 commit comments

Comments
 (0)