Avoid Spring Boot CLI container detecting shebang files with classes

Glyn Normington · Glyn Normington · commit f85e935d011f · 2013-11-29T16:10:39.000Z
[#61656448]
diff --git a/docs/container-spring-boot-cli.md b/docs/container-spring-boot-cli.md
@@ -7,6 +7,7 @@ The Spring Boot CLI Container runs one or more Groovy (i.e. `*.groovy`) files us
 			<li>The application has one or more <tt>.groovy</tt> files in the root directory, and</li>
 			<li>All the application's <tt>.groovy</tt> files in the root directory are POGOs (a POGO contains one or more classes), and</li>
 			<li>None of the application's <tt>.groovy</tt> files in the root directory contain a <tt>main</tt> method, and</li>
+			<li>None of the application's <tt>.groovy</tt> files in the root directory contain a shebang (`#!`) declaration, and</li>
 			<li>The application does not have a <tt>WEB-INF</tt> subdirectory of its root directory.</li>
 		</ul></td>
 	</tr>
diff --git a/lib/java_buildpack/container/spring_boot_cli.rb b/lib/java_buildpack/container/spring_boot_cli.rb
@@ -52,7 +52,7 @@ def release
 
     def supports?
       gf = JavaBuildpack::Util::GroovyUtils.groovy_files(@application)
-      gf.length > 0 && all_pogo(gf) && no_main_method(gf) && !has_web_inf
+      gf.length > 0 && all_pogo(gf) && no_main_method(gf) && no_shebang(gf) && !has_web_inf
     end
 
     private
@@ -65,6 +65,10 @@ def no_main_method(groovy_files)
       none?(groovy_files) { |file| JavaBuildpack::Util::GroovyUtils.main_method? file } # note that this will scan comments
     end
 
+    def no_shebang(groovy_files)
+      none?(groovy_files) { |file| JavaBuildpack::Util::GroovyUtils.shebang? file }
+    end
+
     def has_web_inf
       @application.child('WEB-INF').exist?
     end
diff --git a/spec/fixtures/container_groovy_shebang/Application.groovy b/spec/fixtures/container_groovy_shebang/Application.groovy
@@ -1,4 +1,4 @@
-#!/usr/bin/env groovy -w
+#!/usr/bin/env groovy
 /*
  * Copyright 2013 the original author or authors.
  *
diff --git a/spec/fixtures/container_groovy_shebang_containing_class/Application.groovy b/spec/fixtures/container_groovy_shebang_containing_class/Application.groovy
@@ -0,0 +1,24 @@
+#!/usr/bin/env groovy
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class X {
+    public static void exec() {
+    	println 'Hello World'
+    }
+}
+
+X.exec()
diff --git a/spec/java_buildpack/container/groovy_spec.rb b/spec/java_buildpack/container/groovy_spec.rb
@@ -57,6 +57,12 @@
     expect(component.detect).to eq("groovy=#{version}")
   end
 
+  it 'should detect a Groovy file which has a shebang but which also contains a class',
+     app_fixture: 'container_groovy_shebang_containing_class' do
+
+    expect(component.detect).to eq("groovy=#{version}")
+  end
+
   context do
     let(:version) { '2.1.5_10' }
 
diff --git a/spec/java_buildpack/container/spring_boot_cli_spec.rb b/spec/java_buildpack/container/spring_boot_cli_spec.rb
@@ -45,6 +45,18 @@
     expect(component.detect).to be_nil
   end
 
+  it 'should not detect if one of the Groovy files has a shebang',
+     app_fixture: 'container_groovy_shebang' do
+
+    expect(component.detect).to be_nil
+  end
+
+  it 'should not detect a Groovy file which has a shebang but which also contains a class',
+     app_fixture: 'container_groovy_shebang_containing_class' do
+
+    expect(component.detect).to be_nil
+  end
+
   it 'should not detect if one of the Groovy files has a main() method',
      app_fixture: 'container_spring_boot_cli_main_method' do
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env groovy -w`
	`1`	`+#!/usr/bin/env groovy`
`2`	`2`	`/*`
`3`	`3`	`* Copyright 2013 the original author or authors.`
`4`	`4`	`*`