Merge pull request #504 from integer32llc/ci-badge

Add support for showing Travis and Appveyor current build status badges

Author: alexcrichton

Cargo.lock

@@ -24,7 +24,7 @@ git2 = "0.6"
 flate2 = "0.2"
 semver = "0.5"
 url = "1.2.1"
-postgres = { version = "0.13", features = ["with-time", "with-openssl"] }
+postgres = { version = "0.13", features = ["with-time", "with-openssl", "with-rustc-serialize"] }
 r2d2 = "0.7.0"
 r2d2_postgres = "0.11"
 openssl = "0.9"

Cargo.toml

@@ -0,0 +1,16 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+    tagName: 'span',
+    classNames: ['badge'],
+    repository: Ember.computed.alias('badge.attributes.repository'),
+    branch: Ember.computed('badge.attributes.branch', function() {
+        return this.get('badge.attributes.branch') || 'master';
+    }),
+    service: Ember.computed('badge.attributes.service', function() {
+        return this.get('badge.attributes.service') || 'github';
+    }),
+    text: Ember.computed('badge', function() {
+        return `Appveyor build status for the ${ this.get('branch') } branch`;
+    })
+});

app/components/badge-appveyor.js

@@ -0,0 +1,13 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+    tagName: 'span',
+    classNames: ['badge'],
+    repository: Ember.computed.alias('badge.attributes.repository'),
+    branch: Ember.computed('badge.attributes.branch', function() {
+        return this.get('badge.attributes.branch') || 'master';
+    }),
+    text: Ember.computed('branch', function() {
+        return `Travis CI build status for the ${ this.get('branch') } branch`;
+    })
+});

app/components/badge-travis-ci.js

@@ -20,6 +20,7 @@ export default Ember.Controller.extend({
     requestedVersion: null,
     keywords: computed.alias('crate.keywords'),
     categories: computed.alias('crate.categories'),
+    badges: computed.alias('crate.badges'),
 
     sortedVersions: computed.readOnly('crate.versions'),
 

app/controllers/crate/version.js

@@ -19,6 +19,21 @@ export default {
         "name": "rust_mixin",
         "repository": "https://github.com/huonw/external_mixin",
         "updated_at": "2015-02-27T11:52:13Z",
+        "badges": [
+            {
+                "attributes": {
+                    "repository": "huonw/external_mixin"
+                },
+                "badge_type": "appveyor"
+            },
+            {
+                "attributes": {
+                    "branch": "master",
+                    "repository": "huonw/external_mixin"
+                },
+                "badge_type": "travis-ci"
+            }
+        ],
         "versions": null
     }, {
         "created_at": "2015-02-27T11:51:58Z",

app/mirage/fixtures/search.js

@@ -1,4 +1,5 @@
 import DS from 'ember-data';
+import Ember from 'ember';
 
 export default DS.Model.extend({
     name: DS.attr('string'),
@@ -17,6 +18,16 @@ export default DS.Model.extend({
     license: DS.attr('string'),
 
     versions: DS.hasMany('versions', { async: true }),
+    badges: DS.attr(),
+    enhanced_badges: Ember.computed.map('badges', badge => ({
+        // jshint ignore:start
+        // needed until https://github.com/jshint/jshint/issues/2991 is fixed
+        ...badge,
+        // jshint ignore:end
+        component_name: `badge-${badge.badge_type}`
+    })),
+    badge_sort: ['badge_type'],
+    annotated_badges: Ember.computed.sort('enhanced_badges', 'badge_sort'),
     owners: DS.hasMany('users', { async: true }),
     version_downloads: DS.hasMany('version-download', { async: true }),
     keywords: DS.hasMany('keywords', { async: true }),

app/models/crate.js

@@ -119,9 +119,6 @@
     }
     .vers {
         margin-left: 10px;
-        img {
-            margin-bottom: -4px;
-        }
     }
 
     .stats {

app/styles/crate.scss

@@ -0,0 +1,6 @@
+<a href="https://ci.appveyor.com/project/{{ repository }}">
+    <img
+        src="https://ci.appveyor.com/api/projects/status/{{ service }}/{{ repository }}?svg=true&branch={{ branch }}"
+        alt="{{ text }}"
+        title="{{ text }}" />
+</a>

app/templates/components/badge-appveyor.hbs

@@ -0,0 +1,6 @@
+<a href="https://travis-ci.org/{{ repository }}">
+    <img
+        src="https://travis-ci.org/{{ repository }}.svg?branch={{ branch }}"
+        alt="{{ text }}"
+        title="{{ text }}" />
+</a>