Add info to debug functions

Brocfile.js

@@ -35,7 +35,7 @@ function babelConfigFor(environment) {
 
  if (isProduction) {
  plugins.push(filterImports({
- 'ember-metal/debug': ['assert','debug','deprecate','runInDebug','warn']
+ 'ember-metal/debug': ['assert','debug','deprecate','info','runInDebug','warn']
  }));
  }
 

features.json

@@ -10,8 +10,5 @@
  "ember-registry-container-reform": true,
  "ember-routing-routable-components": null
  },
- "debugStatements": [
- "Ember.Logger.info",
- "Ember.default.Logger.info"
- ]
+ "debugStatements": []
 }

packages/ember-application/lib/system/resolver.js

@@ -4,9 +4,8 @@
 */
 
 import Ember from 'ember-metal/core';
-import { assert } from 'ember-metal/debug';
+import { assert, info } from 'ember-metal/debug';
 import { get } from 'ember-metal/property_get';
-import Logger from 'ember-metal/logger';
 import {
  classify,
  capitalize,
@@ -431,7 +430,7 @@ export default EmberObject.extend({
  padding = new Array(60 - parsedName.fullName.length).join('.');
  }
 
- Logger.info(symbol, parsedName.fullName, padding, this.lookupDescription(parsedName.fullName));
+ info(symbol, parsedName.fullName, padding, this.lookupDescription(parsedName.fullName));
  },
 
  /**

packages/ember-application/tests/system/dependency_injection/default_resolver_test.js

@@ -1,6 +1,7 @@
+/* globals EmberDev */
 import Ember from 'ember-metal/core'; // Ember.TEMPLATES
+import { getDebugFunction, setDebugFunction } from 'ember-metal/debug';
 import run from 'ember-metal/run_loop';
-import Logger from 'ember-metal/logger';
 import Controller from 'ember-runtime/controllers/controller';
 import Route from 'ember-routing/system/route';
 import Component from 'ember-views/components/component';
@@ -15,7 +16,7 @@ import {
  registerHelper
 } from 'ember-htmlbars/helpers';
 
-var registry, locator, application, originalLookup, originalLoggerInfo;
+var registry, locator, application, originalLookup, originalInfo;
 
 QUnit.module('Ember.Application Dependency Injection - default resolver', {
  setup() {
@@ -24,7 +25,7 @@ QUnit.module('Ember.Application Dependency Injection - default resolver', {
 
  registry = application.__registry__;
  locator = application.__container__;
- originalLoggerInfo = Logger.info;
+ originalInfo = getDebugFunction('info');
  },
 
  teardown() {
@@ -34,7 +35,7 @@ QUnit.module('Ember.Application Dependency Injection - default resolver', {
  var UserInterfaceNamespace = Namespace.NAMESPACES_BY_ID['UserInterface'];
  if (UserInterfaceNamespace) { run(UserInterfaceNamespace, 'destroy'); }
 
- Logger.info = originalLoggerInfo;
+ setDebugFunction('info', originalInfo);
  }
 });
 
@@ -158,44 +159,59 @@ QUnit.test('the default resolver throws an error if the fullName to resolve is i
 });
 
 QUnit.test('the default resolver logs hits if `LOG_RESOLVER` is set', function() {
+ if (EmberDev && EmberDev.runningProdBuild) {
+ ok(true, 'Logging does not occur in production builds');
+ return;
+ }
+
  expect(3);
 
  application.LOG_RESOLVER = true;
  application.ScoobyDoo = EmberObject.extend();
  application.toString = function() { return 'App'; };
 
- Logger.info = function(symbol, name, padding, lookupDescription) {
+ setDebugFunction('info', function(symbol, name, padding, lookupDescription) {
  equal(symbol, '[✓]', 'proper symbol is printed when a module is found');
  equal(name, 'doo:scooby', 'proper lookup value is logged');
  equal(lookupDescription, 'App.ScoobyDoo');
- };
+ });
 
  registry.resolve('doo:scooby');
 });
 
 QUnit.test('the default resolver logs misses if `LOG_RESOLVER` is set', function() {
+ if (EmberDev && EmberDev.runningProdBuild) {
+ ok(true, 'Logging does not occur in production builds');
+ return;
+ }
+
  expect(3);
 
  application.LOG_RESOLVER = true;
  application.toString = function() { return 'App'; };
 
- Logger.info = function(symbol, name, padding, lookupDescription) {
+ setDebugFunction('info', function(symbol, name, padding, lookupDescription) {
  equal(symbol, '[ ]', 'proper symbol is printed when a module is not found');
  equal(name, 'doo:scooby', 'proper lookup value is logged');
  equal(lookupDescription, 'App.ScoobyDoo');
- };
+ });
 
  registry.resolve('doo:scooby');
 });
 
 QUnit.test('doesn\'t log without LOG_RESOLVER', function() {
+ if (EmberDev && EmberDev.runningProdBuild) {
+ ok(true, 'Logging does not occur in production builds');
+ return;
+ }
+
  var infoCount = 0;
 
  application.ScoobyDoo = EmberObject.extend();
 
- Logger.info = function(symbol, name) {
+ setDebugFunction('info', function(symbol, name) {
  infoCount = infoCount + 1;
- };
+ });
 
  registry.resolve('doo:scooby');
  registry.resolve('doo:scrappy');

packages/ember-debug/lib/main.js

@@ -79,6 +79,16 @@ setDebugFunction('debug', function debug(message) {
  Logger.debug('DEBUG: ' + message);
 });
 
+/**
+ Display an info notice.
+
+ @method info
+ @private
+*/
+setDebugFunction('info', function info() {
+ Logger.info.apply(undefined, arguments);
+});
+
 /**
  Alias an old, deprecated method with its new counterpart.
 

packages/ember-htmlbars/lib/keywords/debugger.js

@@ -4,7 +4,8 @@
 @module ember
 @submodule ember-htmlbars
 */
-import Logger from 'ember-metal/logger';
+
+import { info } from 'ember-metal/debug';
 
 /**
  Execute the `debugger` statement in the current template's context.
@@ -58,7 +59,7 @@ export default function debuggerKeyword(morph, env, scope) {
  return env.hooks.getValue(env.hooks.get(env, scope, path));
  }
 
- Logger.info('Use `view`, `context`, and `get(<path>)` to debug this template.');
+ info('Use `view`, `context`, and `get(<path>)` to debug this template.');
 
  debugger;
 

packages/ember-htmlbars/lib/keywords/outlet.js

@@ -3,7 +3,7 @@
 @submodule ember-templates
 */
 
-import Ember from 'ember-metal/core';
+import { info } from 'ember-metal/debug';
 import { get } from 'ember-metal/property_get';
 import ViewNodeManager from 'ember-htmlbars/node-managers/view-node-manager';
 import topLevelViewTemplate from 'ember-htmlbars/templates/top-level-view';
@@ -141,7 +141,7 @@ export default {
  template = template || toRender.template && toRender.template.raw;
 
  if (LOG_VIEW_LOOKUPS && ViewClass) {
- Ember.Logger.info('Rendering ' + toRender.name + ' with ' + ViewClass, { fullName: 'view:' + toRender.name });
+ info('Rendering ' + toRender.name + ' with ' + ViewClass, { fullName: 'view:' + toRender.name });
  }
  }
 

packages/ember-metal/lib/debug.js

@@ -1,5 +1,6 @@
 export let debugFunctions = {
  assert() {},
+ info() {},
  warn() {},
  debug() {},
  deprecate() {},
@@ -19,6 +20,10 @@ export function assert() {
  return debugFunctions.assert.apply(undefined, arguments);
 }
 
+export function info() {
+ return debugFunctions.info.apply(undefined, arguments);
+}
+
 export function warn() {
  return debugFunctions.warn.apply(undefined, arguments);
 }

packages/ember-routing/lib/system/generate_controller.js

@@ -1,4 +1,4 @@
-import Ember from 'ember-metal/core'; // Logger
+import { info } from 'ember-metal/debug';
 import { get } from 'ember-metal/property_get';
 
 /**
@@ -51,7 +51,7 @@ export default function generateController(container, controllerName, context) {
  var instance = container.lookup(fullName);
 
  if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
- Ember.Logger.info(`generated -> ${fullName}`, { fullName: fullName });
+ info(`generated -> ${fullName}`, { fullName: fullName });
  }
 
  return instance;

packages/ember-routing/lib/system/route.js

@@ -1,5 +1,5 @@
 import Ember from 'ember-metal/core'; // FEATURES, A, deprecate, assert, Logger
-import { assert, deprecate } from 'ember-metal/debug';
+import { assert, deprecate, info } from 'ember-metal/debug';
 import isEnabled from 'ember-metal/features';
 import EmberError from 'ember-metal/error';
 import { get } from 'ember-metal/property_get';
@@ -2161,7 +2161,7 @@ function buildRenderOptions(route, namePassed, isDefaultRender, name, options) {
  assert(`Could not find "${name}" template, view, or component.`, isDefaultRender);
  if (LOG_VIEW_LOOKUPS) {
  var fullName = `template:${name}`;
- Ember.Logger.info(`Could not find "${name}" template or view. Nothing will be rendered`, { fullName: fullName });
+ info(`Could not find "${name}" template or view. Nothing will be rendered`, { fullName: fullName });
  }
  }
 

packages/ember-routing/lib/system/router.js

@@ -1,5 +1,5 @@
 import Ember from 'ember-metal/core';
-import { assert } from 'ember-metal/debug';
+import { assert, info } from 'ember-metal/debug';
 import EmberError from 'ember-metal/error';
 import { get } from 'ember-metal/property_get';
 import { set } from 'ember-metal/property_set';
@@ -503,7 +503,7 @@ var EmberRouter = EmberObject.extend(Evented, {
  handler = container.lookup(routeName);
 
  if (get(this, 'namespace.LOG_ACTIVE_GENERATION')) {
- Ember.Logger.info(`generated -> ${routeName}`, { fullName: routeName });
+ info(`generated -> ${routeName}`, { fullName: routeName });
  }
  }