feat(directories): Support target directories in normal mode

scottnonnenberg · Jun 14, 2016 · e3bf811 · e3bf811
1 parent dfd8ec5
commit e3bf811
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/get_config.js b/src/get_config.js
@@ -12,8 +12,8 @@ var _ = require('lodash');
 var script = fs.readFileSync(path.join(__dirname, '_get_config.js')).toString();
 
 function getConfig(leftPath, rightPath) {
-  var leftDir = path.dirname(path.resolve(leftPath));
-  var rightDir = path.dirname(path.resolve(rightPath));
+  var leftDir = path.resolve(leftPath);
+  var rightDir = path.resolve(rightPath);
 
   var left = getConfigForDir(leftDir);
   var right = getConfigForDir(rightDir);
@@ -24,7 +24,9 @@ function getConfig(leftPath, rightPath) {
   };
 }
 
-function getConfigForDir(dir) {
+function getConfigForDir(startPath) {
+  var stat = fs.statSync(startPath);
+  var dir = stat.isDirectory() ? startPath : path.dirname(startPath);
   var filename = '__get_config.js';
   var target = path.join(dir, filename);
 

diff --git a/test/integration/test_get_config.js b/test/integration/test_get_config.js
@@ -9,8 +9,8 @@ var getConfig = require('src/get_config');
 
 describe('integration/getConfig', function() {
   it('loads two config files', function() {
-    var left = 'test/integration/left/index.js';
-    var right = 'test/integration/right/index.js';
+    var left = 'test/integration/left';
+    var right = 'test/integration/right';
 
     var actual = getConfig(left, right);