Moving server into a grunt task. Updating plugins page. Template and CSS clean up.

Plugin search updates

More fix updates

Forgot nodeunit

Author: vladikoff

Gruntfile.js

@@ -1,20 +1,12 @@
 'use strict';
 
 module.exports = function(grunt) {
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-less');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-jade');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-
-  // Load local tasks
-  grunt.loadTasks('tasks'); // getWiki, docs tasks
 
   // Project configuration.
   grunt.initConfig({
+    // server port, used to serve the site and run tests
+    server_port: 5678,
+
     // clean directories
     clean: {
       build: ['build/'],
@@ -64,17 +56,6 @@ module.exports = function(grunt) {
     },
     // compile page layouts
     jade: {
-      plugins: {
-        options: {
-          data: {
-            page: 'plugins',
-            title: 'Plugins'
-          }
-        },
-        files: {
-          "build/plugins.html": "src/tmpl/plugins.jade"
-        }
-      },
       notfound: {
         options: {
           data: {
@@ -113,13 +94,27 @@ module.exports = function(grunt) {
           {expand: true, cwd: 'src/', src: ['*'], dest: 'build/', filter: 'isFile'}
         ]
       }
+    },
+    nodeunit: {
+      all: ['test/*_test.js']
     }
   });
+
+  // Load contrib tasks
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-less');
+  grunt.loadNpmTasks('grunt-contrib-jade');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-nodeunit');
+  // Load local tasks
+  grunt.loadTasks('tasks'); // getWiki, docs tasks
 
-  grunt.registerTask('build', ['clean', 'copy', 'jade', 'docs', 'concat']);
+  grunt.registerTask('build', ['clean', 'copy', 'jade', 'docs', 'plugins', 'concat']);
   grunt.registerTask('default', ['build', 'less:production']);
   grunt.registerTask('dev', ['build', 'less:development', 'jshint', 'watch']);
+  grunt.registerTask('test', ['nodeunit']);
 
-  // build pack task
-  grunt.registerTask('heroku', 'default');
 };

Procfile

@@ -1 +1 @@
-web:     node server.js
+web: node node_modules/.bin/grunt server

README.md

@@ -4,17 +4,25 @@ Grunt Website
 
 ## Build
 
-1. ```npm install```
-1. ```grunt
+1. `npm install`
+1. `grunt
 
 
 ## Setup Development
 
-1. ```npm install```
-1. ```grunt```
+1. `npm install`
+1. `grunt` - gets the latest docs, generates the site
 1. use ```grunt watch``` if you are editing templates or less files. (Note: doc pages will have to be regenerated)
 
+## Run Server
+
+1. `grunt server`
+
+## Run Tests
+
+1. Make sure the server is running
+1. `grunt test`
 
 ## Notes
 
-1. Default ```server.js``` port: ```5678```.
+1. Default server port is : `5678`. Configured in the `Gruntfile`

package.json

@@ -1,27 +1,27 @@
 {
   "name": "gruntjs.com",
-  "version": "0.4.0rc2",
+  "version": "0.4.0",
   "engines": {
-    "node": ">= 0.6.0",
+    "node": ">= 0.8.0",
     "npm": "1.1.x"
   },
   "scripts": {
     "postinstall": "node_modules/.bin/grunt"
   },
   "private": true,
   "dependencies": {
-    "grunt": "0.4.0rc8",
-    "grunt-cli": "0.1.x",
-    "jade": "0.28.1",
+    "grunt": "~0.4.0",
+    "grunt-cli": "~0.1.x",
+    "jade": "~0.28.x",
     "express": "3.0.5",
-    "grunt-contrib": "0.3.0",
-    "grunt-contrib-clean": "0.4.0rc6",
-    "grunt-contrib-jshint": "~0.1.0",
-    "grunt-contrib-less": "https://github.com/gruntjs/grunt-contrib-less/tarball/master",
-    "grunt-contrib-watch": "https://github.com/gruntjs/grunt-contrib-watch/tarball/master",
-    "grunt-contrib-copy": "https://github.com/gruntjs/grunt-contrib-copy/tarball/master",
-    "grunt-contrib-jade": "https://github.com/gruntjs/grunt-contrib-jade/tarball/master",
-    "grunt-contrib-concat": "https://github.com/gruntjs/grunt-contrib-concat/tarball/master",
+    "grunt-contrib-clean": "~0.4.0",
+    "grunt-contrib-concat": "~0.1.3",
+    "grunt-contrib-nodeunit": "~0.1.2",
+    "grunt-contrib-watch": "~0.2.0",
+    "grunt-contrib-copy": "~0.4.0",
+    "grunt-contrib-less": "~0.5.0",
+    "grunt-contrib-jade": "~0.4.0",
+    "grunt-contrib-jshint": "~0.1.1",
     "marked": "https://github.com/vladikoff/marked/tarball/master",
     "highlight.js": "~7.3.0",
     "request": "~2.12.0",

server.js

@@ -17,16 +17,16 @@
         return el;
       });
 
-      // only show plugins created after the specified date
-      modules = _.filter(modules, function (el) {
-        return Date.parse(el.time.created) > new Date('1800-01-01');
-      });
-
       // filter out contrib plugins not created by the Grunt Team
       modules = _.filter(modules, function (el) {
         return el.isContrib ? el.author && el.author.name === 'Grunt Team' : true;
       });
 
+      var $contribCheck = $('#contrib-top'),
+        $pluginsTemplate = $('#plugins-all-template'),
+        $pluginsContrib = $('#plugins-contrib'),
+        $searchQuery = $('.search-query');
+
       var contribModules = _.filter(modules, function (el) {
         return !!(/^grunt-contrib/.test(el.name));
       });
@@ -35,18 +35,15 @@
         return el.name;
       });
 
-      var contribTpl = _.template($('#plugins-all-template').html(), {
+      var contribTpl = _.template($pluginsTemplate.html(), {
         modules: contribModules
       });
 
-      var allTpl = _.template($('#plugins-all-template').html(), {
+      var allTpl = _.template($pluginsTemplate.html(), {
         modules: allModules
       });
 
       $('#loading').hide();
-      var $contribCheck = $('#contrib-top'),
-          $pluginsContrib = $('#plugins-contrib'),
-          $searchQuery = $('.search-query');
 
       $searchQuery.val('');
 
@@ -79,9 +76,9 @@
       $searchQuery.removeProp('disabled').focus()
       .on('submit', false)
       .on('keyup paste', function () {
+        // disable contrib first, if searching
         if ($contribCheck.is(':checked')) $contribCheck.trigger('click');
-        $('.contrib-toggle .btn:first').click();
-        list.search($(this).val());
+        list.search( $(this).val());
       });
 
       $('#plugins-all .modified time, #plugins-contrib .modified time').timeago();