package.json cleanup, Phase 4

- @cantremember/node-mocks-http
- config efficiency
- ci integration
- travis-ci.org
- coveralls.io
- #!/bin/bash
- massive dependency upgrade
- httpMocks.createRequest({ query })
- supertest#expect(302) for all redirects
- mock and retrieve from request#query Object hash
- throw an Error in supertest#expect filters

.travis.yml

@@ -0,0 +1,22 @@
+language: node_js
+node_js:
+  - "0.12"
+  - "0.10"
+  - stable
+
+before_install:
+  - "npm install -g npm@^2.7.x"
+script: "npm run ci"
+
+branches:
+  only:
+    - master
+    - develop
+    # - edge
+
+# http://docs.travis-ci.com/user/build-configuration/
+#   services: []
+#   env: []
+#   before_script: []
+#   after_failure: []
+#   after_script: []

README.md

@@ -2,4 +2,24 @@
 
 A Node.js app to replace legacy Perl CGI scripts for [sleepbot.com](http://sleepbot.com)
 
+  [![Build status][travis-img]][travis-url]
+  [![Test coverage][coveralls-img]][coveralls-url]
+  [![Dependency status][david-img]][david-url]
+  [![License][license-img]][license-url]
+
 Provided as a code example, since no one in their right might has any need for this besides me.
+
+
+## License
+
+[WTFPL][license-url]
+
+
+[travis-img]: https://img.shields.io/travis/cantremember/node-sleepbot-cgi.svg?style=flat-square
+[travis-url]: https://travis-ci.org/cantremember/node-sleepbot-cgi
+[coveralls-img]: https://img.shields.io/coveralls/cantremember/node-sleepbot-cgi.svg?style=flat-square
+[coveralls-url]: https://coveralls.io/r/cantremember/node-sleepbot-cgi
+[david-img]: https://img.shields.io/david/cantremember/node-sleepbot-cgi.svg?style=flat-square
+[david-url]: https://david-dm.org/cantremember/node-sleepbot-cgi
+[license-img]: https://img.shields.io/badge/license-WTFPL-blue.svg?style=flat-square
+[license-url]: LICENSE

app/lookitImgFoley.js

@@ -8,8 +8,8 @@ var theLib = require('../lib/index');
 module.exports = function handler(req, res, cb) {
     return Promise.resolve()
     .then(function() {
-        var title = req.param('title') || '(image)';
-        var image = req.param('image');
+        var title = req.query.title || '(image)';
+        var image = req.query.image;
         image = (image
             ? ('/lookit/images/dfoley/' + image)
             : '/images/shim_clear.gif'

app/morganLayout.js

@@ -48,7 +48,7 @@ module.exports = function handler(req, res, cb) {
 
     // parameters
     //   1..10 cards, assume 3
-    var cardCount = req.param('cards');
+    var cardCount = req.query.cards;
 
     cardCount = ((cardCount === undefined || cardCount === null)
         ? 3

app/sebPlaylist.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // TODO:
-//   support req.params('format'), M3U, etc.
+//   support req.params.format, M3U, etc.
 //   is M3U just a single line with a URL?
 
 var theLib = require('../lib/index');

config/default.js

@@ -5,10 +5,9 @@ var path = require('path');
 
 module.exports = {
     httpPort: 3000,
-    wwwRoot: '/Volumes/GrandMasterKashik/archive/http',
+    wwwRoot: '/mnt/ec2-http/sleepbot.com',
     baseURL: 'http://www.sleepbot.com',
-    // baseURL: 'http://sleepbot.localhost:8080',
-    // baseURL: 'http://localhost:3000',
+    caching: false,
 
     viewsRoot: path.resolve(
         path.join(__dirname, '../views') // relative to *me*

config/dev.js

@@ -2,8 +2,8 @@
 
 
 module.exports = {
-    // overrides
     wwwRoot: '/Volumes/GrandMasterKashik/archive/http',
+    caching: false,
 
-    baseURL: 'http://localhost:3000',
+    // baseURL: 'http://localhost:3000',
 };

config/production.js

@@ -2,9 +2,5 @@
 
 
 module.exports = {
-    // overrides
-    wwwRoot: '/mnt/ec2-http/sleepbot.com',
     caching: true,
-
-    baseURL: 'http://www.sleepbot.com',
 };

config/test.js

@@ -2,11 +2,9 @@
 
 
 module.exports = {
-    // overrides
     wwwRoot: '/mock-fs',
-
     baseURL: 'http://localhost:3000',
-    // baseURL: 'http://sleepbot.localhost:8080',
+    caching: false,
 
     viewsRoot: '/mock-fs',
 

package.json

@@ -1,55 +1,64 @@
 {
   "name": "node-sleepbot-cgi",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "A Node.js app to replace legacy Perl CGI scripts for sleepbot.com",
-  "author": "Daniel M Foley",
+  "author": "Daniel M Foley <webmaster@sleepbot.com>",
+  "repository": {
+    "type": "git",
+    "url": "ssh://git@sink.cantremember.com/opt/git-repo/node-sleepbot-cgi.git"
+  },
   "license": "WTFPL",
   "homepage": "http://sleepbot.com",
   "email": "webmaster@sleepbot.com",
+  "keywords": [
+    "sleepbot"
+  ],
   "main": "index.js",
   "directories": {
     "app": "./app",
     "lib": "./lib"
   },
+  "files": [],
+  "readmeFilename": "README.md",
   "scripts": {
     "postinstall": "./run/post-install",
     "test": "BLUEBIRD_DEBUG=1 NODE_ENV=test ./node_modules/.bin/mocha test",
     "test-debug": "BLUEBIRD_DEBUG=1 NODE_ENV=test ./node_modules/.bin/mocha debug test",
+    "ci": "./run/ci",
     "lint": "./run/lint",
     "style": "./run/style",
     "coverage": "./run/coverage",
     "doc": "./run/doc",
-    "dev": "BLUEBIRD_DEBUG=1 NODE_ENV=test node app.js"
+    "dev": "BLUEBIRD_DEBUG=1 NODE_ENV=dev node app.js"
   },
-  "repository": {
-    "type": "git",
-    "url": "ssh://git@sink.cantremember.com/opt/git-repo/node-sleepbot-cgi.git"
+  "engines": {
+    "node": ">= 0.10.0"
   },
-  "readmeFilename": "README.md",
   "dependencies": {
-    "bluebird": "~2.3.2",
+    "bluebird": "^2.9.0",
     "cookie-parser": "~1.3.2",
-    "csv": "0.4.x",
-    "ejs": "~1.0.0",
-    "express": "~4.8.7",
-    "forever": "~0.11.1",
-    "glob": "~4.0.5",
+    "csv": "^0.4.0",
+    "ejs": "^2.3.0",
+    "express": "^4.12.0",
+    "forever": "~0.14.0",
+    "glob": "^5.0.0",
     "lodash": "^3.8.0",
     "marked-engine": "~0.1.0",
     "minimist": "~1.1.0",
     "nconf": "~0.7.1",
-    "request": "~2.40.0"
+    "request": "^2.55.0"
   },
   "devDependencies": {
-    "istanbul": "~0.2.7",
+    "@cantremember/node-mocks-http": "^1.5.0",
+    "coveralls": "^2.11.2",
+    "istanbul": "~0.3.14",
     "jscs": "^1.12.0",
     "jsdoc": "3.3.0-beta1",
     "jshint": "^2.6.3",
-    "mocha": "^1.21.4",
+    "mocha": "^2.2.0",
     "mock-fs": "^2.6.0",
-    "node-mocks-http": "git+ssh://git@github.com:cantremember/node-mocks-http.git#master",
     "proxyquire": "^1.4.0",
     "sinon": "^1.10.3",
-    "supertest": "~0.13.0"
+    "supertest": "~1.0.0"
   }
 }

run/ci

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+source `dirname $0`/common
+
+# https://github.com/cainus/node-coveralls
+
+pushd . > /dev/null
+cd $ROOT
+
+OUTPUT=./coverage/lcov.info
+rm -f $OUTPUT
+
+NODE_ENV=test $NODE_BIN/istanbul cover $NODE_BIN/_mocha test -- --reporter dot
+if [[ "$?" != "0" ]]; then
+    FAIL "Test Suite failed"
+fi
+
+cat $OUTPUT | $NODE_BIN/coveralls
+
+popd > /dev/null
+
+SUCCEED "CI passed!"

run/common

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # paths
 #   walk up to find package.json @ ROOT
@@ -13,26 +13,27 @@ NODE_BIN=$ROOT/node_modules/.bin
 JS_DIRS="app/ app.js config/ index.js lib/ run/ test/ views/"
 
 # colors
-C_INFO="\033[97;40m"
-C_OK="\033[97;42m"
-C_ERR="\033[97;41m"
-C_WARN="\033[97;43m"
+#   http://www.csc.uvic.ca/~sae/seng265/fall04/tips/s265s047-tips/bash-using-colors.html
+C_INFO="\033[1;37;40m"
+C_OK="\033[1;30;42m"
+C_ERR="\033[1;30;41m"
+C_WARN="\033[1;30;43m"
 C_CLOSE="\033[0m"
 
 # logging and resolution
 function INFO () {
-    echo "$C_INFO INFO $C_CLOSE $1"
+    echo -e "$C_INFO INFO $C_CLOSE $1"
 }
 function WARN () {
-    echo "$C_WARN WARN $C_CLOSE $1"
+    echo -e "$C_WARN WARN $C_CLOSE $1"
 }
 function FAIL () {
-    echo "$C_ERR FAIL $C_CLOSE $1"
+    echo -e "$C_ERR FAIL $C_CLOSE $1"
     cd $PWD
     exit 1
 }
 function SUCCEED () {
-    echo "$C_OK  OK  $C_CLOSE $1"
+    echo -e "$C_OK  OK  $C_CLOSE $1"
     cd $PWD
     exit 0
 }

run/coverage

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 source `dirname $0`/common
 

run/doc

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 source `dirname $0`/common
 

run/lint

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 source `dirname $0`/common
 

run/post-install

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 source `dirname $0`/common
 

run/pre-commit

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 source `dirname $0`/common
 
@@ -31,7 +31,7 @@ fi
 #
 
 INFO "linting"
-npm run-script lint
+npm run lint
 if [[ "$?" != "0" ]]; then # there were failures
     exit 1 # already reported itself
 fi
@@ -41,7 +41,7 @@ fi
 #
 
 INFO "styling"
-npm run-script style
+npm run style
 if [[ "$?" != "0" ]]; then # there were failures
     exit 1 # already reported itself
 fi

run/style

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 source `dirname $0`/common