Seriously, don't create sandboxes in detect and release

nebhale · nebhale · commit 5e1edd5ff958 · 2014-01-10T15:02:25.000Z
An earlier attempt to prevent sandboxes from being created in detect
and release wasn't entirely successful.  This change finishes the job
and ensures that, seriously, sandboxes aren't created when they
shouldn't be.

[#62947962]
diff --git a/lib/java_buildpack/component/base_component.rb b/lib/java_buildpack/component/base_component.rb
@@ -132,7 +132,7 @@ def download_zip(version, uri, strip_top_level = true, target_directory = @dropl
             Dir.mktmpdir do |root|
               shell "unzip -qq #{file.path} -d #{root} 2>&1"
 
-              FileUtils.rm_r target_directory
+              FileUtils.mkdir_p target_directory.parent
               FileUtils.mv Pathname.new(root).children.first, target_directory
             end
           else
diff --git a/lib/java_buildpack/component/droplet.rb b/lib/java_buildpack/component/droplet.rb
@@ -53,6 +53,10 @@ class Droplet
     #                                                    excludes files in the sandboxes of other components
     attr_reader :root
 
+    # @!attribute [r] sandbox
+    #   @return [Pathname] the root of the component's sandbox
+    attr_reader :sandbox
+
     # Creates a new instance of the droplet abstraction
     #
     # @param [AdditionalLibraries] additional_libraries     the shared +AdditionalLibraries+ instance for all components
@@ -94,14 +98,6 @@ def copy_resources(target_directory = @sandbox)
       end
     end
 
-    # Returns the root of the component's sandbox
-    #
-    # @return [Pathname] the root of the component's sandbox
-    def sandbox
-      FileUtils.mkdir_p @sandbox unless @sandbox.exist?
-      @sandbox
-    end
-
     private
 
     RESOURCES_DIRECTORY = Pathname.new(File.expand_path('../../../../resources', __FILE__))
diff --git a/lib/java_buildpack/container/tomcat.rb b/lib/java_buildpack/container/tomcat.rb
@@ -112,6 +112,7 @@ def download_support
 
     def expand(file)
       with_timing "Expanding Tomcat to #{@droplet.sandbox.relative_path_from(@droplet.root)}" do
+        FileUtils.mkdir_p @droplet.sandbox
         shell "tar xzf #{file.path} -C #{@droplet.sandbox} --strip 1 --exclude webapps 2>&1"
 
         @droplet.copy_resources
diff --git a/spec/java_buildpack/component/droplet_spec.rb b/spec/java_buildpack/component/droplet_spec.rb
@@ -82,18 +82,4 @@
     droplet.copy_resources
   end
 
-  it 'should not initialize sandbox until it is used' do
-    sandbox_dir = app_dir + '.java-buildpack/droplet'
-
-    expect(sandbox_dir).not_to exist
-
-    droplet
-
-    expect(sandbox_dir).not_to exist
-
-    droplet.sandbox
-
-    expect(sandbox_dir).to exist
-  end
-
 end
