github

Author: rjrodger

.dockerignore

@@ -1,24 +1,20 @@
-/* Copyright (c) 2014-2015 Richard Rodger, MIT License */
-/* jshint node:true, asi:true, eqnull:true */
-"use strict";
+/* Copyright (c) 2014-2017 Richard Rodger and other contributors, MIT License */
 
 
-var GitHubAPI = require('github')
+var Github = require('github')
 
-var gitapi  = new GitHubAPI({
-  version: "3.0.0"
-})
 
 
-
-module.exports = function github( options ){
+module.exports = function github ( options ){
   var seneca = this
 
   options = seneca.util.deepextend({
     token: 'GITHUB_TOKEN'
   },options)
 
 
+  var gitapi  = new Github()
+
 
   seneca.add( 'role:github,cmd:get', cmd_get )
   seneca.add( 'role:github,cmd:query', cmd_query )
@@ -48,7 +44,7 @@ module.exports = function github( options ){
 
             seneca.act(
               'role:github,cmd:query',
-              {name:github_name,user:out.user,repo:out.repo},
+              {name:github_name,owner:out.owner,repo:out.repo},
               done)
           })
       }
@@ -62,27 +58,32 @@ module.exports = function github( options ){
     var github_ent  = seneca.make$('github')
 
     var github_name = args.name
-    var user        = args.user
+    var owner        = args.owner
     var repo        = args.repo
 
+
+/*
     gitapi.authenticate({
       type:     "basic",
       username: options.token,
       password: 'x-oauth-basic'
     })
+*/
 
     gitapi.repos.get(
       {
-        user: user,
+        owner: owner,
         repo: repo
       },
-      function(err,repo){
+      function (err, out) {
         if( err ) return done(err);
 
+        var repo = out.data
+
         var data
         if( repo ) {
           data = {
-            user:    args.user,
+            owner:   args.owner,
             repo:    args.repo,
             stars:   repo.stargazers_count,
             watches: repo.subscribers_count,
@@ -114,7 +115,7 @@ module.exports = function github( options ){
 
     var m = /[\/:]([^\/:]+?)[\/:]([^\/]+?)(\.git)*$/.exec(args.giturl)
     if( m ) {
-      return done( null, { user:m[1], repo:m[2] })
+      return done( null, { owner:m[1], repo:m[2] })
     }
     else return done();
   }

Dockerfile

@@ -1,23 +1,38 @@
 {
   "name": "nodezoo-github",
-  "version": "5.0.0",
-  "description": "nodezoo.com micro-service handling github meta data",
+  "version": "1.0.0-tms-dev",
+  "description": "nodezoo-github",
   "main": "github.js",
   "keywords": [
     "nodezoo",
     "seneca",
     "github",
     "microservice"
   ],
-  "author": "Richard Rodger (richard.rodger@nearform.com)",
+  "scripts": {
+    "test": "lab -P test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nodezoo/nodezoo-github.git"
+  },
+  "author": "Richard Rodger (http://richardrodger.com)",
   "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/nodezoo/nodezoo-github/issues"
+  },
+  "homepage": "https://github.com/nodezoo/nodezoo-github",
+
   "dependencies": {
-    "github": "^0.2.2",
-    "seneca-redis-transport": "^0.3.0",
-    "seneca-level-store": "^0.2.3",
-    "seneca": "https://github.com/senecajs/seneca",
-    "seneca-msgstats": "https://github.com/rjrodger/seneca-msgstats",
-    "seneca-mesh": "https://github.com/rjrodger/seneca-mesh",
-    "seneca-balance-client": "https://github.com/rjrodger/seneca-balance-client"
+    "github": "9.2.0",
+    "seneca": "3.3.0",
+    "seneca-entity": "2.0.0",
+    "seneca-jsonfile-store": "1.0.0",
+    "seneca-redis-transport": "0.3.0",
+    "seneca-repl": "1.0.0"
+  },
+  "devDependencies": {
+    "code": "4.0.0",
+    "lab": "13.0.1"
   }
 }

github.js

@@ -1,15 +1,24 @@
+/* Copyright (c) 2014-2017 Richard Rodger and other contributors, MIT License */
+
+var MOCK_NPM = JSON.parse(process.env.MOCK_NPM || 'false')
+var MOCK_INFO = JSON.parse(process.env.MOCK_INFO || 'false')
+var MOCK = MOCK_NPM || MOCK_INFO
 
-var HOST = process.env.HOST || 'localhost'
 var TOKEN = process.env.TOKEN || 'NO_TOKEN'
 
-require('seneca')()
 
-  .use('redis-transport')
-  .use('level-store')
+var Seneca = require('seneca')
+
+
+Seneca({tag: 'github'})
+  .test('print')
 
-  .use('../github.js',{token:TOKEN})
+  .use('entity')
+  .use('jsonfile-store', {folder: __dirname+'/data'})
 
-  .add('role:info,req:part',function(args,done){
+  .use('..',{token:TOKEN})
+
+  .add('role:info,need:part',function(args,done){
     done()
 
     this.act(
@@ -21,8 +30,8 @@ require('seneca')()
 
         if( mod ) {
           return this.act(
-            'role:info,res:part,part:github',
-            {name:args.name,data:mod.data$()})
+            'role:info,collect:part,part:github',
+            {name:args.name,data:this.util.clean(mod.data$())})
         }
 
         this.act( 
@@ -38,16 +47,43 @@ require('seneca')()
                   if( err ) return;
 
                   if( mod ) {
-                    this.act('role:info,res:part,part:github',
-                             {name:args.name,data:mod.data$()})
+                    this.act('role:info,collect:part,part:github',
+                             {name:args.name,data:this.util.clean(mod.data$())})
                   }
                 })
             }
           })
       })
   })
 
-  .use( 'mesh', 
-        {auto:true, pins:['role:github','role:info,req:part'], model:'publish'} )
 
-  .repl(33004)
+  .use('seneca-repl', {port:10050})
+
+  .listen(9050)
+
+  .client({pin:'role:info', port:9030})
+  .client({pin:'role:npm', port:9040})
+
+
+// Run mock services that this service depends on.
+if (MOCK) {
+  var mock = Seneca({tag:'mock'})
+        .test('print')
+        .use('entity')
+
+  if (MOCK_NPM) {
+    mock
+    .listen(9040)
+    .add('role:npm', function (msg, reply) {
+      reply({"entity$":{"name":"npm"},"name":"jsonic","version":"0.2.2","giturl":"git://github.com/rjrodger/jsonic.git","desc":"JSON parser that isn't strict","readme":"","id":"jsonic"})
+    })
+  }
+
+  if (MOCK_INFO) {
+    mock
+    .listen(9030)
+    .add('role:info', function (msg, reply) {
+      reply()
+    })
+  }
+}