Compile script

nebhale · nebhale · commit 714a46557003 · 2013-05-07T10:22:09.000-07:00
Previously, the buildpack did not meet the contractual obligations for
the compile phase of the buildpack lifecycle.  This change adds a
bin/compile shell script which delegates to a ruby class internally.
This class currently does nothing, but will need to delegate to
buildpack components in the future.

[#49321271]
diff --git a/bin/compile b/bin/compile
@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# Cloud Foundry Java Buildpack
+# Copyright (c) 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.
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+require 'java_buildpack'
+
+build_dir = ARGV[0]
+cache_dir = ARGV[1]
+
+begin
+  JavaBuildpack::Compile.new(build_dir, cache_dir).run
+rescue => e
+  abort e.message
+end
+
diff --git a/bin/detect b/bin/detect
@@ -19,4 +19,14 @@ require 'java_buildpack'
 
 build_dir = ARGV[0]
 
-JavaBuildpack::Detect.new(build_dir).run
+begin
+  components = JavaBuildpack::Detect.new(build_dir).run
+  unless components.empty?
+    puts components
+  else
+    abort
+  end
+rescue => e
+  abort e.message
+end
+
diff --git a/lib/java-buildpack/compile.rb b/lib/java-buildpack/compile.rb
@@ -0,0 +1,35 @@
+# Cloud Foundry Java Buildpack
+# Copyright (c) 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.
+
+# Encapsulates the compilation functionality in the Java buildpack
+class JavaBuildpack::Compile
+
+  # Creates a new instance, passing in the application directory used during compilation
+  #
+  # @param [String] app_dir The application directory used during compilation
+  # @param [String] app_cache_dir The application cache directory used during compilation
+  def initialize(app_dir, app_cache_dir)
+
+  end
+
+  # The execution entry point for detection.  This method is responsible for identifying all of the components that are
+  # that which to participate in the buildpack and returning their names.
+  #
+  # @return [void]
+  def run
+
+  end
+
+end
diff --git a/lib/java-buildpack/detect.rb b/lib/java-buildpack/detect.rb
@@ -13,14 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Encapsulates the detection functionality in the Java buildpack
 class JavaBuildpack::Detect
 
+  # Creates a new instance, passing in the application directory used during detection
+  #
+  # @param [String] app_dir The application directory used during detection
   def initialize(app_dir)
 
   end
 
+  # The execution entry point for detection.  This method is responsible for identifying all of the components that are
+  # that which to participate in the buildpack and returning their names.
+  #
+  # @return [Array<String>] the names of components that wish to participate in the buildpack
   def run
-
+    []
   end
 
 end
diff --git a/lib/java_buildpack.rb b/lib/java_buildpack.rb
@@ -17,6 +17,6 @@
 module JavaBuildpack
 end
 
+require 'java-buildpack/compile'
 require 'java-buildpack/detect'
-#require 'java-buildpack/compile'
 #require 'java-buildpack/release'
diff --git a/spec/bin/compile_spec.rb b/spec/bin/compile_spec.rb
@@ -0,0 +1,38 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 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 'spec_helper'
+require 'open3'
+
+describe 'compile' do
+
+  it 'should return zero if the compile is successful' do
+    # TODO Implement test as things are filled out
+  end
+
+  it 'should return non-zero if an error occurs' do
+    # TODO Implement test as things are filled out
+  end
+
+  it 'should print the error message if an error occurs' do
+    # TODO Implement test as things are filled out
+  end
+
+  private
+
+  COMPILE = File.expand_path('../../../bin/compile', __FILE__)
+  FIXTURES_DIR = File.expand_path('../../fixtures', __FILE__)
+
+end
diff --git a/spec/bin/detect_spec.rb b/spec/bin/detect_spec.rb
@@ -0,0 +1,50 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 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 'spec_helper'
+require 'open3'
+
+describe 'detect' do
+
+  it 'should return non-zero if the application is not Java' do
+    Open3.popen3("#{DETECT} #{FIXTURES_DIR}/non-java") do |stdin, stdout, stderr, wait_thr|
+      expect(stdout.read).to eq('')
+      expect(stderr.read).to eq('')
+      expect(wait_thr.value).to_not be_success
+    end
+  end
+
+  it 'should return zero if the application is Java' do
+    # TODO Implement test as things are filled out
+  end
+
+  it 'should print the names of participating components if the application is Java' do
+    # TODO Implement test as things are filled out
+  end
+
+  it 'should return non-zero if an error occurs' do
+    # TODO Implement test as things are filled out
+  end
+
+  it 'should print the error message if an error occurs' do
+    # TODO Implement test as things are filled out
+  end
+
+  private
+
+  DETECT = File.expand_path('../../../bin/detect', __FILE__)
+  FIXTURES_DIR = File.expand_path('../../fixtures', __FILE__)
+
+end
diff --git a/spec/fixtures/non-java/test.js b/spec/fixtures/non-java/test.js
