瀏覽代碼

Merge branch 'master' of http://git.bbh/chess/elxr into master

production
samuel 3 年之前
父節點
當前提交
68a7378000
共有 3 個檔案被更改,包括 24 行新增25 行删除
  1. 9
    3
      index.js
  2. 0
    22
      repolog.js
  3. 15
    0
      result.js

+ 9
- 3
index.js 查看文件

@@ -1,4 +1,4 @@
var repolog = require('./repolog')
var statuslog = require('./result')
var path = require('path');
var utils = require('bbhverse');
var any = utils.any;
@@ -40,6 +40,8 @@ var defaultRepoServer = reposervers[0]
var currentGitAuthUser ; // nodeShellExec('git', ['config', 'user.email']) ... PB : TODO-- get the current gittea username
var defaultRepoOwner = 'chess';

// PB : TODO -- If we are run from an elevated shell it never moves forward and simply exits.
// -- Currently workaround is to always run from a non-elevated shell.
var __isElevated = null;
var isRunningElevated = ()=>{
if(__isElevated === null) {
@@ -693,7 +695,7 @@ var __runcmd = function(label){
if(existsSync(repo)) {
console.log('pulling ' + repo)
return nodeShellExec.apply(null, getPullCmd(repo)).then((srepo)=>{
repolog.statuslog(null, srepo)}).catch((e)=>{ console.error(e) })
statuslog.statuslog(null, srepo)}).catch((e)=>{ statuslog.statuslog(e, srepo); console.error(e) })
}
else {
// PB : TODO -- detect if a clonable repo exists in currentGitAuthUser
@@ -725,7 +727,11 @@ var __runcmd = function(label){
pendingpulls.push(performPull(r))
} )
Promise.all(pendingpulls).then(results =>{
console.log(repolog.log.SUCCESS)
// console.log(statuslog.log.SUCCESS)
console.log('Total : ' + (statuslog.log.SKIPPED.length + statuslog.log.SUCCESS.length + statuslog.log.FAILURE.length))
console.log('Pass : ' + statuslog.log.SUCCESS.length )
console.log('Fail : ' + statuslog.log.FAILURE.length)
console.log('Skipped : ' + statuslog.log.SKIPPED.length)
})
}
return isRunningElevated().then(

+ 0
- 22
repolog.js 查看文件

@@ -1,22 +0,0 @@
var log = {
SUCCESS : []
, ERROR : []
, FAIL : []
}

var statuslog = function (err, data){
if(err)
{
log.ERROR.push(data)
}
else
{
log.SUCCESS.push(data)
}
}

module.exports = {
'log' : log
, 'statuslog' : statuslog
}

+ 15
- 0
result.js 查看文件

@@ -0,0 +1,15 @@
var log = {
SUCCESS : []
, FAILURE : []
, SKIPPED : []
}

var statuslog = function (err, data){
if(err) log.FAILURE.push( {err, data} )
else log.SUCCESS.push(data)
}

module.exports = {
'log' : log
, 'statuslog' : statuslog
}

Loading…
取消
儲存