Skip to content
Browse files

Merge branch 'develop' of github.com:yahoo/mojito into multi-appjson

  • Loading branch information...
2 parents de14e87 + 69270fa commit 2a796b627ac8da7b40829f797ab4c76c9e72faff @caridy committed Jan 11, 2013
Showing with 18 additions and 5 deletions.
  1. +9 −2 docs/dev_guide/resources/index.rst
  2. +1 −1 lib/app/commands/build/index.js
  3. +8 −2 lib/mojito.js
View
11 docs/dev_guide/resources/index.rst
@@ -6,8 +6,9 @@ The following sections provide supplementary material about Mojito:
- :ref:`additional_resources-presentations`
- :ref:`additional_resources-screencasts`
-- `Community`_
-- `Publications`_
+- :ref:`additional_resources-community`
+- :ref:`res_community-pubs`
+- :ref:`additional_resources-archived_docs`
.. _additional_resources-presentations:
@@ -239,4 +240,10 @@ Blogs
- `Yahoo! Announces Cocktails – Shaken, Not Stirred <http://developer.yahoo.com/blogs/ydn/posts/2011/11/yahoo-announces-cocktails-%E2%80%93-shaken-not-stirred/>`_
- `How YQL powers Cocktails, the technology behind Livestand <http://developer.yahoo.com/blogs/ydn/posts/2011/11/how-yql-powers-cocktails-the-technology-behind-livestand/>`_
+.. _additional_resources-archived_docs:
+Archived Documentation
+======================
+
+- Mojito v0.3 (`General <http://developer.yahoo.com/cocktails/mojito/v0.3/docs/>`_\/`API <http://developer.yahoo.com/cocktails/mojito/v0.3/docs/>`_)
+- Mojito v0.4 (`General <http://developer.yahoo.com/cocktails/mojito/v0.4/docs/>`_\/`API <http://developer.yahoo.com/cocktails/mojito/v0.4/api/>`_)
View
2 lib/app/commands/build/index.js
@@ -46,7 +46,7 @@ function getConfigs(opts, buildtype, builddir, store) {
snapshot: {
name: opts.snapshotName || '',
tag: opts.snapshotTag || '',
- packages: dotbuild.snapshotPackages || {}
+ packages: dotbuild.packages || {}
},
build: {
attachManifest: dotbuild.attachManifest || false,
View
10 lib/mojito.js
@@ -7,6 +7,7 @@
/*jslint anon:true, sloppy:true, nomen:true, node:true*/
+'use strict';
// ----------------------------------------------------------------------------
// Prerequisites
@@ -349,12 +350,17 @@ MojitoServer.prototype._configureAppInstance = function(app, options) {
MojitoServer.prototype._configureLogger = function(Y) {
var logLevel = (Y.config.logLevel || 'debug').toLowerCase(),
logLevelOrder = Y.config.logLevelOrder || [],
- defaultLogLevel = logLevelOrder[0] || 'info';
+ defaultLogLevel = logLevelOrder[0] || 'info',
+ isatty = process.stdout.isTTY;
function log(c, msg, cat, src) {
var f,
m = (src) ? src + ': ' + msg : msg;
- if (Y.Lang.isFunction(c.logFn)) {
+
+ // if stdout is bound to the tty, we should try to
+ // use the fancy logs implemented by 'yui-log-nodejs'.
+ // TODO: eventually YUI should take care of this piece.
+ if (isatty && Y.Lang.isFunction(c.logFn)) {
c.logFn.call(Y, msg, cat, src);
} else if (typeof console !== undefined && console.log) {
f = (cat && console[cat]) ? cat : 'log';

0 comments on commit 2a796b6

Please sign in to comment.
Something went wrong with that request. Please try again.