tms

Author: rjrodger

docker/stage/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM nodezoo-shared
+FROM nodezoo-shared:1
 
 ADD app /app/
 

docker/stage/Dockerfile-prod

@@ -0,0 +1,9 @@
+
+FROM nodezoo-github:1
+
+CMD ["node", "/app/srv/github-prod.js"]
+
+
+
+
+

docker/stage/Makefile

@@ -3,7 +3,8 @@ build :
 	mkdir -p app/srv
 	cp -r ../../github.js app
 	cp -r ../../srv/*.js app/srv
-	docker build -t nodezoo-github .
+	docker build -t nodezoo-github:1 .
+	docker build -t nodezoo-github-prod:1 -f Dockerfile-prod .
 
 clean :
 	rm *~

github.js

@@ -18,107 +18,70 @@ module.exports = function github ( options ){
 
   seneca.add( 'role:github,cmd:get', cmd_get )
   seneca.add( 'role:github,cmd:query', cmd_query )
-  seneca.add( 'role:github,cmd:parse', cmd_parse )
 
 
+  function cmd_get( msg, reply ) {
+    this
+      .make$('github')
+      .load$( msg.name, function (err, mod) {
+        if( err ) return reply(err)
 
-  function cmd_get( args, done ) {
-    var seneca      = this
-    var github_ent  = seneca.make$('github')
-
-    var github_name = args.name
-
-    github_ent.load$( github_name, function(err,github_mod){
-      if( err ) return done(err);
+        if( mod ) {
+          return reply(mod)
+        }
 
-      if( github_mod ) {
-        return done(null,github_mod);
-      }
-      else if( args.giturl ) {
-        seneca.act(
-          'role:github,cmd:parse',
-          {name:github_name,giturl:args.giturl},
+        var m = /[\/:]([^\/:]+?)[\/:]([^\/]+?)(\.git)*$/.exec(msg.giturl)
+        if (!m) return reply()
 
-          function(err,out){
-            if( err ) return done(err);
 
-            seneca.act(
-              'role:github,cmd:query',
-              {name:github_name,owner:out.owner,repo:out.repo},
-              done)
-          })
-      }
-      else return done();
-    })
+        this.act(
+          {
+            role: 'github',
+            cmd: 'query',
+            name: msg.name,
+            owner: m[1],
+            repo: m[2]
+          },
+          reply)
+      })
   }
 
 
-  function cmd_query( args, done ) {
+  function cmd_query( msg, reply ) {
     var seneca      = this
-    var github_ent  = seneca.make$('github')
-
-    var github_name = args.name
-    var owner        = args.owner
-    var repo        = args.repo
-
-
-/*
-    gitapi.authenticate({
-      type:     "basic",
-      username: options.token,
-      password: 'x-oauth-basic'
-    })
-*/
 
     gitapi.repos.get(
-      {
-        owner: owner,
-        repo: repo
-      },
+      { owner: msg.owner, repo: msg.repo },
       function (err, out) {
-        if( err ) return done(err);
-
-        var repo = out.data
-
-        var data
-        if( repo ) {
-          data = {
-            owner:   args.owner,
-            repo:    args.repo,
-            stars:   repo.stargazers_count,
-            watches: repo.subscribers_count,
-            forks:   repo.forks_count,
-            last:    repo.pushed_at
-          }
-
-          github_ent.load$(github_name, function(err,github_mod){
-            if( err ) return done(err);
-
-            if( github_mod ) {
-              return github_mod.data$(data).save$(done);
+        if (err) return reply(err)
+
+        var data = {
+          owner:   msg.owner,
+          repo:    msg.repo,
+          stars:   out.data.stargazers_count,
+          watches: out.data.subscribers_count,
+          forks:   out.data.forks_count,
+          last:    out.data.pushed_at
+        }
+
+        seneca
+          .make$('github')
+          .load$(msg.name, function (err, mod) {
+            if (err) return reply(err)
+
+            if (mod) {
+              return mod
+                .data$(data)
+                .save$(reply)
             }
             else {
-              data.id$ = github_name
-              github_ent.make$(data).save$(done);
+              data.id$ = msg.name
+              seneca
+                .make$('github')
+                .data$(data)
+                .save$(reply)
             }
           })
-        }
-        else return done()
-
-      }
-    )
+      })
   }
-
-
-  function cmd_parse( args, done ) {
-    var seneca  = this
-
-    var m = /[\/:]([^\/:]+?)[\/:]([^\/]+?)(\.git)*$/.exec(args.giturl)
-    if( m ) {
-      return done( null, { owner:m[1], repo:m[2] })
-    }
-    else return done();
-  }
-
-
 }

srv/github-prod.js

@@ -0,0 +1,54 @@
+/* Copyright (c) 2014-2017 Richard Rodger and other contributors, MIT License */
+
+var BASES = process.env.BASES.split(',')
+
+var Seneca = require('seneca')
+
+Seneca({tag: 'github'})
+  .use('entity')
+  .use('jsonfile-store', {folder: __dirname+'/../data'})
+
+  .use('../github.js')
+
+  .add('role:info,need:part', function (msg, reply) {
+    reply()
+
+    this.act(
+      'role:github,cmd:get', {name:msg.name},
+      function (err, mod) {
+        if (err) return
+
+        if (mod) {
+          return this.act('role:info,collect:part,part:github',
+                          {name:msg.name,data:this.util.clean(mod.data$())})
+        }
+
+        this.act( 
+          'role:npm,cmd:get', {name:msg.name},
+          function (err, mod) {
+            if (err) return
+
+            if (mod) {
+              this.act(
+                'role:github,cmd:get', {name:msg.name, giturl:mod.giturl},
+                function( err, mod ){
+                  if( err ) return
+
+                  if( mod ) {
+                    this.act('role:info,collect:part,part:github',
+                             {name:msg.name,data:this.util.clean(mod.data$())})
+                  }
+                })
+            }
+          })
+      })
+  })
+
+  .use('mesh', {
+    listen: [
+      {pin: 'role:github'},
+      {pin: 'role:info,need:part', model:'observe'}
+    ],
+    bases: BASES,
+    host: '@eth0',
+  })