Fix imports to config files

Author: andyhot

lib/engines/classic/config-file-info.js

@@ -0,0 +1,21 @@
+var ClassicFileInfo = require('./classic-file-info');
+
+var ConfigFileInfo = ClassicFileInfo.extend({
+  fileInfoType: 'ConfigFileInfo',
+
+
+  init: function(options) {
+    options.type = 'config';
+    options.base = '.';
+    options.sourceRoot = '.';
+
+    this._super(options);
+  },
+
+  populateCollection: function() {
+    this.collection = '..';
+    this.collectionGroup = '';
+  }
+});
+
+module.exports = ConfigFileInfo;

lib/engines/classic/index.js

@@ -8,6 +8,7 @@ var TemplateFileInfo = require('./template-file-info');
 var ComponentTemplateFileInfo = require('./component-template-file-info');
 var MainFileInfo = require('./main-file-info');
 var MixinFileInfo = require('./mixin-file-info');
+var ConfigFileInfo = require('./config-file-info');
 
 module.exports = {
   buildFor: function(sourceRelativePath, options) {
@@ -70,6 +71,8 @@ module.exports = {
 
         return new TestFileInfo(options);
       }
+    } else if (sourceRoot === 'config') {
+      return new ConfigFileInfo(options);
     }
   }
 };

lib/index.js

@@ -34,6 +34,10 @@ var Engine = CoreObject.extend({
   },
 
   _queueMoveFile: function(source, dest) {
+    if (source === dest) {
+      return;
+    }
+
     var logger = this._logger;
 
     this._promise = this._promise
@@ -95,7 +99,8 @@ var Engine = CoreObject.extend({
     this._promise = RSVP.resolve();
     var inputFiles = [].concat(
       this._filesInDir('app'),
-      this._filesInDir('tests')
+      this._filesInDir('tests'),
+      this._filesInDir('config')
     );
 
     var verbose = this.verbose;

lib/utils/path.js

@@ -13,7 +13,12 @@ function makeRelative(from, to) {
 }
 
 function makeAbsolute(base, path) {
-  return p.resolve(p.dirname('/' + base), path).substring(1);
+  var isConfigPath = path.indexOf('/config/') > 0;
+  var baseDir = p.dirname('/' + base);
+  if (isConfigPath) {
+    baseDir += '/..';
+  }
+  return p.resolve(baseDir, path).substring(1);
 }
 
 module.exports = {