s3 task finished

.gitignore

@@ -44,3 +44,4 @@ npm-debug.log
 lib/build/dist
 lib/build/node_modules
 public/assets
+lib/build/grunt-aws.json

lib/build/Gruntfile.js

@@ -38,11 +38,9 @@
       // Jasmine tests
       jasmine:  require('./tasks/jasmine.js').task(),
 
-      aws_s3: require('./tasks/s3.js').task(),
+      s3: require('./tasks/s3.js').task(),
 
-      uglify: require('./tasks/uglify.js').task(),
-
-      compress: require('./tasks/compress.js').task()
+      uglify: require('./tasks/uglify.js').task()
 
     });
 
@@ -54,5 +52,6 @@
     grunt.registerTask('test',    ['concat:js', 'jst', 'jasmine']);
     grunt.registerTask('css',     ['copy', 'compass', 'concat:css']);
     grunt.registerTask('default', ['clean', 'concat:js', 'css', 'jst']);
+    grunt.registerTask('release',  ['clean', 'concat:js', 'css', 'jst', 'uglify', 's3']);
 
   };

lib/build/package.json

@@ -33,9 +33,9 @@
     "grunt-contrib-clean": "~0.5.0",
     "grunt-concurrent": "~0.5.0",
     "load-grunt-tasks": "~0.2.0",
-    "grunt-aws-s3": "~0.8.1",
     "grunt-contrib-uglify": "~0.4.0",
-    "grunt-contrib-compress": "~0.7.0"
+    "grunt-contrib-compress": "~0.7.0",
+    "grunt-aws": "~0.3.0"
   },
   "files": [
     "dist"

lib/build/tasks/s3.js

@@ -2,27 +2,76 @@
 module.exports = {
   task: function() {
     return {
-      options: {
-        accessKeyId: '<%= aws.key %>', // Use the variables
-        secretAccessKey: '<%= aws.secret %>', // You can also use env variables
-        uploadConcurrency: 5, // 5 simultaneous uploads
-        downloadConcurrency: 5, // 5 simultaneous downloads
+     options: {
+        accessKeyId: "<%= aws.key%>",
+        secretAccessKey: "<%= aws.secret %>",
+        bucket: '<%= aws.bucket %>',
       },
-      production: {
+      js: {
         options: {
-          bucket: '<%= aws.bucket %>',
-          //differential: true
-          params: {
-            "CacheControl": "max-age=630720000, public",
-            "Expires": new Date(Date.now() + 63072000000)
+          headers: {
+            "Cache-Control": "max-age=630720000, public",
+            "Expires": new Date(Date.now() + 63072000000).toUTCString()
+          },
+          gzip: true
+        },
+        cwd: '<%= assets_dir %>',
+        src: "**/*.min.js",
+        dest: "cartodbui/<%= pkg.version %>/"
+      },
+      css: {
+        options: {
+          headers: {
+            "Cache-Control": "max-age=630720000, public",
+            "Expires": new Date(Date.now() + 63072000000).toUTCString()
+          },
+          gzip: true
+        },
+        cwd: '<%= assets_dir %>',
+        src: "**/*.css",
+        dest: "cartodbui/<%= pkg.version %>/"
+      },
+      images: {
+        options: {
+          headers: {
+            "Cache-Control": "max-age=630720000, public",
+            "Expires": new Date(Date.now() + 63072000000).toUTCString()
           }
         },
-        files: [
-          {expand: true, cwd: '<%= root_assets_dir %>', src: ['**/*'], dest: 'cartodbui/', action: 'upload'}
-        ]
+        cwd: '<%= assets_dir %>',
+        src: "images/**/*",
+        dest: "cartodbui/<%= pkg.version %>/"
       }
     }
 
+    //return {
+      //options: {
+        //accessKeyId: '<%= aws.key %>', // Use the variables
+        //secretAccessKey: '<%= aws.secret %>', // You can also use env variables
+        //uploadConcurrency: 5, // 5 simultaneous uploads
+        //downloadConcurrency: 5, // 5 simultaneous downloads
+      //},
+      //production: {
+        //options: {
+          //bucket: '<%= aws.bucket %>',
+          ////differential: true
+          //params: {
+            //"CacheControl": "max-age=630720000, public",
+            //"Expires": new Date(Date.now() + 63072000000)
+          //}
+        //},
+        //files: [
+          //{
+            //expand: true,
+            //cwd: '<%= root_assets_dir %>',
+            //src: ['**/*'], 
+            //dest: 'cartodbui/',
+            //action: 'upload'
+          //}
+        //]
+      //}
+    //}
+
 
     //return {
       //options: {