Moves gruntfile to top of project, adds testing to package.js for travis

support, configs docpad to work from project root, renames node/ folder
to server/

.gitignore

@@ -1,6 +1,6 @@
 docs/
+node_modules
 node/server.json
-node/node_modules
 
 # Numerous always-ignore extensions
 *.diff

node/Gruntfile.js → Gruntfile.js

@@ -85,7 +85,7 @@ module.exports = function(grunt) {
 
     setWatchFiles = function(action, filePath) {
       var
-        buildPath = filePath.replace('../src/', '../docs/build/').replace('less', 'css')
+        buildPath = filePath.replace('src/', 'docs/build/').replace('less', 'css')
       ;
       if(filePath.search('.less') !== -1) {
         grunt.config('less.buildDocsCSS.src', filePath);
@@ -120,15 +120,15 @@ module.exports = function(grunt) {
       },
       scripts: {
         files: [
-          '../src/**/*.js'
+          'src/**/*.js'
         ],
         tasks : testTasks
       },
       src: {
         files: [
-          '../build/examples/**/*',
-          '../src/**/*.less',
-          '../src/**/*.js'
+          'build/examples/**/*',
+          'src/**/*.less',
+          'src/**/*.js'
         ],
         tasks : watchTasks
       }
@@ -140,7 +140,7 @@ module.exports = function(grunt) {
 
     karma: {
       test: {
-        configFile : '../test/karma.conf.js',
+        configFile : 'test/karma.conf.js',
         background : true,
         reporters: 'dots'
       }
@@ -155,28 +155,28 @@ module.exports = function(grunt) {
         force: true
       },
       build : [
-        '../build/less',
-        '../build/minified',
-        '../build/packaged',
-        '../build/uncompressed'
+        'build/less',
+        'build/minified',
+        'build/packaged',
+        'build/uncompressed'
       ],
       release : [
-        '../docs/build',
-        '../docs',
-        '../rtl'
+        'docs/build',
+        'docs',
+        'rtl'
       ]
     },
 
     docco: {
       generate: {
         options: {
-          css    : '../spec/assets/docco.css',
-          output : '../spec/docs/'
+          css    : 'spec/assets/docco.css',
+          output : 'spec/docs/'
         },
         files: [
           {
             expand : true,
-            cwd    : '../spec/',
+            cwd    : 'spec/',
             src    : [
               '**.commented.js'
             ]
@@ -188,37 +188,37 @@ module.exports = function(grunt) {
     cssjanus: {
       rtl: {
         expand : true,
-        cwd    : '../build/',
+        cwd    : 'build/',
         src    : [
           '**/*.less',
           '**/*.css',
         ],
-        dest   : '../rtl'
+        dest   : 'rtl'
       },
     },
 
     less: {
 
       options: {
-        paths        : ['../src'],
+        paths        : ['src'],
         compress     : false,
         optimization : 2
       },
 
       // optimized for watch, src is built on watch task using callbacks
       buildDocsCSS: {
-        src    : '../src',
-        dest   : '../docs/build/uncompressed/',
+        src    : 'src',
+        dest   : 'docs/build/uncompressed/',
         rename : preserveFileExtensions
       },
 
       buildCSS: {
         expand : true,
-        cwd    : '../src',
+        cwd    : 'src',
         src    : [
           '**/*.less'
         ],
-        dest : '../build/uncompressed/',
+        dest : 'build/uncompressed/',
         rename: preserveFileExtensions
       }
     },
@@ -231,44 +231,44 @@ module.exports = function(grunt) {
           // exact copy for less
           {
             expand : true,
-            cwd    : '../src/**/*.less',
+            cwd    : 'src/**/*.less',
             src    : [
               '**/*'
             ],
-            dest : '../docs/build/less'
+            dest : 'docs/build/less'
           },
           // copy everything but less files for uncompressed release
           {
             expand : true,
-            cwd    : '../src/',
+            cwd    : 'src/',
             src    : [
               '**/*.js',
               'images/*',
               'fonts/*'
             ],
-            dest : '../docs/build/uncompressed'
+            dest : 'docs/build/uncompressed'
           },
           // copy everything but less for minified release
           {
             expand : true,
-            cwd    : '../src/',
+            cwd    : 'src/',
             src    : [
               '**/*.js',
               'images/*',
               'fonts/*'
             ],
-            dest : '../docs/build/minified'
+            dest : 'docs/build/minified'
           },
 
           // copy assets only for packaged version
           {
             expand : true,
-            cwd    : '../src/',
+            cwd    : 'src/',
             src    : [
               'images/*',
               'fonts/*'
             ],
-            dest : '../docs/build/packaged'
+            dest : 'docs/build/packaged'
           }
         ]
       },
@@ -279,44 +279,44 @@ module.exports = function(grunt) {
           // exact copy for less
           {
             expand : true,
-            cwd    : '../src/',
+            cwd    : 'src/',
             src    : [
               '**/*'
             ],
-            dest : '../build/less'
+            dest : 'build/less'
           },
           // copy everything but less files for uncompressed release
           {
             expand : true,
-            cwd    : '../src/',
+            cwd    : 'src/',
             src    : [
               '**/*.js',
               'images/*',
               'fonts/*'
             ],
-            dest : '../build/uncompressed'
+            dest : 'build/uncompressed'
           },
           // copy everything but less for minified release
           {
             expand : true,
-            cwd    : '../src/',
+            cwd    : 'src/',
             src    : [
               '**/*.js',
               'images/*',
               'fonts/*'
             ],
-            dest : '../build/minified'
+            dest : 'build/minified'
           },
 
           // copy assets only for packaged version
           {
             expand : true,
-            cwd    : '../src/',
+            cwd    : 'src/',
             src    : [
               'images/*',
               'fonts/*'
             ],
-            dest : '../build/packaged'
+            dest : 'build/packaged'
           }
         ]
       },
@@ -326,11 +326,11 @@ module.exports = function(grunt) {
         files: [
           {
             expand : true,
-            cwd    : '../build/',
+            cwd    : 'build/',
             src    : [
               '**'
             ],
-            dest   : '../rtl'
+            dest   : 'rtl'
           }
         ]
       },
@@ -340,11 +340,11 @@ module.exports = function(grunt) {
         files: [
           {
             expand : true,
-            cwd    : '../build/',
+            cwd    : 'build/',
             src    : [
               '**'
             ],
-            dest   : '../docs/build/'
+            dest   : 'docs/build/'
           }
         ]
       },
@@ -354,11 +354,11 @@ module.exports = function(grunt) {
         files: [
           {
             expand : true,
-            cwd    : '../spec',
+            cwd    : 'spec',
             src    : [
               '**'
             ],
-            dest   : '../docs/spec/'
+            dest   : 'docs/spec/'
           }
         ]
       },
@@ -368,11 +368,11 @@ module.exports = function(grunt) {
         files: [
           {
             expand : true,
-            cwd    : '../build/examples',
+            cwd    : 'build/examples',
             src    : [
               '**'
             ],
-            dest   : '../docs/examples/'
+            dest   : 'docs/examples/'
           }
         ]
       }
@@ -382,13 +382,13 @@ module.exports = function(grunt) {
 
     compress: {
       options: {
-        archive: '../docs/build/semantic.zip'
+        archive: 'docs/build/semantic.zip'
       },
       everything: {
         files: [
           {
             expand : true,
-            cwd    : '../build/',
+            cwd    : 'build/',
             src    : [
               '**'
             ]
@@ -401,12 +401,12 @@ module.exports = function(grunt) {
       options: {
       },
       concatenateCSS: {
-        src: ["../build/uncompressed/**/*.css"],
-        dest: "../build/packaged/css/semantic.css"
+        src: ["build/uncompressed/**/*.css"],
+        dest: "build/packaged/css/semantic.css"
       },
       concatenateJS: {
-        src: ["../build/uncompressed/**/*.js"],
-        dest: "../build/packaged/javascript/semantic.js"
+        src: ["build/uncompressed/**/*.js"],
+        dest: "build/packaged/javascript/semantic.js"
       },
     },
 
@@ -415,11 +415,11 @@ module.exports = function(grunt) {
       // copy minified css to minified release
       minifyCSS: {
         expand : true,
-        cwd    : '../build/uncompressed',
+        cwd    : 'build/uncompressed',
         src    : [
           '**/*.css'
         ],
-        dest : '../build/minified',
+        dest : 'build/minified',
         ext  : '.min.css'
       },
 
@@ -441,8 +441,8 @@ module.exports = function(grunt) {
             '*/\n'
         },
         files: {
-          '../build/packaged/css/semantic.min.css': [
-            '../build/uncompressed/**/*.css'
+          'build/packaged/css/semantic.min.css': [
+            'build/uncompressed/**/*.css'
           ]
         }
       }
@@ -452,11 +452,11 @@ module.exports = function(grunt) {
 
       minifyJS: {
         expand : true,
-        cwd    : '../build/uncompressed',
+        cwd    : 'build/uncompressed',
         src    : [
           '**/*.js'
         ],
-        dest : '../build/minified',
+        dest : 'build/minified',
         ext  : '.min.js',
         banner   : '' +
           '/*' +
@@ -492,8 +492,8 @@ module.exports = function(grunt) {
             '*/\n'
         },
         files: {
-          '../build/packaged/javascript/semantic.min.js': [
-            '../build/uncompressed/**/*.js'
+          'build/packaged/javascript/semantic.min.js': [
+            'build/uncompressed/**/*.js'
           ]
         }
       }

node/docpad.coffee → docpad.coffee

@@ -2,7 +2,8 @@
 # It is simply a CoffeeScript Object which is parsed by CSON
 docpadConfig = {
 
-	outPath: '../docs'
+	srcPath : './server'
+	outPath: './docs'
 
 	# =================================
 	# Template Data

node/.bowerrc

@@ -1,3 +0,0 @@
-{
-  "directory": "src/files/components"
-}

node/LICENSE.md

@@ -1 +0,0 @@
-Your website's license should go here

node/Procfile

@@ -1 +0,0 @@
-web: node_modules/docpad/bin/docpad-server

node/README.md

@@ -1,3 +0,0 @@
-# Semantic Docs
-
-This node project uses docpad to generate the static documentation files for Semantic UI.

node/package.json

@@ -1,38 +0,0 @@
-{
-  "semantic": {
-    "name": "Semantic UI",
-    "version": "0.5.1"
-  },
-  "dependencies": {
-    "docpad": "~6.53.4",
-    "docpad-plugin-eco": "~2.0.2",
-    "docpad-plugin-ghpages": "~2.4.0",
-    "docpad-plugin-partials": "~2.8.0"
-  },
-  "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-contrib-less": "~0.7.0",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-docco": "~0.2.0",
-    "grunt-bower-task": "~0.3.1",
-    "grunt-css": "~0.5.4",
-    "grunt-contrib-compress": "~0.5.2",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-docco-multi": "0.0.2",
-    "grunt-cssjanus": "~0.1.1",
-    "karma-script-launcher": "~0.1.0",
-    "karma-chrome-launcher": "~0.1.0",
-    "karma-firefox-launcher": "~0.1.0",
-    "karma-html2js-preprocessor": "~0.1.0",
-    "karma-jasmine": "~0.1.3",
-    "karma-requirejs": "~0.1.0",
-    "karma-coffee-preprocessor": "~0.1.0",
-    "karma-phantomjs-launcher": "~0.1.0",
-    "karma": "~0.10.2",
-    "grunt-karma": "~0.6.2"
-  }
-}

package.json

@@ -1,17 +1,45 @@
 {
-  "name"        : "semantic",
-  "preferGlobal": true,
-  "description" : "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
-  "homepage"    : "http://www.semantic-ui.com",
-  "author": "Jack Lukic <jack@myfav.es>",
-  "dependencies": {
-    "jquery"      : ">=1.8"
-  },
-  "devDependencies": {
-    "karma": "~0.8"
-  },
+  "name"         : "semantic",
+  "title"        : "Semantic UI",
+  "description"  : "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
+  "homepage"     : "http://www.semantic-ui.com",
+  "author"       : "Jack Lukic <jacklukic@gmail.com>",
+  "license": "MIT",
+
   "scripts": {
-    "test": "grunt travis --verbose"
+    "test": "grunt test --verbose"
   },
-  "license": "MIT"
+
+  "dependencies" : {
+    "docpad"                 : "~6.53.4",
+    "docpad-plugin-eco"      : "~2.0.2",
+    "docpad-plugin-ghpages"  : "~2.4.0",
+    "docpad-plugin-partials" : "~2.8.0"
+  },
+  "devDependencies": {
+    "grunt"                      : "~0.4.1",
+    "grunt-contrib-watch"        : "~0.5.3",
+    "grunt-contrib-clean"        : "~0.5.0",
+    "grunt-contrib-uglify"       : "~0.2.2",
+    "grunt-contrib-cssmin"       : "~0.6.1",
+    "grunt-contrib-less"         : "~0.7.0",
+    "grunt-contrib-copy"         : "~0.4.1",
+    "grunt-docco"                : "~0.2.0",
+    "grunt-bower-task"           : "~0.3.1",
+    "grunt-css"                  : "~0.5.4",
+    "grunt-contrib-compress"     : "~0.5.2",
+    "grunt-contrib-concat"       : "~0.3.0",
+    "grunt-docco-multi"          : "0.0.2",
+    "grunt-cssjanus"             : "~0.1.1",
+    "karma-script-launcher"      : "~0.1.0",
+    "karma-chrome-launcher"      : "~0.1.0",
+    "karma-firefox-launcher"     : "~0.1.0",
+    "karma-html2js-preprocessor" : "~0.1.0",
+    "karma-jasmine"              : "~0.1.3",
+    "karma-requirejs"            : "~0.1.0",
+    "karma-coffee-preprocessor"  : "~0.1.0",
+    "karma-phantomjs-launcher"   : "~0.1.0",
+    "karma"                      : "~0.10.2",
+    "grunt-karma"                : "~0.6.2"
+  }
 }

server/README.md

@@ -0,0 +1,17 @@
+# Semantic Docs
+
+## How to Use
+
+This folder contains the templates used to generate the static website for Semantic UI
+
+To create the docs yourself run
+
+```
+npm install -g docpad
+docpad install eco;
+docpad update; docpad upgrade;
+```
+
+This node project uses docpad to generate the static documentation files for Semantic UI.
+
+