3
0
mirror of https://github.com/reality/dbot.git synced 2024-12-25 12:12:35 +01:00

Merge pull request #396 from zuzak/credit

Add automagic attribution
This commit is contained in:
reality 2013-04-20 22:08:27 -07:00
commit 27d1de25a1
5 changed files with 73 additions and 38 deletions

View File

@ -4,16 +4,26 @@ var exec = require('child_process').exec,
var pages = function(dbot) {
var quoteCat = dbot.db.quoteArrs[dbot.config.name],
rev, diff, branch;
rev, diff, branch, credit, authors = [];
exec("git log --format='%cN¬' | sort -u | tr -d '\n'", function (error, stdout, sderr) {
var credit = stdout.split("¬"); // nobody uses ¬, do they?
for (var i = 0; i < credit.length; i++) {
if ((credit[i].split(" ").length) == 2){
console.log(credit[i]);
authors.push(credit[i]);
}
}
});
exec("git rev-list --all | wc -l", function(error, stdout, stderr) {
rev = stdout
rev = stdout;
});
exec("git rev-parse --abbrev-ref HEAD", function(error, stdout, stderr) {
branch = stdout
});
exec("git log -1", function(error, stdout, stderr) {
diff = stdout
});
@ -33,7 +43,10 @@ var pages = function(dbot) {
}
res.render('project', {
"configList": dbot.modules.project.api.configList(), // what variable do I put here
"configList": dbot.modules.project.api.configList(),
"authors": authors, //dbot.modules.project.api.getAuthors(),
"credits": dbot.t("credits"),
"thanks": dbot.t("thanks"),
"name": dbot.config.name,
"intro": dbot.t("dbotintro", {
"botname": dbot.config.name

View File

@ -4,7 +4,8 @@
* the dbot.
*/
_ = require('underscore');
_ = require('underscore'),
exec = require('child_process').exec;
var project = function(dbot) {
@ -16,7 +17,7 @@ var project = function(dbot) {
"username": dbot.config.dent.username
}));
}
if(dbot.config.dent.dentQuotes) {
if(_.has(dbot.config.dent.dentQuotes)) {
list.push(dbot.t("dent-push"));
}
if(_.has(dbot.modules,'link')){
@ -40,10 +41,17 @@ var project = function(dbot) {
}));
}
return list;
},
'getAuthors': function(callback) {
var foo = ['a','b','c'];
exec("git rev-list --all | wc -l", function(error, stdout, stderr){
foo.push(stdout);
});
callback(foo);
}
};
}
}
}
exports.fetch = function(dbot){
return new project(dbot);
}

View File

@ -9,6 +9,12 @@
"it": "{name} parla {lang} ({langen})",
"nl": "{name} spreekt {lang} ({langen})"
},
"thanks": {
"en": "With thanks to:"
},
"credits": {
"en": "Authors"
},
"pagetitle": {
"en": "{botname} web interface",
"fr": "{botname} interface réseau",

View File

@ -59,6 +59,7 @@ ul {
text-align:center;
margin-left:0;
margin-bottom:5px;
font-size:80%;
}
li {
background-image: linear-gradient(to bottom, #f5ebe2, #f5e6d8);

View File

@ -16,36 +16,43 @@ html(lang='#{curr839}')
p.intro
#{dquote}
section#development
h3 #{development}
h4 #{git}
p.center
#{revnum}
ul
li #{branch}
pre#gitdiff
#{diff}
h4 #{milestonehead}
table#milestones.center
tr
th #{milestonename}
th #{milestoneprog}
th #{openmilestone}
th #{closedmilestone}
each milestone in milestones
- var width = ((milestone.closed_issues/(milestone.open_issues + milestone.closed_issues))*100)
tr(id="milestone"+milestone.number)
td
a(href="https://github.com/"+repo+"/issues?milestone="+milestone.number)
#{milestone.title}
td
div.progress(class=milestone.state)
div.progress-inner(style="width:"+width+"%")(class=milestone.state)
&nbsp;
print #{Math.round(width)+"%"}
td #{milestone.open_issues}
td #{milestone.closed_issues}
p.center
a(href="https://github.com/"+repo) #{propaganda}
h3 #{development}
h4 #{git}
p.center
#{revnum}
ul
li #{branch}
pre#gitdiff
#{diff}
h4 #{milestonehead}
table#milestones.center
tr
th #{milestonename}
th #{milestoneprog}
th #{openmilestone}
th #{closedmilestone}
each milestone in milestones
- var width = ((milestone.closed_issues/(milestone.open_issues + milestone.closed_issues))*100)
tr(id="milestone"+milestone.number)
td
a(href="https://github.com/"+repo+"/issues?milestone="+milestone.number)
#{milestone.title}
td
div.progress(class=milestone.state)
div.progress-inner(style="width:"+width+"%")(class=milestone.state)
&nbsp;
print #{Math.round(width)+"%"}
td #{milestone.open_issues}
td #{milestone.closed_issues}
p.center
a(href="https://github.com/"+repo) #{propaganda}
h4
#{credits}
p.center
#{thanks}
ul#credits
each author in authors
li #{author}
section#config
h3 #{config}
ul