Merge remote-tracking branch 'upstream/master'

 language: node_js
 node_js:
 - '0.10'
-- '0.11'
 script: npm run-script test-travis
-after_script: npm install coveralls@2 && cat ./coverage/lcov.info | coveralls
+after_script:
+- npm install -g coveralls@2
+- cat ./coverage/lcov.info | coveralls
+- npm install -g codeclimate-test-reporter
+- cat ./coverage/lcov.info | codeclimate
 notifications:
   webhooks:
     urls:
@@ -14,3 +17,9 @@ notifications:
   hipchat:
     rooms:
       secure: SZAghgIWk6b8rpItdkjSY8UJtTW8E8AIYE5KkTGa9FiV0/q9kTHIAiqxBAQyIgF9IVsrO2NZdO9FrsiKjkSUPXbkonxtuqptl2c7bJLm2gUNmku2DfG0hn8TY50MXxGpiyEySoxcX4igQTzSZlJM81T0EI+L0PQJJXUKEJGuadY=
+  slack:
+    secure: 3uMd7XP25L2pPQ+4yzWmlSwsTBaiTERvTrA/e+Nz69g+nMpNviMVMRtLF/wlp01eehgNJ9InVdQ7Bq+MqS4eJPtqjVass7a3IplMIvjugMPlzw9eCEDxrxdbW649jw2esVKOj0eB40zhLrsV1AtxPyENIWeOn8uvVNjMLhiNiUs=
+addons:
+  code_climate:
+    repo_token:
+      secure: BZej5nHBS+etVd/Xlq0uFRxgsbhh1njqvQZkBIec1kW6u+g9k16y1GVKGzlZsThlSUkIcmZ36N7MGstRNCJ5cuY5dLq914xqm8gZGvK15EzcdqroLPLOctkeJ6/KADqCQwI9L9bhP87kNTAcuNAljAJthiO3swM4fM7nLEQMbkQ=

@@ -5,6 +5,7 @@
 [![Build Status][travis-image]][travis-url]
 [![NPM downloads][npm-downloads]][npm-url]
 [![Test Coverage][coveralls-image]][coveralls-url]
+[![Static Analysis][codeclimate-image]][codeclimate-url]
 [![MIT License][license-image]][license-url]
 [![Gitter][gitter-image]][gitter-url]
 
@@ -164,6 +165,7 @@ app.listen(settings.port, function() {
 
 ## Components
 
+* [email](#email)
 * [error-handler](#error-handler)
 * [knex](#knex)
 * [logger](#logger)
@@ -174,6 +176,31 @@ app.listen(settings.port, function() {
 * [settings](#settings)
 * [update-notifier](#update-notifier)
 
+### email
+
+> Returns a function which accepts templateName, locals, headers, transport, and callback arguments.  This component uses
+
+[View source](lib/boot/email.js)
+
+```js
+// example - email
+
+// TODO: finish this!
+
+// mention that transport defaults to settings.email.transport
+
+// mention that headers inherits settings.email.headers
+
+// but only if you don't set `headers.useDefaults: false`
+
+// note that is also uses `settings.email.templates` object
+// which can have `dir` string and `options` object for node email-templates pkg
+
+// also document about having `transport` of `settings.email.transport` be an
+// actual transporter already pre-created (possibly with plugins like html-to-text)
+
+```
+
 ### error-handler
 
 > Returns [Express][express] route middleware for error handling.
@@ -410,6 +437,8 @@ See [nifty-conventions][nifty-conventions] for code guidelines, general project
 [MIT][license-url]
 
 
+[codeclimate-image]: http://img.shields.io/codeclimate/github/niftylettuce/igloo.svg?style=flat
+[codeclimate-url]: https://codeclimate.com/github/niftylettuce/igloo
 [license-image]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
 [license-url]: LICENSE
 [nifty-conventions]: https://github.com/niftylettuce/nifty-conventions

+
+// # boot - email
+
+var nodemailer = require('nodemailer')
+var emailTemplates = require('email-templates')
+var _ = require('underscore')
+
+exports = module.exports = function(settings) {
+
+  // check to make sure we defined a default email object
+  if (!_.isObject(settings.email))
+    throw new Error('Settings did not have an `email` object')
+
+  // check to make sure settings.email.templates is defined
+  if (!_.isObject(settings.email.templates))
+    throw new Error('Settings did not have a `settings.email.templates` object')
+
+  // check to make sure settings.email.templates.dir is defined
+  if (!_.isString(settings.email.templates.dir))
+    throw new Error('Settings did not have a `settings.email.templates.dir` string')
+
+  var templateName, locals, headers, callback, transporter
+
+  function renderTemplate(_templateName, _locals, _headers, transport, _callback) {
+
+    templateName = _templateName
+    locals = _locals
+    headers = _headers
+    callback = _callback
+
+    // add ability to override default transport defined in settings
+    if (_.isFunction(transport)) {
+
+      // check to make sure we defined a default transport object
+      if (!_.isObject(settings.email.transport))
+        throw new Error('Settings did not have an `email.transport` object')
+
+      callback = transport
+
+      //
+      // if the transport defined in settings is an actual transport
+      // (as opposed to just a config object) then we need to use that
+      // instead of creating a transport - to do so we'll look for the
+      // `.transporter` property that gets added to all transport objects
+      // <https://github.com/andris9/Nodemailer/blob/master/src/nodemailer.js#L39>
+      //
+      // the reason we have this support added is in case users add plugins to
+      // their transporter, for example the `nodemailer-html-to-text` plugin
+      // <https://github.com/andris9/nodemailer-html-to-text>
+      //
+      if (_.has(settings.email.transport, 'transporter'))
+        transporter = settings.email.transport
+      else
+        transporter = nodemailer.createTransport(settings.email.transport)
+
+    } else {
+      transporter = nodemailer.createTransport(transport)
+    }
+
+    if (_.isObject(settings.email.templates.options))
+      return emailTemplates(settings.email.templates.dir, settings.email.templates.options, createTemplate)
+
+    emailTemplates(settings.email.templates.dir, createTemplate)
+
+  }
+
+  function createTemplate(err, template) {
+    if (err) throw err
+    template(templateName, locals, createEmail(headers))
+  }
+
+  function createEmail(headers) {
+    return function(err, html, text) {
+      if (err) return callback(err)
+      // if we defined a default headers object, then inherit it here
+      // but only if we didn't set `useDefaults` to false in the headers
+      if (_.isObject(settings.email.headers) && !headers.useDefaults)
+        headers = _.defaults(headers, settings.email.headers)
+      if (_.isString(html))
+        headers.html = html
+      if (_.isString(text))
+        headers.text = text
+      transporter.sendMail(headers, callback)
+    }
+  }
+
+  return renderTemplate
+
+}
+
+exports['@singleton'] = true
+exports['@require'] = [ 'igloo/settings' ]

@@ -53,9 +53,28 @@ exports = module.exports = function(settings) {
     transports: transports
   })
 
+  if (settings.server.env === 'development')
+    logger = expandErrors(logger)
 
   return logger
 
+  // Extend a winston by making it expand errors when passed in as the
+  // second argument (the first argument is the log level).
+  // <https://gist.github.com/johndgiese/59bd96360ce411042294>
+  // <https://gist.github.com/getvega/6211610>
+  function expandErrors(logger) {
+    var oldLogFunc = logger.log
+    logger.log = function() {
+      var args = Array.prototype.slice.call(arguments, 0)
+      if (args.length >= 2 && args[1] instanceof Error) {
+        args[1] = args[1].stack
+      }
+      return oldLogFunc.apply(this, args)
+    };
+    return logger
+  }
+
+
 }
 
 exports['@singleton'] = true

@@ -5,20 +5,24 @@ var _ = require('underscore')
 var util = require('util')
 var mergeDefaults = require('merge-defaults')
 
-exports = module.exports = function(config, local) {
+exports = module.exports = function(IoC, config) {
 
   var settings = {}
 
   var env = process.env.NODE_ENV || 'development'
 
-  if (!_.isObject(local))
-    local = {}
-
-  mergeDefaults(config, local)
-
   if (!_.isObject(config[env]))
     throw new Error(util.format('Unknown environment %s', env))
 
+  if (env === 'development') {
+    try {
+      var local = IoC.create('local')
+      if (_.isObject(local))
+        mergeDefaults(settings, local)
+    } catch(e) {
+    }
+  }
+
   mergeDefaults(settings, config[env], config.defaults)
 
   return settings
@@ -26,13 +30,4 @@ exports = module.exports = function(config, local) {
 }
 
 exports['@singleton'] = true
-exports['@require'] = ['config']
-
-var fs = require('fs')
-var path = require('path')
-var localPath = path.join(__dirname, '..', '..', '..', '..' ,'boot', 'local.js')
-
-// Include local.js if it exists at boot/local.js
-if (fs.existsSync(localPath)) {
-  exports['@require'].push('local')
-}
+exports['@require'] = [ '$container', 'config' ]

 {
   "name": "igloo",
-  "version": "0.0.4-rc.13",
+  "version": "0.0.4-rc.14",
   "description": "Igloo is a lightweight, fast, and minimal framework for rapid development",
   "main": "./lib",
   "repository": {
@@ -32,8 +32,10 @@
     "chalk": "^0.4.0",
     "commander": "^2.2.0",
     "connect-redis": "~2.0.0",
+    "email-templates": "^1.1.2",
     "express-session": "^1.2.1",
     "merge-defaults": "^0.1.0",
+    "nodemailer": "^1.3.0",
     "to-camel-case": "^0.2.1",
     "underscore": "^1.6.0",
     "update-notifier": "^0.2.0",