feat(ls): add -d flag to ls()

nfischer · nfischer · commit c6da9e76fd21 · 2016-01-25T23:44:20.000-08:00
diff --git a/src/ls.js b/src/ls.js
@@ -25,7 +25,8 @@ function _ls(options, paths) {
   options = common.parseOptions(options, {
     'R': 'recursive',
     'A': 'all',
-    'a': 'all_deprecated'
+    'a': 'all_deprecated',
+    'd': 'directory'
   });
 
   if (options.all_deprecated) {
@@ -72,7 +73,10 @@ function _ls(options, paths) {
       }
 
       // Simple dir?
-      if (stats.isDirectory()) {
+      if (options.directory) {
+        pushFile(p, p);
+        return;
+      } else if (stats.isDirectory()) {
         // Iterate over p contents
         fs.readdirSync(p).forEach(function(file) {
           if (!pushFile(file, p))
diff --git a/test/ls.js b/test/ls.js
@@ -191,4 +191,33 @@ assert.equal(result.indexOf('resources/ls/a_dir/b_dir') > -1, true);
 assert.equal(result.indexOf('resources/ls/a_dir/b_dir/z') > -1, true);
 assert.equal(result.length, 9);
 
+// directory option, single arg
+var result = shell.ls('-d', 'resources/ls');
+assert.equal(shell.error(), null);
+assert.equal(result.length, 1);
+
+// directory option, single arg with trailing '/'
+var result = shell.ls('-d', 'resources/ls/');
+assert.equal(shell.error(), null);
+assert.equal(result.length, 1);
+
+// directory option, multiple args
+var result = shell.ls('-d', 'resources/ls/a_dir', 'resources/ls/file1');
+assert.equal(shell.error(), null);
+assert.ok(result.indexOf('resources/ls/a_dir') > -1);
+assert.ok(result.indexOf('resources/ls/file1') > -1);
+assert.equal(result.length, 2);
+
+// directory option, globbed arg
+var result = shell.ls('-d', 'resources/ls/*');
+assert.equal(shell.error(), null);
+assert.ok(result.indexOf('resources/ls/a_dir') > -1);
+assert.ok(result.indexOf('resources/ls/file1') > -1);
+assert.ok(result.indexOf('resources/ls/file1.js') > -1);
+assert.ok(result.indexOf('resources/ls/file2') > -1);
+assert.ok(result.indexOf('resources/ls/file2.js') > -1);
+assert.ok(result.indexOf('resources/ls/file2') > -1);
+assert.ok(result.indexOf('resources/ls/filename(with)[chars$]^that.must+be-escaped') > -1);
+assert.equal(result.length, 6);
+
 shell.exit(123);
