Merge pull request #49 from andyhot/feature/config-imports

Feature/config imports

Author: rwjblue

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
@@ -45,24 +49,23 @@ var Engine = CoreObject.extend({
       });
   },
 
+  _safeWalkSync: function(dir) {
+    var projectDir = this.projectRoot + '/' + dir;
+    return fse.existsSync(projectDir) ? walkSync(projectDir) : [];
+  },
+
   _filesInDir: function(dir) {
-    return walkSync(this.projectRoot + '/' + dir)
-      .map(function(relativePath) {
-        // add the dir back as a prefix
-        return dir + '/' + relativePath;
-      })
-      .filter(function(relativePath) {
-        // remove entries for directories
-        return relativePath.slice(-1) !== '/';
-      });
+    return this._safeWalkSync(dir)
+      // add the dir back as a prefix
+      .map( relativePath => dir + '/' + relativePath )
+      // remove entries for directories
+      .filter( relativePath => relativePath.slice(-1) !== '/');
   },
 
   _queueRemoveEmptyDirs: function(dir) {
-    var projectRoot = this.projectRoot;
-
     this._promise = this._promise
-      .then(function() {
-        var contents = walkSync(projectRoot + '/' + dir);
+      .then(() => {
+        var contents = this._safeWalkSync(dir);
         var files = contents
               .filter(function(entry) {
                 return entry.slice(-1) !== '/' && entry.slice(-8) !== '.gitkeep';
@@ -74,7 +77,7 @@ var Engine = CoreObject.extend({
 
         // there are no files left
         if (files.length === 0) {
-          fse.removeSync(projectRoot + '/' + dir);
+          fse.removeSync(this.projectRoot + '/' + dir);
         }
 
         // there are files, so we need to only delete empty dirs
@@ -86,7 +89,7 @@ var Engine = CoreObject.extend({
                 });
 
           if (!hasFiles) {
-            fse.removeSync(projectRoot + '/' + dir + '/' + directory);
+            fse.removeSync(this.projectRoot + '/' + dir + '/' + directory);
           }
         }
       });
@@ -96,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 = {

test/fixtures/config/input.js

@@ -0,0 +1,20 @@
+module.exports = {
+  app: {
+    'app.js': 'import config from "./config/environment";',
+    utils: {
+      'first.js': 'import config from "my-app/config/environment";',
+      'second.js': 'import config from "../config/environment";'
+    }
+  },
+  config: {
+    'environment.js': '"ENV"'
+  },
+  tests: {
+    unit: {
+      utils: {
+        'first-test.js': 'import config from "../../../config/environment";',
+        'second-test.js': 'import config from "my-app/config/environment";'
+      }
+    }
+  }
+};

test/fixtures/config/output.js

@@ -0,0 +1,18 @@
+module.exports = {
+  src: {
+    'main.js': 'import config from "../config/environment";',
+    utils: {
+      first: {
+        'util.js': 'import config from "my-app/config/environment";',
+        'util-unit-test.js': 'import config from "../../../config/environment";'
+      },
+      second: {
+        'util.js': 'import config from "../../../config/environment";',
+        'util-unit-test.js': 'import config from "my-app/config/environment";'
+      }
+    }
+  },
+  config: {
+    'environment.js': '"ENV"'
+  }
+};