Merge branch '812-config-yml' into main

Signed-off-by: Ben Hale <[email protected]>

Author: nebhale

.idea/codeStyles/Project.xml

@@ -24,4 +24,4 @@ require 'java_buildpack/buildpack'
 
 app_dir = ARGV[0]
 
-JavaBuildpack::Buildpack.with_buildpack(app_dir, 'Compile failed with exception %s', &:compile)
+JavaBuildpack::Buildpack.with_buildpack(app_dir, nil, nil, 'Compile failed with exception %s', &:compile)

.idea/runConfigurations/All_Tests__2_3_.xml

@@ -24,7 +24,8 @@ require 'java_buildpack/buildpack'
 
 app_dir = ARGV[0]
 
-components = JavaBuildpack::Buildpack.with_buildpack(app_dir, 'Detect failed with exception %s', &:detect).compact
+components = JavaBuildpack::Buildpack.with_buildpack(app_dir, nil, nil, 'Detect failed with exception %s',
+                                                     &:detect).compact
 
 if components.empty?
   abort

.idea/runConfigurations/All_Tests__2_5_.xml

@@ -22,6 +22,8 @@ $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'java_buildpack/buildpack'
 
-app_dir = ARGV[0]
+app_dir  = ARGV[0]
+deps_dir = ARGV[2]
+index    = ARGV[3]
 
-JavaBuildpack::Buildpack.with_buildpack(app_dir, 'Finalize failed with exception %s', &:compile)
+JavaBuildpack::Buildpack.with_buildpack(app_dir, deps_dir, index, 'Finalize failed with exception %s', &:compile)

.idea/runConfigurations/All_Tests__2_6_.xml

@@ -24,6 +24,6 @@ require 'java_buildpack/buildpack'
 
 app_dir = ARGV[0]
 
-output = JavaBuildpack::Buildpack.with_buildpack(app_dir, 'Release failed with exception %s', &:release)
+output = JavaBuildpack::Buildpack.with_buildpack(app_dir, nil, nil, 'Release failed with exception %s', &:release)
 
 puts output

.idea/runConfigurations/All_Tests__2_4_.xml renamed to .idea/runConfigurations/All_Tests__2_7_.xml

@@ -73,6 +73,14 @@ def compile
       container.compile
 
       log_cache_contents
+
+      return if @deps_dir.nil? || @index.nil?
+
+      FileUtils.mkdir_p File.join(@deps_dir, @index)
+      File.write(
+        File.join(@deps_dir, @index, 'config.yml'),
+        { 'name' => 'java', 'config' => {}, 'version' => @buildpack_version.to_s(false) }.to_yaml
+      )
     end
 
     # Generates the payload required to run the application.  The payload format is defined by the
@@ -114,9 +122,11 @@ def release
 
     private_constant :BUILDPACK_MESSAGE, :LOAD_ROOT
 
-    def initialize(app_dir, application)
+    def initialize(app_dir, deps_dir, index, application)
       @logger = Logging::LoggerFactory.instance.get_logger Buildpack
       @buildpack_version = BuildpackVersion.new
+      @deps_dir = deps_dir
+      @index = index
 
       log_arguments
       log_environment_variables
@@ -260,12 +270,12 @@ class << self
       # @param [String] message an error message with an insert for the reason for failure
       # @yield [Buildpack] the buildpack to work with
       # @return [Object] the return value from the given block
-      def with_buildpack(app_dir, message)
+      def with_buildpack(app_dir, deps_dir, index, message)
         app_dir = Pathname.new(File.expand_path(app_dir))
         Logging::LoggerFactory.instance.setup app_dir
         application = Component::Application.new(app_dir)
 
-        yield new(app_dir, application) if block_given?
+        yield new(app_dir, deps_dir, index, application) if block_given?
       rescue StandardError => e
         handle_error(e, message)
       end

.idea/runConfigurations/Without_Integration_Tests__2_3_.xml

@@ -85,7 +85,7 @@ def to_hash
     # @return [String] a +String+ representation of the version
     def to_s(human_readable = true)
       s = []
-      s << @version.blue if @version
+      s << (human_readable ? @version.blue : @version) if @version
       s << (human_readable ? '(offline)'.blue : 'offline') if @offline
 
       if remote_string

.idea/runConfigurations/Without_Integration_Tests__2_5_.xml

@@ -39,9 +39,11 @@
 
   let(:stub_jre2) { instance_double('StubJre2', detect: nil, compile: nil, release: nil, component_name: 'StubJre2') }
 
+  let(:deps_dir) { Pathname.new Dir.mktmpdir }
+
   let(:buildpack) do
     buildpack = nil
-    described_class.with_buildpack(app_dir, 'Error %s') { |b| buildpack = b }
+    described_class.with_buildpack(app_dir, deps_dir, '0', 'Error %s') { |b| buildpack = b }
     buildpack
   end
 
@@ -64,6 +66,14 @@
     allow(Test::StubJre2).to receive(:new).and_return(stub_jre2)
   end
 
+  after do |example|
+    if example.metadata[:no_cleanup]
+      puts "Deps Directory: #{deps_dir}"
+    else
+      FileUtils.rm_rf deps_dir
+    end
+  end
+
   it 'raises an error if more than one container can run an application' do
     allow(stub_container1).to receive(:detect).and_return('stub-container-1')
     allow(stub_container2).to receive(:detect).and_return('stub-container-2')
@@ -88,12 +98,11 @@
 
     before do
       allow(JavaBuildpack::Util::ConfigurationUtils)
-        .to receive(:load).with('components')
-                          .and_return(
-                            'containers' => [],
-                            'frameworks' => ['JavaBuildpack::Framework::JavaOpts'],
-                            'jres' => []
-                          )
+        .to receive(:load).with('components').and_return(
+          'containers' => [],
+          'frameworks' => ['JavaBuildpack::Framework::JavaOpts'],
+          'jres' => []
+        )
     end
 
     it 'requires files needed for components' do
@@ -152,7 +161,7 @@
   end
 
   def with_buildpack(&_)
-    described_class.with_buildpack(app_dir, 'Error %s') { |buildpack| yield buildpack }
+    described_class.with_buildpack(app_dir, nil, nil, 'Error %s') { |buildpack| yield buildpack }
   end
 
 end