build: Updated package listing task

os-js · Nov 28, 2016 · 7d2bd14 · 7d2bd14
1 parent 611fb30
commit 7d2bd14
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 28 deletions.
diff --git a/src/build/config.js b/src/build/config.js
@@ -485,26 +485,28 @@ function listPackages(config) {
 
       if ( packages ) {
         Object.keys(packages).forEach(function(pn) {
-          var p = packages[pn];
+          const p = packages[pn];
+
           var es = p.enabled !== false;
           var esc = es ? 'green' : 'red';
-          var prn = pn.split('/', 2)[1];
+
           if ( es ) {
-            if ( currentDisabled.indexOf(prn) !== -1 ) {
+            if ( !_metadata.checkEnabledState(currentEnabled, currentDisabled, p) ) {
               es = false;
               esc = 'yellow';
             }
           } else {
-            if ( currentEnabled.indexOf(prn) !== -1 ) {
+            if ( _metadata.checkEnabledState(currentEnabled, currentDisabled, p) ) {
               es = true;
               esc = 'blue';
             }
           }
 
-          var lblenabled = (es ? 'Enabled' : 'Disabled')[esc];
-          var lblname = prn[es ? 'white' : 'grey'];
-          var lblrepo = p.repo[es ? 'white' : 'grey'];
-          var lbltype = p.type[es ? 'white' : 'grey'];
+          const prn = pn.split('/', 2)[1];
+          const lblenabled = (es ? 'Enabled' : 'Disabled')[esc];
+          const lblname = prn[es ? 'white' : 'grey'];
+          const lblrepo = p.repo[es ? 'white' : 'grey'];
+          const lbltype = p.type[es ? 'white' : 'grey'];
 
           console.log(pl(lblenabled, 20), pl(lblrepo, 30), pl(lbltype, 25), lblname);
         });

diff --git a/src/build/manifest.js b/src/build/manifest.js
@@ -67,26 +67,6 @@ function parsePreloads(iter) {
   return iter;
 }
 
-/*
- * Checks if package is enabled
- */
-function checkEnabledState(enabled, disabled, meta) {
-  const name = meta.path;
-  const shortName = meta.path.split('/')[1];
-
-  if ( String(meta.enabled) === 'false' ) {
-    if ( enabled.indexOf(shortName) !== -1 ) {
-      return true;
-    }
-    return enabled.indexOf(name) !== -1;
-  }
-
-  if ( disabled.indexOf(shortName) === -1 ) {
-    return true;
-  }
-  return disabled.indexOf(name) === -1;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // API
 ///////////////////////////////////////////////////////////////////////////////
@@ -193,6 +173,26 @@ function generateClientManifest(target, manifest) {
   });
 }
 
+/*
+ * Checks if package is enabled
+ */
+function checkEnabledState(enabled, disabled, meta) {
+  const name = meta.path;
+  const shortName = meta.path.split('/')[1];
+
+  if ( String(meta.enabled) === 'false' ) {
+    if ( enabled.indexOf(shortName) !== -1 ) {
+      return true;
+    }
+    return enabled.indexOf(name) !== -1;
+  }
+
+  if ( disabled.indexOf(shortName) === -1 ) {
+    return true;
+  }
+  return disabled.indexOf(name) === -1;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // API
 ///////////////////////////////////////////////////////////////////////////////
@@ -347,3 +347,4 @@ module.exports.getPackages = getPackages;
 module.exports.getPackage = getPackage;
 module.exports.writeManifest = writeManifest;
 module.exports.combinePreloads = combinePreloads;
+module.exports.checkEnabledState = checkEnabledState;