Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

badges == awesome! #100

Merged
merged 2 commits into from
Jul 14, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ var init = exports.init = function (config) {
app.get('/:org/:repo/', auth.requireReadAccess, routes_jobs.latest_build);
app.get('/:org/:repo/job/:job_id', auth.requireReadAccess, routes_jobs.job);

// todo: make a config option to make this private?
app.get('/:user/:org/:repo/badge', routes_jobs.badge);

/* Requires admin access to the repository in the path */
app.get('/:org/:repo/config', auth.requireUser, auth.requireRepoAdmin,
routes.config);
Expand Down
2 changes: 2 additions & 0 deletions routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var BASE_PATH = "../lib/"
var _ = require('underscore')
, Step = require('step')
, common = require(BASE_PATH + 'common')
, config = require(BASE_PATH + 'config')
, fs = require('fs')
, gh = require(BASE_PATH + 'github')
, jobs = require(BASE_PATH + 'jobs')
Expand Down Expand Up @@ -148,6 +149,7 @@ exports.config = function(req, res)
var r = {
// May be undefined if not configured
display_name: wrepo_config.display_name,
badge_url: config.strider_server_name + '/' + req.user.id + '/' + req.params.org + '/' + req.params.repo + '/badge',
repo_org: req.params.org,
repo_name: req.params.repo,
apresController: "/javascripts/apres/controller/project_config.js",
Expand Down
42 changes: 42 additions & 0 deletions routes/jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,48 @@ exports.latest_build = function(req, res)
});
};

/*
* index.badge - redirect to the right badge
*/
exports.badge = function(req, res) {
res.statusCode = 200;
var user = req.params.user;
var org = req.params.org;
var repo = req.params.repo;
var repo_url = "https://github.com/" + org + "/" + repo;

function sendBadge(name) {
return res.redirect('/images/badges/build_' + name + '.png');
}

// Ignore if can't parse as ObjectID
try {
user = new mongoose.Types.ObjectId(user);
} catch(e) {
console.debug('[badge] invalid user ObjectID', user);
return sendBadge('unknown');
}

Job.findOne()
.sort({'finished_timestamp': -1})
.where('finished_timestamp').ne(null)
.where('archived_timestamp', null)
// FIXME: is it always lowercase?
.where('repo_url', repo_url.toLowerCase())
.where('_owner', user)
.where('type').in(['TEST_ONLY','TEST_AND_DEPLOY'])
.exec(function(err, job) {
if (err || !job) {
if (err) {
console.debug('[badge] error looking for latest build', err.message);
}
return sendBadge('unknown');
}
if (job.test_exitcode === 0) return sendBadge('passing');
return sendBadge('failing');
});
};

/*
* index.job - build the job detail page
*/
Expand Down
2 changes: 1 addition & 1 deletion views/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<title class='StriderBlock_title'>{% pluginblock title %}Strider: Brilliant Continuous Deployment{% endpluginblock %}</title>
<link rel="shortcut icon" href="favicon.ico" />
{% include "bootstrap.html" %}
<script src='/javascripts/lib/jquery.timeago.js'></script>
{% pluginblock AfterHead %}{% endpluginblock %}
{% pluginblock ExtraStyles %}{% endpluginblock %}
</head>
Expand Down Expand Up @@ -90,7 +91,6 @@
{% block footerScripts %}
<script src='/socket.io/socket.io.v0.9.13.js'></script>
<script src='/javascripts/jquery.scrollTo-1.4.2-min.js'></script>
<script src='/javascripts/lib/jquery.timeago.js'></script>
<script src="/javascripts/models.js"></script>
{% endblock %}
{% block pageScripts %}
Expand Down
3 changes: 3 additions & 0 deletions views/bootstrap.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<script src="/javascripts/jquery-1.7.1.min.js"></script>
<script src="/javascripts/underscore-min.js"></script>
<script src="/javascripts/backbone-min.js"></script>
{% if (!apres) %}
<script src="/javascripts/bootstrap.min.js"></script>
{% endif %}

<!--link rel="stylesheet" href="//fonts.googleapis.com/css?family=PT+Sans:400,700"-->
<link rel="stylesheet" href="/stylesheets/css/bootstrap.css">
<link rel="stylesheet" href="/stylesheets/css/responsive.css">
Expand Down
22 changes: 21 additions & 1 deletion views/project_config.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
{% extends "base.html" %}

{% set apres = true %}
{% block bodyContent %}
<script data-main="/apres/js/lib/apres-dev.js" src="/apres/js/lib/require-1.0.8.js"></script>
<div id="build-badge-modal" class="modal fade">
<div class="modal-header">
<span type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</span>
<h3>Build Badge</h3>
</div>
<div class="modal-body">
<table class="table table-bordered">
<tbody>
<tr class="row-fluid">
<td>Image URL:</td>
<td><input class="span12" value="{{badge_url}}"/></td>
</tr>
<tr class="row-fluid">
<td>Markdown:</td>
<td><input class="span12" value="[![Build Status]({{badge_url}})]({{badge_url}})"/></td>
</tbody>
</table>
</div>
</div>
<div id="remove-github-webhooks-modal" class="modal fade"></div>
<script id="remove-github-webhooks-template" type="text/template" class="template">
<div class="modal-header">
Expand Down Expand Up @@ -204,6 +223,7 @@ <h3>Delete {{display_name}}</h3>
</tr>
</script>
<div class="span12">
<a href="#build-badge-modal" data-toggle="modal" class="badge-link pull-right">Build Badge</a>
<h3>Configuration - <a href="latest_build" class="header-emphasis">{{display_name}}</a></h3>
<p>
<div class="tabbable tabs-left">
Expand Down