Merge 68524510-zip-file to master

nebhale · nebhale · commit 37ee367bc9db · 2014-03-31T10:08:21.000+01:00
[Completes #68524510]
diff --git a/.idea/dictionaries/bhale.xml b/.idea/dictionaries/bhale.xml
diff --git a/Gemfile b/Gemfile
@@ -4,6 +4,7 @@ group :development do
   gem 'rake'
   gem 'redcarpet'
   gem 'rubocop'
+  gem 'rubyzip'
   gem 'yard'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -43,6 +43,7 @@ GEM
     ruby-debug-ide (0.4.22)
       rake (>= 0.8.1)
     ruby-progressbar (1.4.2)
+    rubyzip (1.1.2)
     safe_yaml (1.0.1)
     simplecov (0.8.2)
       docile (~> 1.1.0)
@@ -67,6 +68,7 @@ DEPENDENCIES
   rubocop
   ruby-debug-base19x (>= 0.11.30.pre)
   ruby-debug-ide
+  rubyzip
   simplecov
   tee
   webmock
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ The online package is a version of the buildpack that is as minimal as possible
 bundle install
 bundle exec rake package
 ...
-Creating build/java-buildpack-cfd6b17.tar.gz
+Creating build/java-buildpack-cfd6b17.zip
 ```
 
 ### Offline Package
@@ -86,7 +86,7 @@ The offline package is a version of the buildpack designed to run without access
 bundle install
 bundle exec rake package OFFLINE=true
 ...
-Creating build/java-buildpack-offline-cfd6b17.tar.gz
+Creating build/java-buildpack-offline-cfd6b17.zip
 ```
 
 ### Package Versioning
@@ -96,7 +96,7 @@ Keeping track of different versions of the buildpack can be difficult.  To help
 bundle install
 bundle exec rake package VERSION=2.1
 ...
-Creating build/java-buildpack-2.1.tar.gz
+Creating build/java-buildpack-2.1.zip
 ```
 
 ## Running Tests
diff --git a/java-buildpack.iml b/java-buildpack.iml
@@ -293,6 +293,7 @@
     <orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.4.2, rbenv: 1.9.3-p545) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.2, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.1, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.8.2, rbenv: 1.9.3-p545) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.8.0, rbenv: 1.9.3-p545) [gem]" level="application" />
diff --git a/rakelib/package.rb b/rakelib/package.rb
@@ -34,6 +34,6 @@ module Package
 
   VERSION = (ENV['VERSION'] || HASH).freeze
 
-  PACKAGE_NAME = "#{BUILD_DIR}/java-buildpack#{'-offline' if OFFLINE}-#{VERSION}.tar.gz".freeze
+  PACKAGE_NAME = "#{BUILD_DIR}/java-buildpack#{'-offline' if OFFLINE}-#{VERSION}.zip".freeze
 
 end
diff --git a/rakelib/package_task.rb b/rakelib/package_task.rb
@@ -17,6 +17,7 @@
 require 'rake/clean'
 require 'rake/tasklib'
 require 'rakelib/package'
+require 'zip'
 
 module Package
 
@@ -35,7 +36,12 @@ def initialize
 
       task PACKAGE_NAME => [BUILD_DIR, STAGING_DIR] do |t|
         rake_output_message "Creating #{t.name}"
-        `tar czf #{t.name} -C #{STAGING_DIR} .`
+
+        Zip::File.open(t.name, Zip::File::CREATE) do |zipfile|
+          Dir[File.join(STAGING_DIR, '**', '**')].each do |file|
+            zipfile.add(file.sub("#{STAGING_DIR}/", ''), file)
+          end
+        end
       end
     end
 
