Merge 61282032-class-files-not-groovy to master

Glyn Normington · Glyn Normington · commit 2874ca9331cb · 2013-11-29T16:11:24.000Z
[Completes #61282032]
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
diff --git a/.idea/runConfigurations/Without_Integration_Tests.xml b/.idea/runConfigurations/Without_Integration_Tests.xml
diff --git a/docs/container-groovy.md b/docs/container-groovy.md
@@ -7,6 +7,8 @@ The Groovy Container allows a uncompiled (i.e. `*.groovy`) to be run.
 			<li>A <tt>.groovy</tt> file exists which has a <tt>main()</tt> method, or</li>
 			<li>A <tt>.groovy</tt> file exists which is not a POGO (a POGO contains one or more classes), or</li>
 			<li>A <tt>.groovy</tt> file exists which has a shebang (<tt>#!</tt>) declaration</li>
+		</ul>and<ul>
+			<li>No <tt>.class</tt> files exist</li>
 		</ul></td>
 	</tr>
 	<tr>
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/java-buildpack.iml b/java-buildpack.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RUBY_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/lib/java_buildpack" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/bin" isTestSource="false" />
diff --git a/lib/java_buildpack/container/groovy.rb b/lib/java_buildpack/container/groovy.rb
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require 'java_buildpack/container'
+require 'java_buildpack/util/class_file_utils'
 require 'java_buildpack/util/format_duration'
 require 'java_buildpack/util/groovy_utils'
 require 'java_buildpack/versioned_dependency_component'
@@ -50,7 +51,9 @@ def release
     protected
 
     def supports?
-      main_groovy
+      class_files = JavaBuildpack::Util::ClassFileUtils.class_files(@application)
+
+      class_files.empty? && main_groovy
     end
 
     private
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/lib/java_buildpack/util/class_file_utils.rb b/lib/java_buildpack/util/class_file_utils.rb
@@ -0,0 +1,42 @@
+# Encoding: utf-8
+# Cloud Foundry Java Buildpack
+# 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.
+
+require 'pathname'
+require 'java_buildpack/util'
+
+module JavaBuildpack::Util
+
+  # Utilities for dealing with .class files
+  class ClassFileUtils
+
+    # Returns all the .class files in the given directory
+    #
+    # @param [Application] application the application to search
+    # @return [Array] a possibly empty list of files
+    def self.class_files(application)
+      application.glob(CLASS_FILE_PATTERN).reject { |path| path.directory? }
+      .map { |path| application.relative_path_to path }.sort
+    end
+
+    private_class_method :new
+
+    private
+
+    CLASS_FILE_PATTERN = '**/*.class'.freeze
+
+  end
+
+end
diff --git a/spec/fixtures/container_groovy_non_pogo_with_class_file/A.class b/spec/fixtures/container_groovy_non_pogo_with_class_file/A.class
diff --git a/spec/fixtures/container_groovy_non_pogo_with_class_file/logback.groovy b/spec/fixtures/container_groovy_non_pogo_with_class_file/logback.groovy
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+import static ch.qos.logback.classic.Level.INFO
+
+root(INFO)
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
@@ -45,12 +45,24 @@
     expect(component.detect).to eq("groovy=#{version}")
   end
 
+  it 'should not detect a Groovy file with non-POGO and at least one .class file',
+     app_fixture: 'container_groovy_non_pogo_with_class_file' do
+
+    expect(component.detect).to be_nil
+  end
+
   it 'should detect a Groovy file with #!',
      app_fixture: 'container_groovy_shebang' do
 
     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
 
