Make compile and release robust if detect fails

Glyn Normington · Glyn Normington · commit 5fc2c4acdcdc · 2013-08-13T11:30:55.000+01:00
Compile and release now log errors if no application is detected.

[#53862463]
diff --git a/lib/java_buildpack/buildpack.rb b/lib/java_buildpack/buildpack.rb
@@ -72,33 +72,49 @@ def detect
     #
     # @return [void]
     def compile
-      FileUtils.mkdir_p @lib_directory
+      the_container = container
+      if the_container
+        FileUtils.mkdir_p @lib_directory
+
+        jre.compile
+        frameworks.each { |framework| framework.compile }
+        container.compile
+      else
+        diagnose_detect_failure
+      end
+    end
 
-      jre.compile
-      frameworks.each { |framework| framework.compile }
-      container.compile
+    def diagnose_detect_failure
+      logger = JavaBuildpack::Diagnostics::LoggerFactory.get_logger
+      logger.error 'no supported application type was detected'
     end
 
     # Generates the payload required to run the application.  The payload format is defined by the
     # {Heroku Buildpack API}[https://devcenter.heroku.com/articles/buildpack-api#buildpack-api].
     #
     # @return [String] The payload required to run the application.
     def release
-      jre.release
-      frameworks.each { |framework| framework.release }
-      command = container.release
-
-      payload = {
-          'addons' => [],
-          'config_vars' => {},
-          'default_process_types' => {
-              'web' => command
-          }
-      }.to_yaml
-
-      @logger.debug { "Release Payload #{payload}" }
+      the_container = container
+      if the_container
+        jre.release
+        frameworks.each { |framework| framework.release }
+        command = the_container.release
+
+        payload = {
+            'addons' => [],
+            'config_vars' => {},
+            'default_process_types' => {
+                'web' => command
+            }
+        }.to_yaml
+
+        @logger.debug { "Release Payload #{payload}" }
+
+        payload
+      else
+        diagnose_detect_failure
+      end
 
-      payload
     end
 
     private_class_method :new
diff --git a/spec/bin/compile_spec.rb b/spec/bin/compile_spec.rb
@@ -20,4 +20,11 @@
 
 describe 'compile script', :integration do
 
+  it 'should fail to compile when no containers detect' do
+    Dir.mktmpdir do |root|
+      error = Open3.capture3("bin/compile #{root}")[1]
+      expect(error).to match(/no supported application type was detected/)
+    end
+  end
+
 end
diff --git a/spec/bin/release_spec.rb b/spec/bin/release_spec.rb
@@ -32,6 +32,13 @@
     end
   end
 
+  it 'should fail to release when no containers detect' do
+    Dir.mktmpdir do |root|
+      error = Open3.capture3("bin/release #{root}")[1]
+      expect(error).to match(/no supported application type was detected/)
+    end
+  end
+
   def with_memory_limit(memory_limit)
     previous_value = ENV['MEMORY_LIMIT']
     begin
