Fixed issue #79 fix handling for distinct output directory from css source directory.

examples/multiple-dirs/css/buttons.css

@@ -0,0 +1,23 @@
+/**
+ * Buttons
+ *
+ * The Button `.btn` class can be applied to `<button>`, `<input>`, or `<a>` elements.
+ *
+ * @section
+ *
+ * @example
+ * <button class="btn">Button</button>
+ * <input type="submit" class="btn" value="Input"/>
+ * <a href="#" class="btn">Anchor</a>
+ */
+.btn {
+  background-color: #ddd;
+  border-radius: 4px;
+  border: 2px solid transparent;
+  color: black;
+  display: inline-block;
+  font-size: 16px;
+  line-height: 1;
+  padding: 5px 15px;
+  text-decoration: none;
+}

examples/multiple-dirs/index.js

@@ -0,0 +1,16 @@
+var path = require('path');
+
+var livingcss = require('../../index');
+
+(async function() {
+  try {
+    // all these methods should work:
+    await livingcss('css/buttons.css', 'styleguide');
+    // await livingcss(path.join(__dirname, 'css/buttons.css'), 'styleguide');
+    // await livingcss(path.join(__dirname, 'css/buttons.css'), path.join(__dirname, 'styleguide'));
+    // await livingcss('css/buttons.css', path.join(__dirname, 'styleguide'));
+  } catch (err) {
+    console.error(err);
+    console.error(err.stack);
+  }
+})();

lib/generate.js

@@ -55,13 +55,30 @@ function generate(dest, template, context, options) {
   }
 
   return preprocess
-    .then(function() {
+    .then(async function() {
       // inline all stylesheets for polymer shared styles to work
       // @see https://www.polymer-project.org/1.0/docs/devguide/styling#style-modules
-      return utils.readFiles(context.stylesheets, function(data, file) {
+
+      const parsedStylesheetFile = function(data, file) {
         context.parsedStylesheets = context.parsedStylesheets || [];
         context.parsedStylesheets.push(utils.fixSVGIssue(data));
-      });
+      };
+
+      let fileList;
+      try {
+        fileList = await utils.readFiles(context.stylesheets, parsedStylesheetFile);
+      } catch (err) {
+        if ('ENOENT' !== err.code) {
+          throw err;
+        }
+        const destDir = path.dirname(dest);
+        const stylesheets = context.stylesheets.map((file) => {
+          return path.resolve(destDir, file);
+        });
+        fileList = await utils.readFiles(stylesheets, parsedStylesheetFile);
+      }
+
+      return fileList;
     })
     .then(function success() {
       var html = Handlebars.compile(template)(context);
@@ -94,4 +111,4 @@ function generate(dest, template, context, options) {
     });
 }
 
-module.exports = generate;
+module.exports = generate;

lib/utils.js

@@ -16,9 +16,8 @@ utils._readFileWithPromise = function readFileWithPromise(file) {
   return new Promise((resolve, reject) => {
     fs.readFile(file, 'utf8', function(err, data) {
       if (err) {
-        reject(err);
+        return reject(err);
       }
-
       resolve(data);
     });
   });
@@ -29,11 +28,11 @@ utils._readFileWithPromise = function readFileWithPromise(file) {
  * @param {string} pattern - Glob file pattern
  * @returns Promise
  */
-function globWithPromsie(pattern) {
+function globWithPromise(pattern) {
   return new Promise((resolve, reject) => {
     glob(pattern, function(err, files) {
       if (err) {
-        reject(err);
+        return reject(err);
       }
 
       if (files.length === 0) {
@@ -153,7 +152,7 @@ utils.sortCategoryBy = function sortCategoryBy(categories, sortOrder) {
 utils.readFileGlobs = async function readFileGlobs(patterns, callback) {
   patterns = (!Array.isArray(patterns) ? [patterns] : patterns);
   let globPromises = await patterns.map(async (pattern) => {
-    return globWithPromsie(pattern);
+    return globWithPromise(pattern);
   });
 
   return Promise.all(globPromises)
@@ -162,7 +161,7 @@ utils.readFileGlobs = async function readFileGlobs(patterns, callback) {
       // fileList is an array of arrays of files
       // e.g. [ [fileOne, fileTwo], [fileThree, fileFour], ...]
       let readFilePromises = await fileList.map(async (files) => {
-        return await utils.readFiles(files)
+        return await utils.readFiles(files);
       });
 
       return Promise.all(readFilePromises);
@@ -187,24 +186,27 @@ utils.readFileGlobs = async function readFileGlobs(patterns, callback) {
  * @param {function} callback - Callback to execute for each read file.
  * @returns {Promise}
  */
-utils.readFiles = async function readFiles(files, callback) {
-  if (!files || (Array.isArray(files) && !files.length)) return Promise.resolve();
+utils.readFiles = function readFiles(files, callback) {
+  if (!files || (Array.isArray(files) && !files.length)) return Promise.resolve([]);
 
   files = (!Array.isArray(files) ? [files] : files);
-  let promises = await Promise.all(files.map(async (file) => {
+  return Promise.all(files.map(async (file) => {
     let data = await utils._readFileWithPromise(file);
     return [data, file];
-  }));
-
-  return Promise.all(promises).then(files => {
-    if (callback) {
-      files.forEach(function(data) {
-        callback.apply(null, data);
-      });
-    }
-
-    return files;
-  })
+  }))
+    .then(async files => {
+      if (callback) {
+        const promises = [];
+        files.forEach(function(data) {
+          const result = callback.apply(null, data);
+          if ('object' === typeof result && result.then) {
+            promises.push(result);
+          }
+        });
+        await Promise.all(promises);
+      }
+      return files;
+    });
 }
 
 /**