Fixes requirejs#193, remove empty directories if removeCombined is used.

jrburke · jrburke · commit b3f96abfa6f9 · 2012-07-03T17:44:34.000-07:00
diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -405,6 +405,12 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
             });
         }
 
+        //If removeCombined in play, remove any empty directories that
+        //may now exist because of its use
+        if (config.removeCombined && !config.out && config.dir) {
+            file.deleteEmptyDirs(config.dir);
+        }
+
         //Do other optimizations.
         if (config.out && !config.cssIn) {
             //Just need to worry about one JS file.
diff --git a/build/jslib/node/file.js b/build/jslib/node/file.js
@@ -263,6 +263,31 @@ define(['fs', 'path'], function (fs, path) {
                     fs.unlinkSync(fileName);
                 }
             }
+        },
+
+
+        /**
+         * Deletes any empty directories under the given directory.
+         */
+        deleteEmptyDirs: function (startDir) {
+            var dirFileArray, i, fileName, filePath, stat;
+
+            if (file.exists(startDir)) {
+                dirFileArray = fs.readdirSync(startDir);
+                for (i = 0; i < dirFileArray.length; i++) {
+                    fileName = dirFileArray[i];
+                    filePath = path.join(startDir, fileName);
+                    stat = fs.statSync(filePath);
+                    if (stat.isDirectory()) {
+                        file.deleteEmptyDirs(filePath);
+                    }
+                }
+
+                //If directory is now empty, remove it.
+                if (fs.readdirSync(startDir).length ===  0) {
+                    file.deleteFile(startDir);
+                }
+            }
         }
     };
 
diff --git a/build/jslib/rhino/file.js b/build/jslib/rhino/file.js
@@ -5,7 +5,7 @@
  */
 //Helper functions to deal with file I/O.
 
-/*jslint plusplus: false, strict: false */
+/*jslint plusplus: false, strict: true */
 /*global java: false, define: false */
 
 define(function () {
@@ -244,6 +244,35 @@ define(function () {
                 }
                 fileObj["delete"]();
             }
+        },
+
+        /**
+         * Deletes any empty directories under the given directory.
+         * The startDirIsJavaObject is private to this implementation's
+         * recursion needs.
+         */
+        deleteEmptyDirs: function (startDir, startDirIsJavaObject) {
+            var topDir = startDir,
+                dirFileArray, i, fileObj;
+
+            if (!startDirIsJavaObject) {
+                topDir = new java.io.File(startDir);
+            }
+
+            if (topDir.exists()) {
+                dirFileArray = topDir.listFiles();
+                for (i = 0; i < dirFileArray.length; i++) {
+                    fileObj = dirFileArray[i];
+                    if (fileObj.isDirectory()) {
+                        file.deleteEmptyDirs(fileObj, true);
+                    }
+                }
+
+                //If the directory is empty now, delete it.
+                if (topDir.listFiles().length === 0) {
+                    file.deleteFile(String(topDir.getPath()));
+                }
+            }
         }
     };
 
diff --git a/build/tests/builds.js b/build/tests/builds.js
@@ -1027,6 +1027,9 @@ define(['build', 'env!env/file'], function (build, file) {
                 t.is(false, file.exists("lib/removeCombined/app-built/js/c.js"));
                 t.is(true, file.exists("lib/removeCombined/app-built/js/d.js"));
 
+                //Make sure empty directories are pruned
+                t.is(false, file.exists('lib/removeCombined/app-built/js/sub'), 'empty directories removed');
+
                 require._buildReset();
             }
 
@@ -1050,6 +1053,9 @@ define(['build', 'env!env/file'], function (build, file) {
                 t.is(false, file.exists("lib/removeCombined/baseUrl-built/c.js"));
                 t.is(true, file.exists("lib/removeCombined/baseUrl-built/d.js"));
 
+                //Make sure empty directories are pruned
+                t.is(false, file.exists('lib/removeCombined/baseUrl-built/sub'), 'empty directories removed');
+
                 require._buildReset();
             }
 
diff --git a/build/tests/lib/removeCombined/app/js/secondary.js b/build/tests/lib/removeCombined/app/js/secondary.js
@@ -1,7 +1,8 @@
-define(['main', 'c'], function (main, c) {
+define(['main', 'c', 'sub/e'], function (main, c, e) {
     return {
         name: 'secondary',
         main: main,
-        c: c
+        c: c,
+        e: e
     };
 });
diff --git a/build/tests/lib/removeCombined/app/js/sub/e.js b/build/tests/lib/removeCombined/app/js/sub/e.js
@@ -0,0 +1,3 @@
+define({
+    name: 'e'
+});
diff --git a/build/tests/lib/removeCombined/expected-secondary.js b/build/tests/lib/removeCombined/expected-secondary.js
@@ -3,10 +3,15 @@ define('c',{
     name: 'c'
 });
 
-define('secondary',['main', 'c'], function (main, c) {
+define('sub/e',{
+    name: 'e'
+});
+
+define('secondary',['main', 'c', 'sub/e'], function (main, c, e) {
     return {
         name: 'secondary',
         main: main,
-        c: c
+        c: c,
+        e: e
     };
 });
