Merge 49321577-which-java-system-properties to master

nebhale · nebhale · commit eadd0bbfb287 · 2013-05-08T17:28:06.000-07:00
[Completes #49321577]
diff --git a/bin/compile b/bin/compile
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+$stdout.sync = true
 $:.unshift File.expand_path("../../lib", __FILE__)
+
 require 'java_buildpack'
 
 build_dir = ARGV[0]
diff --git a/bin/detect b/bin/detect
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+$stdout.sync = true
 $:.unshift File.expand_path("../../lib", __FILE__)
+
 require 'java_buildpack'
 
 build_dir = ARGV[0]
diff --git a/bin/release b/bin/release
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+$stdout.sync = true
 $:.unshift File.expand_path("../../lib", __FILE__)
+
 require 'java_buildpack'
 
 build_dir = ARGV[0]
diff --git a/java-buildpack.gemspec b/java-buildpack.gemspec
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
+  s.add_dependency 'java-buildpack-utils', '~> 1.0'
+
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'redcarpet', '~> 2.2'
diff --git a/lib/java-buildpack/compile.rb b/lib/java-buildpack/compile.rb
@@ -16,20 +16,21 @@
 # Encapsulates the compilation functionality in the Java buildpack
 class JavaBuildpack::Compile
 
-  # Creates a new instance, passing in the application directory used during compilation
+  # Creates a new instance, passing in the application directory and application cache directories 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)
-
+    @jre = JavaBuildpackUtils::Jre::Compile.new(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
-
+    @jre.run
   end
 
 end
diff --git a/lib/java-buildpack/detect.rb b/lib/java-buildpack/detect.rb
@@ -20,15 +20,16 @@ class JavaBuildpack::Detect
   #
   # @param [String] app_dir The application directory used during detection
   def initialize(app_dir)
-
+    @jre = JavaBuildpackUtils::Jre::Detect.new(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
-    []
+    components = []
+    components << @jre.run
   end
 
 end
diff --git a/lib/java-buildpack/release.rb b/lib/java-buildpack/release.rb
@@ -13,21 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'yaml'
+
 # Encapsulates the release functionality in the Java buildpack
 class JavaBuildpack::Release
 
   # Creates a new instance, passing in the application directory used during release
   #
   # @param [String] app_dir The application directory used during release
   def initialize(app_dir)
-
+    @jre = JavaBuildpackUtils::Jre::Release.new(app_dir)
   end
 
   # The execution entry point for release.  This method is responsible for generating a payload describing the execution
   # command used to start the application.
   #
   # @return [String] the YAML formatted payload describing the execution command used to start the application
   def run
+    java_home = @jre.run
+
     {
         addons: [],
         config_vars: {},
diff --git a/lib/java_buildpack.rb b/lib/java_buildpack.rb
@@ -17,6 +17,8 @@
 module JavaBuildpack
 end
 
+require 'java_buildpack_utils'
+
 require 'java-buildpack/compile'
 require 'java-buildpack/detect'
 require 'java-buildpack/release'
diff --git a/spec/bin/compile_spec.rb b/spec/bin/compile_spec.rb
@@ -18,21 +18,25 @@
 
 describe 'compile' do
 
-  it 'should return zero if the compile is successful' do
-    # TODO Implement test as things are filled out
+  before do
+    @previous_value = ENV['BUILDPACK_CACHE']
+    ENV['BUILDPACK_CACHE'] = Dir.tmpdir
   end
 
-  it 'should return non-zero if an error occurs' do
-    # TODO Implement test as things are filled out
+  after do
+    ENV['BUILDPACK_CACHE'] = @previous_value
   end
 
-  it 'should print the error message if an error occurs' do
-    # TODO Implement test as things are filled out
-  end
+  it 'should return zero if the compile is successful' do
+    FIXTURE = 'spec/fixtures/java'
 
-  private
+    Dir.mktmpdir do |root|
+      FileUtils.cp_r "#{FIXTURE}/.", root
 
-  COMPILE = File.expand_path('../../../bin/compile', __FILE__)
-  FIXTURES_DIR = File.expand_path('../../fixtures', __FILE__)
+      Open3.popen3("bin/compile #{root}") do |stdin, stdout, stderr, wait_thr|
+        expect(wait_thr.value).to be_success
+      end
+    end
+  end
 
 end
diff --git a/spec/bin/detect_spec.rb b/spec/bin/detect_spec.rb
@@ -19,32 +19,21 @@
 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('')
+    Open3.popen3("bin/detect spec/fixtures/non-java") do |stdin, stdout, stderr, wait_thr|
       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
+    Open3.popen3("bin/detect spec/fixtures/java") do |stdin, stdout, stderr, wait_thr|
+      expect(wait_thr.value).to be_success
+    end
   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
+    Open3.popen3("bin/detect spec/fixtures/java") do |stdin, stdout, stderr, wait_thr|
+      expect(stdout.read).to match(/java-openjdk-8/)
+    end
   end
 
-  private
-
-  DETECT = File.expand_path('../../../bin/detect', __FILE__)
-  FIXTURES_DIR = File.expand_path('../../fixtures', __FILE__)
-
 end
diff --git a/spec/bin/release_spec.rb b/spec/bin/release_spec.rb
@@ -19,20 +19,15 @@
 describe 'release' do
 
   it 'should return zero if the release is successful' do
-    # TODO Implement test as things are filled out
+    Open3.popen3("bin/release spec/fixtures/java") do |stdin, stdout, stderr, wait_thr|
+      expect(wait_thr.value).to be_success
+    end
   end
 
-  it 'should return non-zero if an error occurs' do
-    # TODO Implement test as things are filled out
+  it 'should print the execution command payload' do
+    Open3.popen3("bin/release spec/fixtures/java") do |stdin, stdout, stderr, wait_thr|
+      expect(stdout.read).to match("---\n:addons: \\[\\]\n:config_vars: {}\n:default_process_types:\n  :web: ''\n")
+    end
   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/release', __FILE__)
-  FIXTURES_DIR = File.expand_path('../../fixtures', __FILE__)
-
 end
diff --git a/spec/fixtures/java/system.properties b/spec/fixtures/java/system.properties
@@ -0,0 +1,2 @@
+java.runtime.vendor=openjdk
+java.runtime.version=8
diff --git a/spec/java-buildpack/compile_spec.rb b/spec/java-buildpack/compile_spec.rb
@@ -0,0 +1,44 @@
+# 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.
+
+require 'spec_helper'
+
+describe JavaBuildpack::Compile do
+
+  before do
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+
+    @previous_value = ENV['BUILDPACK_CACHE']
+    ENV['BUILDPACK_CACHE'] = Dir.tmpdir
+  end
+
+  after do
+    ENV['BUILDPACK_CACHE'] = @previous_value
+  end
+
+  it 'should extract Java' do
+    FIXTURE = 'spec/fixtures/java'
+
+    Dir.mktmpdir do |root|
+      FileUtils.cp_r "#{FIXTURE}/.", root
+      JavaBuildpack::Compile.new(root, Dir.tmpdir).run
+
+      absolute_java_home = File.join(root, JavaBuildpackUtils::Jre::JAVA_HOME, 'bin', 'java')
+      expect(File.exists?(absolute_java_home)).to be_true
+    end
+  end
+
+end
diff --git a/spec/java-buildpack/detect_spec.rb b/spec/java-buildpack/detect_spec.rb
@@ -0,0 +1,25 @@
+# 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.
+
+require 'spec_helper'
+
+describe JavaBuildpack::Detect do
+
+  it 'should return the id of the Java being used' do
+    components = JavaBuildpack::Detect.new('spec/fixtures/java').run
+    expect(components).to include('java-openjdk-8')
+  end
+
+end
diff --git a/spec/java-buildpack/release_spec.rb b/spec/java-buildpack/release_spec.rb
@@ -0,0 +1,26 @@
+# 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.
+
+require 'spec_helper'
+
+describe JavaBuildpack::Release do
+
+
+  it 'should return the execution command payload' do
+    payload = JavaBuildpack::Release.new('spec/fixtures/java').run
+    expect(payload).to eq("---\n:addons: []\n:config_vars: {}\n:default_process_types:\n  :web: ''\n")
+  end
+
+end
