Merge branch 'dev' into fix-patternlink-handling

Author: geoffp

.travis.yml

@@ -11,11 +11,15 @@ before_install:
 
 before_script:
   - npm install -g grunt-cli
+  - npm install patternengine-node-underscore
+  - npm install patternengine-node-handlebars
+  - npm install patternengine-node-twig
 
 branches:
   only:
     - master
     - dev
+    - issue/438-runAllTestsTravis
 
 notifications:
   webhooks:

core/lib/patternlab.js

@@ -1,6 +1,6 @@
-/*
- * patternlab-node - v2.4.2 - 2016
- *
+/* 
+ * patternlab-node - v2.4.3 - 2016 
+ * 
  * Brian Muenzenmeyer, Geoff Pursell, and the web community.
  * Licensed under the MIT license.
  *

core/lib/ui_builder.js

@@ -69,9 +69,9 @@ var ui_builder = function () {
      */
   function writeFile(filePath, data, callback) {
     if (callback) {
-      fs.outputFile(filePath, data, callback);
+      fs.outputFileSync(filePath, data, callback);
     } else {
-      fs.outputFile(filePath, data);
+      fs.outputFileSync(filePath, data);
     }
   }
 
@@ -82,7 +82,6 @@ var ui_builder = function () {
    * @returns boolean - whether or not the pattern is excluded
      */
   function isPatternExcluded(pattern, patternlab) {
-    var styleGuideExcludes = patternlab.config.styleGuideExcludes;
     var isOmitted;
 
     // skip underscore-prefixed files
@@ -103,16 +102,6 @@ var ui_builder = function () {
       return true;
     }
 
-    //this pattern is a member of any excluded pattern groups
-    isOmitted = styleGuideExcludes && styleGuideExcludes.length && _.some(styleGuideExcludes, function (exclude) {
-      return exclude === pattern.patternGroup; });
-    if (isOmitted) {
-      if (patternlab.config.debug) {
-        console.log('Omitting ' + pattern.patternPartial + ' from styleguide patterns its patternGroup is specified in styleguideExcludes.');
-      }
-      return true;
-    }
-
     //this pattern is contained with a directory prefixed with an underscore (a handy way to hide whole directories from the nav
     isOmitted = pattern.relPath.charAt(0) === '_' || pattern.relPath.indexOf('/_') > -1;
     if (isOmitted) {
@@ -464,6 +453,7 @@ var ui_builder = function () {
 
       var p;
       var typePatterns = [];
+      var styleGuideExcludes = patternlab.config.styleGuideExcludes;
 
       _.forOwn(patternTypeObj, function (patternSubtypes, patternSubtype) {
 
@@ -493,7 +483,6 @@ var ui_builder = function () {
         return true; //stop yelling at us eslint we know we know
       });
 
-
       //do not create a viewall page for flat patterns
       if (!writeViewAllFile || !p) {
         return false;
@@ -510,7 +499,19 @@ var ui_builder = function () {
       var viewAllHTML = buildViewAllHTML(patternlab, typePatterns, patternType);
       writeFile(paths.public.patterns + p.subdir + '/index.html', mainPageHeadHtml + viewAllHTML + footerHTML);
 
-      patterns = patterns.concat(typePatterns);
+      //determine if we should omit this patterntype completely from the viewall page
+      var omitPatternType = styleGuideExcludes && styleGuideExcludes.length
+        && _.some(styleGuideExcludes, function (exclude) {
+          return exclude === patternType;
+        });
+      if (omitPatternType) {
+        if (patternlab.config.debug) {
+          console.log('Omitting ' + patternType + ' from  building a viewall page because its patternGroup is specified in styleguideExcludes.');
+        }
+      } else {
+        patterns = patterns.concat(typePatterns);
+      }
+
       return true; //stop yelling at us eslint we know we know
     });
     return patterns;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "patternlab-node",
   "description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "main": "./core/lib/patternlab.js",
   "dependencies": {
     "diveSync": "^0.3.0",

test/ui_builder_tests.js

@@ -58,21 +58,6 @@ exports['ui_builder'] = {
     test.done();
   },
 
-  'isPatternExcluded - returns true when patterngroup is specified in styleguideExcludes': function (test) {
-    //arrange
-    var patternlab = createFakePatternLab({});
-    var pattern = new Pattern('00-test/foo.mustache');
-    patternlab.config.defaultPattern = 'test-boaz';
-    patternlab.config.styleGuideExcludes.push('test');
-
-    //act
-    var result = ui.isPatternExcluded(pattern, patternlab);
-
-    //assert
-    test.equals(result, true);
-    test.done();
-  },
-
   'isPatternExcluded - returns true when pattern within underscored directory - top level': function (test) {
     //arrange
     var patternlab = createFakePatternLab({});