From bfd6ea5913542a036e4975d7ba272e7026c2bcaf Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Thu, 19 Sep 2013 13:45:09 -0700
Subject: [PATCH] Switched to grunt-contrib-compress, added tar.gz archive

---
 Gruntfile.js | 53 ++++++++++++++++++++++++++++++++++++++++++++--------
 package.json |  5 ++---
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 28c57888e29..88906b29de1 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -161,11 +161,42 @@ module.exports = function (grunt) {
         // Target-specific file lists and/or options go here.
       },
     },
-    zip: {
-      dist: {
-        cwd: '<%= destDir %>',
-        src: ['<%= destDir %>/**/*','LICENSE.md','README.md'],
-        dest: '<%= tempDir %>/dist.zip'
+    compress: {
+      zip: {
+        options: {
+          archive: '<%= tempDir %>/<%= pkg.name %>-latest.zip'
+        },
+        files : [
+          {
+            expand: true,
+            cwd: '<%= destDir %>',
+            src: ['**/*'],
+            dest: '<%= pkg.name %>-latest'
+          },
+          {
+            expand: true,
+            src: ['LICENSE.md','README.md'],
+            dest: '<%= pkg.name %>-latest'
+          }
+        ]
+      },
+      tgz: {
+        options: {
+          archive: '<%= tempDir %>/<%= pkg.name %>-latest.tar.gz'
+        },
+        files : [
+          {
+            expand: true,
+            cwd: '<%= destDir %>',
+            src: ['**/*'],
+            dest: '<%= pkg.name %>-latest'
+          },
+          {
+            expand: true,
+            src: ['LICENSE.md','README.md'],
+            dest: '<%= pkg.name %>-latest'
+          }
+        ]
       }
     },
     s3: {
@@ -175,8 +206,12 @@ module.exports = function (grunt) {
         // debug: true, // uncommment to prevent actual upload
         upload: [
           {
-            src: '<%= tempDir %>/dist.zip',
+            src: '<%= tempDir %>/<%= pkg.name %>-latest.zip',
             dest: 'kibana/kibana/<%= pkg.name %>-latest.zip',
+          },
+          {
+            src: '<%= tempDir %>/<%= pkg.name %>-latest.tar.gz',
+            dest: 'kibana/kibana/<%= pkg.name %>-latest.tar.gz',
           }
         ]
       }
@@ -272,7 +307,8 @@ module.exports = function (grunt) {
   grunt.registerTask('distribute', [
     'distribute:load_s3_config',
     'build',
-    'zip:dist',
+    'compress:zip',
+    'compress:tgz',
     's3:dist',
     'clean:temp'
   ]);
@@ -288,7 +324,6 @@ module.exports = function (grunt) {
 
   // load plugins
   grunt.loadNpmTasks('grunt-s3');
-  grunt.loadNpmTasks('grunt-zip');
   grunt.loadNpmTasks('grunt-ngmin');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-less');
@@ -300,6 +335,8 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-string-replace');
   grunt.loadNpmTasks('grunt-contrib-htmlmin');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
+  grunt.loadNpmTasks('grunt-contrib-compress');
+
 
   // pass the config to grunt
   grunt.initConfig(config);
diff --git a/package.json b/package.json
index 5b60c089b8d..14dad04497d 100755
--- a/package.json
+++ b/package.json
@@ -7,10 +7,8 @@
   "version": "3.0.0m3pre",
   "devDependencies": {
     "rjs-build-analysis": "0.0.3",
-
     "grunt": "~0.4.0",
     "grunt-s3": "~0.2.0-alpha.2",
-    "grunt-zip": "~0.9.2",
     "grunt-ngmin": "0.0.3",
     "grunt-contrib": "~0.7.0",
     "grunt-contrib-less": "~0.7.0",
@@ -23,7 +21,8 @@
     "grunt-string-replace": "~0.2.4",
     "grunt-contrib-htmlmin": "~0.1.3",
     "grunt-contrib-requirejs": "~0.4.1",
-    "grunt-angular-templates": "~0.3.12"
+    "grunt-angular-templates": "~0.3.12",
+    "grunt-contrib-compress": "~0.5.2"
   },
   "license": "Apache License"
 }