Merge branch 'development'

ansble · Jun 16, 2014 · d962df8 · d962df8
2 parents 36bcdc5 + a8f687e
commit d962df8
Show file tree

Hide file tree

Showing 17 changed files with 4,037 additions and 53 deletions.
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -6,6 +6,7 @@ var gulp = require('gulp')
     , rename = require('gulp-rename')
     , zip = require('gulp-zip')
     , jshint = require('gulp-jshint')
+    , header = require('gulp-header')
 
     , pkg = require('./package.json');
 
@@ -29,21 +30,24 @@ gulp.task('localBuild', function(){
 
 gulp.task('generateForPublish', function(){
     'use strict';
+    var headerText = '/****************************************\nAction! v' + pkg.version + ' ' + pkg.releaseName + ' \nhttps://github.com/designfrontier/Action \n****************************************/\n';
 
     gulp.src('public/javascripts/action.js')
+        .pipe(header(headerText))
+        .pipe(gulp.dest('packages/latest/'))
         .pipe(rename('action-v' + pkg.version + '.js'))
         .pipe(gulp.dest('packages/' + pkg.version + '/'))
         .pipe(uglify())
+        .pipe(header(headerText))
+        .pipe(rename('action.min.js'))
+        .pipe(gulp.dest('packages/latest/'))
         .pipe(rename('action-v' + pkg.version + '.min.js'))
         .pipe(gulp.dest('packages/' + pkg.version + '/'));
 });
 
 gulp.task('publish', ['generateForPublish'], function(){
     'use strict';
 
-     // gulp.src(['packages/' + pkg.version + '/*.js'])
-     //    .pipe(zip('action.zip'))
-     //    .pipe(gulp.dest('packages/' + pkg.version + '/'));
 });
 
 // gulp.task('default', function () {

diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "action",
-  "version": "0.4.0",
+  "version": "0.4.1",
+  "releaseName": "Akshay Kumar",
   "private": true,
   "scripts": {
     "start": "node app.js"
@@ -10,13 +11,14 @@
     "ejs": "*"
   },
   "devDependencies": {
-    "gulp-concat": "^2.2.0",
     "gulp": "^3.6.0",
-    "gulp-uglify": "^0.2.1",
+    "gulp-concat": "^2.2.0",
+    "gulp-header": "^1.0.2",
+    "gulp-jshint": "^1.5.5",
     "gulp-plumber": "^0.6.0",
-    "gulp-watch": "^0.5.4",
     "gulp-rename": "^1.2.0",
-    "gulp-zip": "^0.3.4",
-    "gulp-jshint": "^1.5.5"
+    "gulp-uglify": "^0.2.1",
+    "gulp-watch": "^0.5.4",
+    "gulp-zip": "^0.3.4"
   }
 }
diff --git a/packages/0.3.0/action-v0.3.0.js b/packages/0.3.0/action-v0.3.0.js
@@ -25,11 +25,6 @@ var action = function(){
                     eventStack = action.eventStore[eventNameIn];
                 }
 
-                // if(typeof eventDataIn !== 'undefined'){
-                //  //we have some event data
-                //  eventData.payload = eventDataIn;
-                // }
-
                 //emit the event
                 if(typeof eventStack !== 'undefined'){
                     for(i = 0; i < eventStack.length; i ++){