chore(yaml): read yml file

Author: Stephan Köninger

index.js

@@ -41,23 +41,17 @@ const r = gitHubConnection.repos.getForOrg({org: ORG})
         createPostForEachRepository(reposNames);
     });
 
-
-
 function createPostForEachRepository(names) {
     const name = names.pop();
     console.log("create post for: ", name);
     return github.getServiceInfo(name)
         .then(r => fs.writeFileSync(`./source/_posts/${name}.md`, HexoHelper.createPost(r), 'utf8'))
-        .then(()=>{
-            if(names.length === 0){
+        .then(() => {
+            if (names.length === 0) {
                 console.log("finished");
-            }else {
+            } else {
                 createPostForEachRepository(names);
             }
-        });
+        })
+        .catch(err => console.error(err));
 }
-
-// services.forEach(name => {
-//     github.getServiceInfo(name)
-//         .then(r => fs.writeFileSync(`./source/_posts/${name}.md`, HexoHelper.createPost(r), 'utf8'));
-// });

lib/hexoHelper.js

@@ -9,31 +9,52 @@ module.exports = class HexoHelper {
             post.push(`version: ${r.version}`);
         }
 
-        if(r.serviceTypes) {
+        if(HexoHelper.propertyIsSetAndArray(r.serviceTypes)) {
             post.push(`serviceTypes:`);
             r.serviceTypes.forEach(st => post.push(`    - ${st}`))
         }
 
-        if(r.contributors) {
+        if(HexoHelper.propertyIsSetAndArray(r.contributors)) {
             post.push(`contributors:`);
             r.contributors.forEach(c => post.push(`    - ${c}`))
         }
 
-        if(r.responsibleUsers) {
+        if(HexoHelper.propertyIsSetAndArray(r.responsibleUsers)) {
             post.push(`responsible:`);
             r.responsibleUsers.forEach(c => post.push(`    - ${c}`))
         }
 
-        if(r.languages) {
+        if(HexoHelper.propertyIsSetAndArray(r.languages)) {
             post.push(`languages:`);
             r.languages.forEach(c => post.push(`    - ${c}`))
         }
 
+        if(HexoHelper.propertyIsSetAndArray(r.uses)) {
+            post.push(`uses:`);
+            r.uses.forEach(c => post.push(`    - ${c}`))
+        }
+
+        if(r.message) {
+            post.push(`message:`);
+            if(Array.isArray(r.message.send) && r.message.send.length > 0) {
+                post.push(`    send:`);
+                r.message.send.forEach(c => post.push(`        - ${c}`))
+            }
+            if(Array.isArray(r.message.consume) && r.message.consume.length > 0) {
+                post.push(`    consume:`);
+                r.message.consume.forEach(c => post.push(`        - ${c}`))
+            }
+        }
+
         post.push("---");
         if(r.readme) {
             post.push('');
             post.push(r.readme);
         }
         return post.join('\n');
     }
+
+    static propertyIsSetAndArray(p) {
+        return Array.isArray(p) && p.length > 0;
+    }
 };

lib/serviceInfo.js

@@ -1,4 +1,5 @@
-'use strict';
+const YAML = require('yamljs');
+
 module.exports = class ServiceInfo {
     constructor(name) {
         this.name = name;
@@ -36,12 +37,14 @@ module.exports = class ServiceInfo {
      * @returns {ServiceInfo}
      */
     setLanguages(languages) {
-        const languageKeys = Object.keys(languages).filter(key => key !== 'meta');
-        const sum = languageKeys.map(lang => languages[lang]).reduce((prev, cur) => prev + cur, 0);
-        languageKeys.forEach(lang => {
-            languages[lang] = Math.ceil((languages[lang] / sum) * 100)
-        });
-        this.languages = Object.keys(languages).filter(key => key !== 'meta' && languages[key] >= 15);
+        if(languages) {
+            const languageKeys = Object.keys(languages).filter(key => key !== 'meta');
+            const sum = languageKeys.map(lang => languages[lang]).reduce((prev, cur) => prev + cur, 0);
+            languageKeys.forEach(lang => {
+                languages[lang] = Math.ceil((languages[lang] / sum) * 100)
+            });
+            this.languages = Object.keys(languages).filter(key => key !== 'meta' && languages[key] >= 15);
+        }
         return this;
     }
 
@@ -50,7 +53,7 @@ module.exports = class ServiceInfo {
      * @returns {ServiceInfo}
      */
     setContributors(contributors) {
-        if(Array.isArray(contributors)) {
+        if (Array.isArray(contributors)) {
             this.contributors = contributors.filter(c => c.total !== undefined)
                 .sort((a, b) => b.total - a.total)
                 .map(a => `${a.author.login}`).slice(0, 4);
@@ -63,13 +66,19 @@ module.exports = class ServiceInfo {
      * @returns {ServiceInfo}
      */
     setOverrides(overrides) {
-        if(overrides && overrides.content) {
+        if (overrides && overrides.content) {
             try {
-                const jsonStr = new Buffer(overrides.content, overrides.encoding).toString();
-                overrides = JSON.parse(jsonStr);
+                const content = new Buffer(overrides.content, overrides.encoding).toString();
+                overrides = YAML.parse(content);
+
+                this.message = overrides.message ? overrides.message : undefined;
+                this.uses = this._getAsArray(overrides.uses);
+                this.contributors = this._getAsArray(overrides.contributors);
                 this.responsibleUsers = this._getAsArray(overrides.responsibleUsers);
                 this.serviceTypes = this._getAsArray(overrides.serviceTypes);
-            } catch(e) {}
+            } catch (e) {
+                console.error("setOverrides", e);
+            }
         }
 
         return this;
@@ -81,7 +90,7 @@ module.exports = class ServiceInfo {
      * @private
      */
     _getAsArray(what) {
-        if(what) {
+        if (what) {
             return Array.isArray(what) ? what : [what];
         }
     }

lib/utils.js

@@ -91,7 +91,7 @@ module.exports = class Util {
     }
 
     getServiceDocFile(config) {
-        return this._getFile(config, '.service.doc');
+        return this._getFile(config, '.service.yml');
     }
 
     _getFile(config, path) {

package.json

@@ -10,6 +10,8 @@
     "server": "hexo server"
   },
   "dependencies": {
+    "bluebird": "^3.4.6",
+    "github": "^5.2.1",
     "hexo": "^3.2.0",
     "hexo-generator-archive": "^0.1.4",
     "hexo-generator-category": "^0.1.3",
@@ -19,8 +21,7 @@
     "hexo-renderer-marked": "^0.2.10",
     "hexo-renderer-stylus": "^0.3.1",
     "hexo-server": "^0.2.0",
-    "bluebird": "^3.4.6",
-    "github": "^5.2.1",
-    "nconf": "^0.8.4"
+    "nconf": "^0.8.4",
+    "yamljs": "^0.2.8"
   }
 }

themes/service-docs/layout/_partial/service-list-item.ejs

@@ -1,6 +1,6 @@
 <li>
     <a href="<%- config.root %><%- service.path %>">
-        <%- service.title || service.link%>
+        <%- service.slug %>
     </a>
 </li>
 

themes/service-docs/layout/layout.ejs

@@ -11,13 +11,13 @@
 <body>
     <div class="wrapper">
         <nav>
-            <h2>Services</h2>
+            <h2>Services <small>(<%- site.posts.length %>)</small></h2>
             <ul class="service-list">
                 <% var services = [] %>
                 <% site.posts.each(function(service){  %>
                 <%    services.push(service)  %>
                 <% }); %>
-                <% services.sort((a,b) => a.title.localeCompare(b.title)); %>
+                <% services = services.sort((a,b) => a.slug.localeCompare(b.slug)); %>
                 <% services.forEach(function(service) { %>
                 <%- partial('_partial/service-list-item', {service: service}) %>
                 <% }); %>