See notes,

added isolation mode for easier testing,
further tidy to start,
began tidy of github.js
Updates to changelog

Author: mcdonnelldean

CHANGELOG.md

@@ -1,9 +1,10 @@
 Pending - x.x.x
 ---
 * Added CHANGELOG.md
-* Removed redundant data folder
-* Removed unneeded build.sh
-* Moved logic script into lib
+* Removed redundant data folder.
+* Removed unneeded build.sh.
+* Moved logic script into lib.
+* Refactored start.js and github.js for clarity.
 
 6 April 2016 - 6.0.0
 ---

lib/github.js

@@ -8,7 +8,7 @@ var gitUrl
 
 var opts = {
   registry: 'http://registry.npmjs.org/',
-  token: ''
+  token: 'NO_TOKEN'
 }
 
 module.exports = function (options) {
@@ -21,33 +21,34 @@ module.exports = function (options) {
   seneca.add('role:github,cmd:query', cmdQuery)
   seneca.add('role:github,cmd:parse', cmdParse)
   seneca.add('role:github,cmd:extract', cmdExtract)
-
-  seneca.add('role:info,req:part', function (args, done) {
-    console.log('foo')
-    done()
-
-    this.act('role:github,cmd:get', {name: args.name}, function (err, mod) {
-      if (err) {
-        return done(err)
-      }
-      this.act('role:info,res:part,part:github', {name: args.name, data: mod.data$()})
-    })
-  })
+  seneca.add('role:info,req:part', aliasGet)
 
   return {
     name: 'nodezoo-github'
   }
 }
 
+function aliasGet (msg, done) {
+  var seneca = this
+  var payload = {name: msg.name}
+
+  seneca.act('role:github,cmd:get', payload, (err, data) => {
+    if (err) return done(err)
+
+    payload.data = data
+    seneca.act('role:info,res:part,part:github', payload)
+    done()
+  })
+}
+
 function cmdGet (args, done) {
   var seneca = this
+  var cache = seneca.make$('github')
 
   var githubName = args.name
-  var githubEnt = seneca.make$('github')
-
   var url = opts.registry + githubName
-  // check if in the cache
-  githubEnt.load$(githubName, function (err, github) {
+
+  cache.load$(githubName, function (err, github) {
     if (err) {
       return done(err)
     }
@@ -93,59 +94,63 @@ function cmdGet (args, done) {
 function cmdQuery (args, done) {
   var seneca = this
 
-  var githubEnt = seneca.make$('github')
+  var cache = seneca.make$('github')
   var githubName = args.name
   var user = args.user
   var repo = args.repo
 
   github.authenticate({
-    type: 'basic',
-    username: opts.token,
-    password: 'x-oauth-basic'
+    type: 'token',
+    token: opts.token
   })
 
-  github.repos.get({user: user, repo: repo}, function (err, repo) {
-    if (err) {
-      return done(err)
-    }
+  var getRepos = {
+    user: user,
+    repo: repo
+  }
+
+  github.repos.get(getRepos, (err, repo) => {
+    if (err) return done(err)
+    if (!repo) return done()
+
     var data
-    if (repo) {
-      var pullRequests = []
-      github.pullRequests.getAll({user: user, repo: githubName, state: 'open'}, function (err, response) {
-        if (err) {
-          console.log(err)
-        }
-        if (response) {
-          pullRequests = response
-        }
-      })
-      data = {
+    var pullRequests = []
+    var getPullRequests = {
+      user: user,
+      repo: githubName,
+      state: 'open'
+    }
+
+    github.pullRequests.getAll(getPullRequests, (err, prs) => {
+      if (err) console.log(err)
+
+      var data = {
         name: args.repo || '',
         user: args.user || '',
         repo: args.repo || '',
         stars: repo.stargazers_count || '',
         watches: repo.subscribers_count || '',
         forks: repo.forks_count || '',
         last: repo.pushed_at || '',
-        url: gitUrl || '',
-        gitClone: repo.clone_url || '',
-        pullRequests: pullRequests.length || ''
+        urlRepo: gitUrl || '',
+        urlClone: repo.clone_url || '',
+        pullRequests: prs && prs.length || 0,
+        cached: Date.now()
       }
-      // update the data if module exists in cache, if not create it
-      githubEnt.load$(githubName, function (err, github) {
-        if (err) {
-          return done(err)
-        }
-        if (github) {
-          return github.data$(data).save$(done)
-        }
-        else {
-          data.id$ = githubName
-          githubEnt.make$(data).save$(done)
-        }
+
+      function complete (err) {
+        if (err) return done (err)
+        else done (null, data)
+      }
+
+      cache.load$(githubName, function (err, github) {
+        if (err) return done(err)
+        if (github) return github.data$(data).save$(complete)
+
+        data.id$ = githubName
+        cache.make$(data).save$(complete)
       })
-    }
-    else return done()
+    })
   })
 }
 

package.json

@@ -3,7 +3,8 @@
   "version": "6.0.0",
   "description": "nodezoo.com micro-service handling github meta data",
   "scripts": {
-    "start": "node srv/start.js"
+    "start": "node srv/start.js",
+    "isolated": "GITHUB_ISOLATED=true node srv/start.js"
   },
   "main": "lib/github.js",
   "keywords": [

srv/start.js

@@ -11,18 +11,26 @@ var opts = {
     tag: envs.GITHUB_TAG || 'nodezoo-github'
   },
   github: {
-    token: envs.GITHUB_TOKEN || ''
+    token: envs.GITHUB_TOKEN || '668fd718441b4d97699763b9d97f402c8370d331'
   },
   mesh: {
     auto: true,
     listen: [
       {pin: 'role:github,cmd:get', model: 'consume'},
       {pin: 'role:info,req:part', model: 'observe'}
     ]
+  },
+  isolated: {
+    host: envs.GITHUB_HOST || 'localhost',
+    port: envs.GITHUB_PORT || '8052'
   }
 }
 
+var Service =
 Seneca(opts.seneca)
   .use(Entities)
   .use(Github, opts.github)
-  .use(Mesh, opts.mesh)
+
+envs.GITHUB_ISOLATED
+  ? Service.listen(opts.isolated)
+  : Service.use(Mesh, opts.mesh)