rearrange things

AssetFile

@@ -26,7 +26,7 @@ input 'assets/javascripts' do
     concat files, 'vendor.js'
   end
 
-  match '{app,config,data,lib}/**/*.coffee' do
+  match %r(^(travis|(app|config|data|lib)/.*)\.coffee$) do
     coffee_script
   end
 
@@ -39,7 +39,7 @@ input 'assets/javascripts' do
     concat 'app/templates.js'
   end
 
-  match '{app,config,data,lib}/**/*.js' do
+  match %r(^(travis|(app|config|data|lib)/.*)\.js$) do
     minispade(
       string: true,
       rewrite_requires: true,

assets/javascripts/app/app.coffee

@@ -1,28 +1,22 @@
-require 'hax0rs'
-require 'ext/jquery'
+require 'travis' # hrm.
+require 'controllers'
+require 'helpers'
+require 'models'
+require 'pusher'
+require 'routes'
+require 'store'
+require 'templates'
+require 'views'
+
+require 'config/locales'
+require 'data/sponsors'
 
 # $.mockjaxSettings.log = false
 # Ember.LOG_BINDINGS = true
 Ember.ENV.RAISE_ON_DEPRECATION = true
 # Pusher.log = -> console.log(arguments)
 
-@Travis = Em.Namespace.create
-  CONFIG_KEYS: ['rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala']
-
-  INTERVALS: { sponsors: -1, times: -1 }
-
-  QUEUES: [
-    { name: 'common',  display: 'Common' }
-    { name: 'php',     display: 'PHP, Perl and Python' }
-    { name: 'node_js', display: 'Node.js' }
-    { name: 'jvmotp',  display: 'JVM and Erlang' }
-    { name: 'rails',   display: 'Rails' }
-    { name: 'spree',   display: 'Spree' }
-  ]
-
-  run: (attrs) ->
-    @app = Travis.App.create(attrs || {})
-
+Travis.reopen
   App: Em.Application.extend
     init: ->
       @_super()
@@ -49,15 +43,4 @@ Ember.ENV.RAISE_ON_DEPRECATION = true
         @controller.connectOutlet(outletName: 'layout', controller: @layout, viewClass: viewClass)
       @layout
 
-require 'controllers'
-require 'helpers'
-require 'models'
-require 'pusher'
-require 'routes'
-require 'store'
-require 'templates'
-require 'views'
-
-require 'config/locales'
-require 'data/sponsors'
 

assets/javascripts/app/routes.coffee

@@ -4,22 +4,9 @@ Travis.Routes = ->
     Em.routes.set('wantsHistory', true)
     Em.routes.set('baseURI', @base_uri)
 
-    @add(route, target[0], target[1]) for route, target of Travis.Routes.ROUTES
+    @add(route, target[0], target[1]) for route, target of Travis.ROUTES
     Travis.Routes.initialized = true
 
-$.extend Travis.Routes,
-  ROUTES:
-    'profile':                     ['profile', 'show']
-    'stats':                       ['stats', 'show']
-    ':owner/:name/jobs/:id/:line': ['home', 'job']
-    ':owner/:name/jobs/:id':       ['home', 'job']
-    ':owner/:name/builds/:id':     ['home', 'build']
-    ':owner/:name/builds':         ['home', 'builds']
-    ':owner/:name/pull_requests':  ['home', 'pullRequests']
-    ':owner/:name/branches':       ['home', 'branches']
-    ':owner/:name':                ['home', 'current']
-    '':                            ['home', 'index']
-
 $.extend Travis.Routes.prototype,
   base_uri: "#{document.location.protocol}//#{document.location.host}"
 

assets/javascripts/lib/hax0rs.coffee

@@ -1,26 +1,26 @@
-window.onTrue = (object, path, callback) ->
-  if object.get(path)
-    callback()
-  else
-    observer = ->
-      object.removeObserver path, observer
-      callback()
-    object.addObserver path, observer
-
-window.onceLoaded = ->
-  objects = Array.prototype.slice.apply(arguments)
-  callback = objects.pop()
-
-  # sadly Ember.Enumerable.compact does not remove undefined values
-  objects = ((object || null) for object in objects).compact()
-  object = objects.shift()
-
-  if object
-    path = if Ember.isArray(object) then 'firstObject.isLoaded' else 'isLoaded'
-    onTrue object, path, ->
-      if objects.length == 0
-        callback(object)
-      else
-        onceLoaded.apply(objects + [callback])
-  else
-    callback object
+# window.onTrue = (object, path, callback) ->
+#   if object.get(path)
+#     callback()
+#   else
+#     observer = ->
+#       object.removeObserver path, observer
+#       callback()
+#     object.addObserver path, observer
+#
+# window.onceLoaded = ->
+#   objects = Array.prototype.slice.apply(arguments)
+#   callback = objects.pop()
+#
+#   # sadly Ember.Enumerable.compact does not remove undefined values
+#   objects = ((object || null) for object in objects).compact()
+#   object = objects.shift()
+#
+#   if object
+#     path = if Ember.isArray(object) then 'firstObject.isLoaded' else 'isLoaded'
+#     onTrue object, path, ->
+#       if objects.length == 0
+#         callback(object)
+#       else
+#         onceLoaded.apply(objects + [callback])
+#   else
+#     callback object

assets/javascripts/travis.coffee

@@ -0,0 +1,34 @@
+require 'ext/jquery'
+require 'ext/ember/namespace'
+
+@Travis = Em.Namespace.create
+  CONFIG_KEYS: ['rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala']
+
+  ROUTES:
+    'profile':                     ['profile', 'show']
+    'stats':                       ['stats', 'show']
+    ':owner/:name/jobs/:id/:line': ['home', 'job']
+    ':owner/:name/jobs/:id':       ['home', 'job']
+    ':owner/:name/builds/:id':     ['home', 'build']
+    ':owner/:name/builds':         ['home', 'builds']
+    ':owner/:name/pull_requests':  ['home', 'pullRequests']
+    ':owner/:name/branches':       ['home', 'branches']
+    ':owner/:name':                ['home', 'current']
+    '':                            ['home', 'index']
+
+  QUEUES: [
+    { name: 'common',  display: 'Common' }
+    { name: 'php',     display: 'PHP, Perl and Python' }
+    { name: 'node_js', display: 'Node.js' }
+    { name: 'jvmotp',  display: 'JVM and Erlang' }
+    { name: 'rails',   display: 'Rails' }
+    { name: 'spree',   display: 'Spree' }
+  ]
+
+  INTERVALS: { sponsors: -1, times: -1 }
+
+  run: (attrs) ->
+    @app = Travis.App.create(attrs || {})
+
+
+