Support Spring Boot beans-style configuration

nebhale · nebhale · commit ef1bfc89a2f2 · 2014-02-12T14:41:28.000Z
This change adds support for Spring Boot's beans-style configuration[1]. [1]: https://github.com/spring-projects/spring-boot/tree/master/spring-boot-cli#beans-dsl [#63606834]
diff --git a/java-buildpack.iml b/java-buildpack.iml
@@ -270,7 +270,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.5, rbenv: 1.9.3-p484) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v1.1.0, rbenv: 1.9.3-p484) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.1, rbenv: 1.9.3-p484) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.3, rbenv: 1.9.3-p484) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.2.0, rbenv: 1.9.3-p484) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="crack (v0.4.1, rbenv: 1.9.3-p484) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="debugger-ruby_core_source (v1.2.4, rbenv: 1.9.3-p484) [gem]" level="application" />
diff --git a/lib/java_buildpack/container/spring_boot_cli.rb b/lib/java_buildpack/container/spring_boot_cli.rb
@@ -51,7 +51,7 @@ def release
     # @macro versioned_dependency_component_supports
     def supports?
       gf = JavaBuildpack::Util::GroovyUtils.groovy_files(@application)
-      gf.length > 0 && all_pogo(gf) && no_main_method(gf) && no_shebang(gf) && !has_web_inf
+      gf.length > 0 && all_pogo_or_configuration(gf) && no_main_method(gf) && no_shebang(gf) && !has_web_inf
     end
 
     private
@@ -76,8 +76,10 @@ def has_web_inf
       (@application.root + 'WEB-INF').exist?
     end
 
-    def all_pogo(groovy_files)
-      all?(groovy_files) { |file| JavaBuildpack::Util::GroovyUtils.pogo? file } # note that this will scan comments
+    def all_pogo_or_configuration(groovy_files)
+      all?(groovy_files) do |file|
+        JavaBuildpack::Util::GroovyUtils.pogo?(file) || JavaBuildpack::Util::GroovyUtils.beans?(file)
+      end # note that this will scan comments
     end
 
     def all?(groovy_files, &block)
diff --git a/lib/java_buildpack/util/groovy_utils.rb b/lib/java_buildpack/util/groovy_utils.rb
@@ -26,28 +26,36 @@ class GroovyUtils
 
     class << self
 
+      # Indicates whether a file is a +beans+style configuration
+      #
+      # @param [File] file the file to scan
+      # @return [Boolean] +true+ if the file is a +beans+style configuration, +false+ otherwise.
+      def beans?(file)
+        Pathname.new(file).read =~ /beans[\s]*\{/
+      end
+
       # Indicates whether a file has a +main()+ method in it
       #
       # @param [File] file the file to scan
       # @return [Boolean] +true+ if the file contains a +main()+ method, +false+ otherwise.
       def main_method?(file)
-        file.read =~ /static void main\(/
+        Pathname.new(file).read =~ /static void main\(/
       end
 
       # Indicates whether a file is a POGO
       #
       # @param [File] file the file to scan
       # @return [Boolean] +true+ if the file is a POGO, +false+ otherwise.
       def pogo?(file)
-        file.read =~ /class [\w]+ [\s\w]*{/
+        Pathname.new(file).read =~ /class [\w]+ [\s\w]*\{/
       end
 
       # Indicates whether a file has a shebang
       #
       # @param [File] file the file to scan
       # @return [Boolean] +true+ if the file has a shebang, +false+ otherwise.
       def shebang?(file)
-        file.read =~ /#!/
+        Pathname.new(file).read =~ /#!/
       end
 
       # Returns all the Ruby files in the given directory
diff --git a/spec/fixtures/container_spring_boot_cli_beans_configuration/configuration.groovy b/spec/fixtures/container_spring_boot_cli_beans_configuration/configuration.groovy
@@ -0,0 +1,3 @@
+beans {
+
+}
diff --git a/spec/fixtures/container_spring_boot_cli_beans_configuration/pogo_1.groovy b/spec/fixtures/container_spring_boot_cli_beans_configuration/pogo_1.groovy
@@ -0,0 +1 @@
+class X {
diff --git a/spec/java_buildpack/container/spring_boot_cli_spec.rb b/spec/java_buildpack/container/spring_boot_cli_spec.rb
@@ -63,6 +63,12 @@
     expect(component.detect).to be_nil
   end
 
+  it 'should detect if there are Groovy files and they are all POGOs plus a beans-style configuration',
+     app_fixture: 'container_spring_boot_cli_beans_configuration' do
+
+    expect(component.detect).to eq("spring-boot-cli=#{version}")
+  end
+
   it 'should detect if there are Groovy files and they are all POGOs with no main method and there is no WEB-INF directory',
      app_fixture: 'container_spring_boot_cli_valid_app' do
 
