Move package.json to root so the repo can be installed as a dependanc…

…y via npm

Closes #156

.gitignore

@@ -4,7 +4,6 @@
 *.iml
 .idea
 
-package.json
 npm-debug.log
 node_modules/
 *_git-remotes/
@@ -16,4 +15,3 @@ test_coverage/
 assets/public/
 target/
 assets/error_pages/assets/
-assets/bower_components/

assets/gulpfile.js/config.js → gulpfile.js/config.js

@@ -20,9 +20,9 @@ Test:
 - Spec reporter
 */
 
-var src = './',
-    dest = './public/',
-    distDir = './dist/',
+var src = './assets/',
+    dest = src + 'public/',
+    distDir = src + 'dist/',
     snapshotDir = dest + '999-SNAPSHOT/',
     govuk = {
       elements: src + 'govuk_elements',
@@ -34,27 +34,26 @@ module.exports = {
   dest: './public/',
   distDir: './dist/',
 
-  browserSync: {
-    ui: false,
-    port: 9032,
-    open: false,
-    server: {
-      baseDir: src,
-      directory: true,
-      routes: {
-        '/assets': dest
-      }
-    }
+  production: {
+    jsSrc: distDir + 'javascripts/*.js',
+    jsDest: distDir + 'javascripts/',
+    imagesDir: distDir + 'images',
+    cssSrc: distDir + 'stylesheets',
+    dest: distDir
   },
 
   scripts: {
     src: src + 'javascripts/modules/**/*.js',
     dest: snapshotDir + 'javascripts',
     entryPoint: src + 'javascripts/application.js',
-    jshintExclude: '!javascripts/**/{base64v1_0,details.polyfill,mdtpdf}.js',
-    jscsSrc: src + '.jscsrc',
+    jshintExclude: '!' + src + 'javascripts/**/{base64v1_0,details.polyfill,mdtpdf}.js',
+    jscsSrc: '.jscsrc',
+    gulpTasks: 'gulpfile.js/**/*.js',
     encryptionSrc: src + 'javascripts/encryption/**/*.js',
-    gulpTasks: src + 'gulpfile.js/**/*.js',
+    encryptionDest: {
+      dev: snapshotDir + 'javascripts/',
+      prod: distDir + 'javascripts/'
+    },
     vendorDest: {
       dev: snapshotDir + 'javascripts/vendor/',
       prod: distDir + 'javascripts/vendor/'
@@ -94,7 +93,7 @@ module.exports = {
   },
 
   sass: {
-    src: 'scss/**/*.scss',
+    src: src + 'scss/**/*.scss',
     govukSrc: govuk.template + '/public/sass/**/*.scss',
     govukElementsSrc: govuk.elements + '/public/sass/**/*.scss',
     dev: {
@@ -144,25 +143,18 @@ module.exports = {
   test: {
     specsScr: src + 'test/specs/unit/**/*.js',
     fixturesScr: src + 'test/specs/fixtures/*.html',
-    karma: src + 'test/config/karma.conf.js'
+    karmaConfig: src + 'test/config/karma.conf.js'
   },
 
-  server: {
-    options: {
-      port: 9032,
-      server: src + 'server.js',
-      bases: src
-    },
-    dist: {
-      root: dest + '999-SNAPSHOT/'
+  browserSync: {
+    ui: false,
+    port: 9032,
+    open: false,
+    server: {
+      baseDir: src,
+      routes: {
+        '/assets': dest
+      }
     }
-  },
-
-  production: {
-    jsSrc: distDir + 'javascripts/*.js',
-    jsDest: distDir + 'javascripts/',
-    imagesDir: distDir + 'images',
-    cssSrc: distDir + 'stylesheets',
-    dest: distDir
   }
 };

assets/gulpfile.js/tasks/concat.js → gulpfile.js/tasks/concat.js

@@ -1,17 +1,21 @@
 'use strict';
 
 var gulp =  require('gulp'),
+    gulpIf =  require('gulp-if'),
   	config = require('../config'),
     concat = require('gulp-concat'),
     uglify = require('gulp-uglify'),
   	rename = require('gulp-rename');
 
 gulp.task('concatEncryption', function() {
+  var env   = global.runmode,
+      isDev = (env === 'dev');
+
   return gulp.src(config.scripts.encryptionSrc)
 		.pipe(concat('encryption.js'))
-    .pipe(uglify())
+    .pipe(gulpIf(!isDev, uglify()))
     .pipe(rename(function (path) {
       path.extname = ".min.js"
     }))
-		.pipe(gulp.dest(config.production.jsDest));
+		.pipe(gulp.dest(config.scripts.encryptionDest[env]));
 });

assets/gulpfile.js/tasks/default.js → gulpfile.js/tasks/default.js

@@ -4,5 +4,9 @@ var gulp        = require('gulp'),
     runSequence = require('run-sequence');
 
 gulp.task('default', ['clean'], function () {
-  runSequence(['sass', 'images'], 'modernizr', 'watch');
+  runSequence(
+    ['sass', 'images', 'concatEncryption'],
+    'modernizr',
+    'watch'
+  );
 });

gulpfile.js/tasks/test.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var fs        = require('fs'),
+    gulp      = require('gulp'),
+  	karma     = require('karma').server,
+  	config    = require('../config').test,
+    karmaTask = function(done) {
+      karma.start({
+        configFile: fs.realpathSync(config.karmaConfig),
+        singleRun: true
+      },
+      function() {
+        done ();
+      });
+    };
+
+gulp.task('test', ['jshint'],  karmaTask);

assets/package.json → package.json

@@ -84,10 +84,10 @@
     "validate": "./node_modules/jquery-validation/src/core.js",
     "delegate": "./node_modules/jquery-validation/src/delegate.js",
     "basicpunc": "./node_modules/jquery-validation/src/additional/letterswithbasicpunc.js",
-    "mdtpdf": "./javascripts/modules/mdtpdf.js",
+    "mdtpdf": "./assets/javascripts/modules/mdtpdf.js",
     "stageprompt": "./node_modules/stageprompt/script/stageprompt.js",
-    "details": "./javascripts/modules/details.polyfill.js",
-    "govuk-template": "./govuk_elements/govuk/public/javascripts/govuk-template.js",
+    "details": "./assets/javascripts/modules/details.polyfill.js",
+    "govuk-template": "./assets/govuk_elements/govuk/public/javascripts/govuk-template.js",
     "datatables": "./node_modules/datatables/media/js/jquery.dataTables.js",
     "base64": "./node_modules/js-base64/base64.js",
     "json3": "./node_modules/json3/lib/json3.js"

server.sh

@@ -9,8 +9,6 @@ deps() {
   npm install
 }
 
-cd assets/
-
 if [[ -n $1 ]]; then
   case "$1" in