add a sinatra app + stuff

Gemfile

@@ -1,7 +1,16 @@
 source :rubygems
 
+gem 'travis-api',     github: 'travis-ci/travis-api'
+gem 'travis-core',    github: 'travis-ci/travis-core'
+gem 'travis-support', github: 'travis-ci/travis-support'
+
 gem 'unicorn'
 gem 'sinatra'
+gem 'sinatra-contrib'
+
+gem 'pg',             '~> 0.13.2'
+gem 'newrelic_rpm',   '~> 3.3.0'
+gem 'hubble',         git: 'git://github.com/roidrage/hubble'
 
 group :assets do
   gem 'rake-pipeline', github: 'livingsocial/rake-pipeline'

Gemfile.lock

@@ -1,14 +1,54 @@
 GIT
   remote: git://github.com/livingsocial/rake-pipeline.git
-  revision: 543f4322fe70facee9572d29ddabf7f090dad68a
+  revision: 9008ba072c7a97f4c730e779358e8a0ad7b8d194
   specs:
     rake-pipeline (0.6.0)
       rake (~> 0.9.0)
       thor
 
+GIT
+  remote: git://github.com/roidrage/hubble
+  revision: 5220415d5542a2868d54f7be9f35fc1d66126b8e
+  specs:
+    hubble (0.1.2)
+      json (~> 1.6.5)
+
+GIT
+  remote: git://github.com/travis-ci/travis-api.git
+  revision: 5c29457066bbc44c0ea681462830bfb7ce96a402
+  specs:
+    travis-api (0.0.1)
+
+GIT
+  remote: git://github.com/travis-ci/travis-core.git
+  revision: 2aba2d8e9ea8bf04b7d4bbbd960e6201c73a68a1
+  specs:
+    travis-core (0.0.1)
+      actionmailer (~> 3.2.3)
+      activerecord (~> 3.2.3)
+      data_migrations (~> 0.0.1)
+      gh
+      hashr (~> 0.0.19)
+      metriks (~> 0.9.7)
+      multi_json
+      postmark-rails (~> 0.4.1)
+      pusher (~> 0.9.2)
+      railties (~> 3.2.3)
+      rake (~> 0.9.2.2)
+      redis (~> 3.0)
+      rollout (~> 1.1.0)
+      simple_states (~> 0.1.1)
+      thor (~> 0.14.6)
+
+GIT
+  remote: git://github.com/travis-ci/travis-support.git
+  revision: 44a2e3cfa76b619962f14fe72c2cca9d683c684c
+  specs:
+    travis-support (0.0.1)
+
 GIT
   remote: git://github.com/wycats/rake-pipeline-web-filters.git
-  revision: 81a22fb0808dfdeab8ed92d5d8c898ad198b9938
+  revision: 51915f60889fbf54fc2e81b86b594bf4c7be4ea5
   specs:
     rake-pipeline-web-filters (0.6.0)
       rack
@@ -17,6 +57,36 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
+      mail (~> 2.4.4)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.8)
+    arel (3.0.2)
+    atomic (1.0.1)
+    avl_tree (1.1.3)
+    backports (2.6.1)
+    builder (3.0.0)
     chunky_png (1.2.5)
     coffee-script (2.2.0)
       coffee-script-source
@@ -26,22 +96,80 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    data_migrations (0.0.1)
+      activerecord
+      rake
+    erubis (2.7.0)
+    eventmachine (0.12.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.0.11)
+    faraday (0.8.1)
+      multipart-post (~> 1.1)
+    ffi (1.1.0)
     fssm (0.2.9)
-    guard (1.1.1)
+    gh (0.7.3)
+      addressable
+      backports (~> 2.3)
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (>= 2.7)
+      net-http-pipeline
+    guard (1.2.3)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
+    hashr (0.0.21)
+    hike (1.2.1)
+    hitimes (1.1.1)
+    i18n (0.6.0)
+    journey (1.0.4)
+    json (1.6.7)
     kgio (2.7.4)
-    listen (0.4.4)
+    listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metriks (0.9.9.1)
+      atomic (~> 1.0)
+      avl_tree (~> 1.1.2)
+      hitimes (~> 1.1)
+    mime-types (1.19)
     multi_json (1.3.6)
+    multipart-post (1.1.5)
+    net-http-persistent (2.7)
+    net-http-pipeline (1.0.1)
+    newrelic_rpm (3.3.5)
+    pg (0.13.2)
+    polyglot (0.3.3)
+    postmark (0.9.12)
+      json
+      rake
+    postmark-rails (0.4.1)
+      actionmailer
+      postmark (>= 0.9.0)
+      rake
+    pusher (0.9.4)
+      multi_json (~> 1.0)
+      signature (~> 0.1.2)
     rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
     rack-protection (1.2.0)
       rack
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     raindrops (0.10.0)
     rake (0.9.2.2)
     rb-fchange (0.0.5)
@@ -49,13 +177,36 @@ GEM
     rb-fsevent (0.9.1)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    sass (3.1.19)
+    rdoc (3.12)
+      json (~> 1.4)
+    redis (3.0.1)
+    rollout (1.1.0)
+    sass (3.1.20)
+    signature (0.1.3)
+    simple_states (0.1.1)
+      activesupport
+      hashr (~> 0.0.10)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    thor (0.15.2)
+    sinatra-contrib (1.3.1)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.3.0)
+      tilt (~> 1.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
     tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack
@@ -68,8 +219,15 @@ DEPENDENCIES
   coffee-script
   compass
   guard
+  hubble!
+  newrelic_rpm (~> 3.3.0)
+  pg (~> 0.13.2)
   rake-pipeline!
   rake-pipeline-web-filters!
   sinatra
+  sinatra-contrib
   tilt
+  travis-api!
+  travis-core!
+  travis-support!
   unicorn

assets/javascripts/app/app.coffee

@@ -6,7 +6,7 @@ require 'ext/jquery'
 Ember.ENV.RAISE_ON_DEPRECATION = true
 
 @Travis = Em.Namespace.create
-  CONFIG_KEYS: ['rvm', 'gemfile', 'env', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala']
+  CONFIG_KEYS: ['rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala']
 
   INTERVALS: { sponsors: -1, times: -1 }
 

assets/javascripts/app/helpers/helpers.coffee

@@ -1,6 +1,12 @@
 require 'travis/log'
+require 'emoij'
 
 @Travis.Helpers =
+  compact: (object) ->
+    result = {}
+    (result[key] = value unless $.isEmpty(value)) for key, value of object || {}
+    result
+
   safe: (string) ->
     new Handlebars.SafeString(string)
 
@@ -73,7 +79,7 @@ require 'travis/log'
       $.each emojis.uniq(), (ix, emoji) ->
         strippedEmoji = emoji.substring(1, emoji.length - 1)
         unless EmojiDictionary.indexOf(strippedEmoji) is -1
-          image = '<img class=\'emoji\' title=\'' + emoji + '\' alt=\'' + emoji + '\' src=\'' + Travis.assets.host + '/' + Travis.assets.version + '/images/emoji/' + strippedEmoji + '.png\'/>'
+          image = '<img class=\'emoji\' title=\'' + emoji + '\' alt=\'' + emoji + '\' src=\'' + '/images/emoji/' + strippedEmoji + '.png\'/>'
           text = text.replace(new RegExp(emoji, 'g'), image)
     text
 

assets/javascripts/app/models/build.coffee

@@ -26,7 +26,7 @@ require 'travis/model'
   jobs:       DS.hasMany('Travis.Job', key: 'job_ids')
 
   config: (->
-    @getPath 'data.config'
+    Travis.Helpers.compact(@getPath('data.config'))
   ).property('data.config')
 
   isMatrix: (->

assets/javascripts/app/models/job.coffee

@@ -21,7 +21,9 @@ require 'travis/model'
   log:        DS.belongsTo('Travis.Artifact',   key: 'log_id')
 
   config: (->
-    @getPath 'data.config'
+    config = {}
+    (config[key] = value unless $.isEmpty(value)) for key, value of @getPath('data.config') || {}
+    config
   ).property('data.config')
 
   sponsor: (->
@@ -29,19 +31,20 @@ require 'travis/model'
   ).property('data.sponsor')
 
   configValues: (->
-    config = @get('config')
+    if config = @get('config')
-    return [] unless config
+      $.values($.only.apply(config, Travis.CONFIG_KEYS))
-    $.values($.only(config, 'rvm', 'gemfile', 'env', 'otp_release', 'php', 'node_js', 'scala', 'jdk', 'python', 'perl'))
+    else
+      []
   ).property('config')
 
   appendLog: (log) ->
-    @set 'log', @get('log') + log
+    @set('log', @get('log') + log)
 
   subscribe: ->
-    Travis.app.subscribe 'job-' + @get('id')
+    # Travis.app.subscribe 'job-' + @get('id')
 
   onStateChange: (->
-    Travis.app.unsubscribe 'job-' + @get('id') if @get('state') == 'finished'
+    # Travis.app.unsubscribe 'job-' + @get('id') if @get('state') == 'finished'
   ).observes('state')
 
   tick: ->

assets/javascripts/app/models/repository.coffee

@@ -16,13 +16,13 @@ require 'travis/model'
   builds: (->
     id = @get('id')
     Travis.Build.byRepositoryId id, event_type: 'push'
-    Travis.Build.filter (data) -> parseInt(data.get('repository_id')) == id && data.get('event_type') == 'push'
+    Travis.Build.filter (data) -> parseInt(data.get('repository_id')) == id && data.get('pull_request') == false
   ).property()
 
   pullRequests: (->
     id = @get('id')
     Travis.Build.byRepositoryId id, event_type: 'pull_request'
-    Travis.Build.filter (data) -> parseInt(data.get('repository_id')) == id && data.get('event_type') == 'pull_request'
+    Travis.Build.filter (data) -> parseInt(data.get('repository_id')) == id && data.get('pull_request') == true
   ).property()
 
   branches: (->

assets/javascripts/app/store/rest_adapter.coffee

@@ -1,7 +1,11 @@
 require 'models'
 
+jQuery.support.cors = true
+
 @Travis.RestAdapter = DS.RESTAdapter.extend
-  API_DOMAIN: 'http://localhost:9292'
+  # API_DOMAIN: 'http://localhost:9292'
+  # API_DOMAIN: 'http://travis.local:9292'
+  API_DOMAIN: ''
 
   DEFAULT_OPTIONS:
     accepts:
@@ -9,9 +13,13 @@ require 'models'
 
   mappings:
     repositories: Travis.Repository
-    builds: Travis.Build
+    repository:   Travis.Repository
-    commits: Travis.Commit
+    builds:       Travis.Build
-    jobs: Travis.Job
+    build:        Travis.Build
+    commits:      Travis.Commit
+    commit:       Travis.Commit
+    jobs:         Travis.Job
+    job:          Travis.Job
 
   plurals:
     repository: 'repositories',

assets/javascripts/lib/ext/jquery.coffee

@@ -38,6 +38,18 @@ $.fn.extend
     Utils.updateGithubStats repository, $(this)
 
 $.extend
+  isEmpty: (obj) ->
+    if $.isArray(obj)
+      !obj.length
+    else if $.isObject(obj)
+      !$.keys(obj).length
+    else
+      !obj
+
+  isObject: (obj) ->
+    # does this work as expected?
+    Object.prototype.toString.call(obj) == '[object Object]'
+
   keys: (obj) ->
     keys = []
     $.each obj, (key) -> keys.push key
@@ -60,8 +72,8 @@ $.extend
   capitalize: (string) ->
     string[0].toUpperCase() + string.substring(1)
 
-  compact: (array) ->
+  compact: (object) ->
-    $.grep array, (value) -> !!value
+    $.grep(object, (value) -> !!value)
 
   all: (array, callback) ->
     args = Array::slice.apply(arguments)

assets/javascripts/lib/mocks.coffee

@@ -9,10 +9,10 @@ repositories = [
 ]
 
 builds = [
-  { id: 1, repository_id: '1', commit_id: 1, job_ids: [1, 2, 3], number: 1, event_type: 'push', config: { rvm: ['rbx', '1.9.3', 'jruby'] }, duration: 30, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:30Z', result: 0 },
+  { id: 1, repository_id: '1', commit_id: 1, job_ids: [1, 2, 3], number: 1, pull_request: false, config: { rvm: ['rbx', '1.9.3', 'jruby'] }, duration: 30, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:30Z', result: 0 },
-  { id: 2, repository_id: '1', commit_id: 2, job_ids: [4],       number: 2, event_type: 'push', config: { rvm: ['rbx'] } },
+  { id: 2, repository_id: '1', commit_id: 2, job_ids: [4],       number: 2, pull_request: false, config: { rvm: ['rbx'] } },
-  { id: 3, repository_id: '2', commit_id: 3, job_ids: [5],       number: 3, event_type: 'push', config: { rvm: ['rbx'] }, duration: 30, started_at: '2012-07-02T00:01:00Z', finished_at: '2012-07-01T00:01:30Z', result: 1 },
+  { id: 3, repository_id: '2', commit_id: 3, job_ids: [5],       number: 3, pull_request: false, config: { rvm: ['rbx'] }, duration: 30, started_at: '2012-07-02T00:01:00Z', finished_at: '2012-07-01T00:01:30Z', result: 1 },
-  { id: 4, repository_id: '3', commit_id: 4, job_ids: [6],       number: 4, event_type: 'push', config: { rvm: ['rbx'] }, started_at: '2012-07-02T00:02:00Z' },
+  { id: 4, repository_id: '3', commit_id: 4, job_ids: [6],       number: 4, pull_request: false, config: { rvm: ['rbx'] }, started_at: '2012-07-02T00:02:00Z' },
 ]
 
 commits = [

config.ru

@@ -1,8 +1,11 @@
 $: << 'lib'
 
 require 'sinatra'
+require 'travis/api/app'
 
 class App < Sinatra::Base
+  use Travis::Api::App
+
   disable :protection
 
   set :root, File.dirname(__FILE__)