bait 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c5af67ed0329a0614ff18ff0a026a99319e0ba
-  data.tar.gz: 982fcc03f85c56a2601599fd2c7666fe7ad1f26e
+  metadata.gz: f731d3eadd100d677db8a67aea6e93cfb2fb7e71
+  data.tar.gz: c46a0e68d7812ea7107eeb91c50e8066733574f1
 SHA512:
-  metadata.gz: ac1219d79448efc9c7756acf63eb1778ab53c9394a0f833467f92985477ed2d43f72a51fe19289b91f4ef82aa52bbb495222ff6dc48d5c645be9c6a5417a3df5
-  data.tar.gz: bd5b7a3855e2e09d797b850baa0649500cc9dc984ddd82d7c85bc851ac852818daa74b69fdcdafd7781ed4e81eec1f0e5cd82a88825ad16380b8c6ae9a418289
+  metadata.gz: f262d95d082542abb556dd864e610614057f50f63400b6a7878ffffb9a50ee244436551b7e0a01be4ddfd41df3987bc178329177028112c57e7599cdaa376912
+  data.tar.gz: 60ccfa1b81f4b92dabe717b75d88e64c5c6c14771d3c75147452e63f8bc830270f1f1511db0fc6ff7374259aa2609600d06b9bf6a1483a9e22c1b0e0b6ec0146

data/.bait/test.sh

@@ -5,4 +5,4 @@ cd $project_dir
 
 echo "bundling"
 bundle > /dev/null 2>&1
-bundle exec rspec spec
+bundle exec rspec spec --color --format documentation

data/Gemfile.lock

@@ -1,11 +1,14 @@
 PATH
   remote: .
   specs:
-    bait (0.4.1)
+    bait (0.5.0)
       git
       haml
       moneta
       sinatra
+      sinatra-asset-snack
+      sinatra-contrib
+      sucker_punch
       thin
       toystore
 
@@ -19,11 +22,20 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     adapter (0.7.0)
+    backports (3.3.3)
     builder (3.0.4)
+    celluloid (0.14.1)
+      timers (>= 1.0.0)
     coderay (1.0.9)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.3)
     daemons (1.1.9)
     diff-lcs (1.2.4)
     eventmachine (1.0.3)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
     ffi (1.9.0)
     formatador (0.2.4)
     git (1.2.5)
@@ -36,7 +48,7 @@ GEM
     guard-rspec (3.0.2)
       guard (>= 1.8)
       rspec (~> 2.13)
-    haml (4.0.2)
+    haml (4.0.3)
       tilt
     i18n (0.6.4)
     listen (1.2.2)
@@ -45,6 +57,7 @@ GEM
       rb-kqueue (>= 0.2)
     lumberjack (1.0.4)
     method_source (0.8.1)
+    mime-types (1.23)
     moneta (0.7.19)
     multi_json (1.7.7)
     pry (0.9.12.2)
@@ -70,6 +83,7 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
+    sass (3.2.10)
     simple_uuid (0.3.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
@@ -79,13 +93,28 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    sinatra-asset-snack (0.1.5)
+      coffee-script
+      mime-types
+      sass
+      sinatra
+    sinatra-contrib (1.4.0)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.2)
+      tilt (~> 1.3)
     slop (3.4.6)
+    sucker_punch (1.0.1)
+      celluloid (~> 0.14.1)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
+    timers (1.1.0)
     toystore (0.13.2)
       activemodel (~> 3.0)
       activesupport (~> 3.0)

data/README.md

@@ -20,32 +20,26 @@ You may also test manually by inputting a clone URL within the UI
 # Architectural Overview
 
 ```
-                    Github POST bait:8417/
-______________________        \./
-|  Mac OS X 10.8     |         |
-|   w/ RubyMotion    |         |
-|  ----------------  +---------+----------------+
-|                          +---+---+            |
-|                          |  API  |----[haml]------- you
-|                          +---+---+            |
-|                              |                |
-|                       +---------+--+          |
-|                       |Bait::Build |          |
-|                       +---+-----+--+          |
-|                          \|/   /|\            |
-|                          \|/   /|\            |
-|                          \[build]\            |
-|                          \|/   /|\            |
-|    _____________         \|/   /|\            |
-|   [ your project]      +------------+         |
-|   [.bait/test.sh]------|Bait::Tester|         |
-|   [status/output]      +------------+         |
+           Github POST bait:8417/--------+
+                                         |
++----------------------------------------|------+
+|    +------------+                  +--\|/--+  | +-------------+
+|    | new Build  <------------------|  API  <----|   Browser   |
+|    +-----+------+                  |       |  | |             |
+|          |                         |       |  | |             |
+|          |        +-------------+  |       |  | |             |
+|          |        | EventStream |  |       |  | |             |
+|     +---\|/----+  | Connection  <------+   |  | |             |
+|     |Queue Job |  |             |  |   |   |  | |             |
+|     +----+-----+  |Build Events |  |   |   |  | |             |
+|          |        |Subscription |  |   |   |  | |             |
+|          |        +--+------+---+  |/events----->[EventSource]|
+|    +----\|/-----+    |      |      +---+---+  | +-------------+
+|    | Test Build |    |      |          |      |
+|    |[subprocess]+----+      +----------+      |
+|    +------------+                             |
 |                                               |
 +-----------------------------------------------+
-
-   Bait::Build -- Persistent ToyStore
-
-   Bait::Tester -- Runs your tests and persists results in Bait::Build
 ```
 
 *Created with [JavE](http://www.jave.de/)*

data/Rakefile

@@ -4,3 +4,7 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :pry do
+  require 'pry'; binding.pry
+end

data/VERSION

@@ -1,3 +1,3 @@
-0.4.1
+0.5.0
 
 

data/assets/js/bait.coffee

@@ -0,0 +1,11 @@
+window.Bait =
+  # Wrap our usage of event source:
+  # Incoming data is always an Array, the 
+  # first value indicates the scope
+  # the second value is the callback
+  subscribe: (handlers) ->
+    source = new EventSource('/events')
+    source.addEventListener "message", (e) ->
+      data = JSON.parse(e.data)
+      handler = handlers[data[0]][data[1]]
+      handler.apply(@, data.slice(2))

data/assets/js/build.coffee

@@ -0,0 +1,67 @@
+window.Build =
+  find: (id) -> $("##{id}")
+
+  all: (cb) -> $.getJSON '/build', (data) -> cb(data)
+
+  DOM:
+    UIHelper:
+      # Click log to expand/collapse
+      expand_toggle: (el) ->
+        el.on "click", (e) ->
+          if el.css("max-height") is "100px"
+            el.css "max-height", "100%"
+          else
+            el.css "max-height", "100px"
+
+      enable_links: (element) ->
+        element.find('a.remove').click ->
+          $.ajax
+            type: "DELETE"
+            url: $(@).data('url')
+          return false
+
+        element.find('a.retest').click ->
+          $(@).parents('.build').find('pre').html("")
+          $.post $(@).data('url')
+          return false
+
+    init: (build_id) ->
+      build = Build.find(build_id)
+
+      # Color the output logs
+      pre = build.find(".output pre")
+      output = pre.html()
+      if output? && output.size > 0
+        pre.html ansi2html(output)
+      
+      # Enable expansion toggle
+      Build.DOM.UIHelper.expand_toggle pre  
+      Build.DOM.UIHelper.enable_links build
+
+  List:
+    add: (build) ->
+      html = Build.to_html(build)
+      if $('.build').length > 0
+        $('.build').first().before html
+      else
+        $('ul#builds').append html
+      Build.DOM.init build.id
+
+  to_html: (build) ->
+    """
+    <li id="#{build.id}" class="build">
+      <div class="header #{build.status}">
+        <div class="status">#{build.status}</div>
+        <a href="#{build.clone_url}">#{build.name}</a>
+        <div class="ref">#{build.ref?=''}</div>
+      </div>
+      <div class="output">
+        <pre>#{build.output}</pre>
+      </div>
+      <div class="actions">
+        <a href="#" class="remove" data-url="/build/#{build.id}">Remove</a>
+        |
+        <a href="#" class="retest" data-url="/build/#{build.id}/retest">Retest</a>
+      </div>
+    </li>
+    """

data/assets/js/main.coffee

@@ -0,0 +1,22 @@
+Zepto ($) ->
+  ManualClone.init()
+
+  Build.all (builds) ->
+    $.each builds, (i,d) ->
+      Build.List.add d.build
+    $("#loading").remove()
+
+  Bait.subscribe
+    global:
+      new_build: (data) ->
+        Build.List.add data.build
+    build:
+      output: (id, text) ->
+        pre = Build.find(id).find('pre')
+        pre.append ansi2html(text)
+      status: (id, text) ->
+        header = Build.find(id).find(".header")
+        header.find(".status").html text
+        header.attr "class", "header #{text}"
+      remove: (id) ->
+        Build.find(id).remove()

data/assets/js/manual_clone.coffee

@@ -0,0 +1,24 @@
+window.ManualClone =
+  init: ->
+    form = $('.manual_clone')
+    field = form.find('input')
+    button = form.find('button')
+    manual_clone = ->
+      input = field.val()
+      if input.length > 0
+        if not button.attr('disabled')
+          button.attr('disabled', 'disabled')
+          $.post '/build/create', {clone_url: input}, (response) ->
+            console.log response
+            button.removeAttr('disabled')
+      else
+        alert "Enter a local path or remote url to a git repo, e.g.:\n
+        Local: /Users/your/project\n
+        Remote: https://github.com/your/project"
+
+    field.keypress (e) ->
+      if e.keyCode is 13
+        manual_clone()
+
+    button.on 'click', ->
+      manual_clone()

data/assets/stylesheets/build.scss

@@ -0,0 +1,30 @@
+.build {
+  border-radius:12px;
+  border:2px solid RGB(201,49,20);
+  margin:20px;
+  .header {
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    padding: 5px;
+    position:relative;
+    .status {
+      top:4px;
+      right:4px;
+      position:absolute;
+    }
+  }
+  .header.passed {
+    background-color:RGB(71,213,86);
+  }
+  .header.failed {
+    background-color: RGB(247,65,67);
+  }
+  .output pre {
+    cursor:pointer;
+    color: white;
+    background-color:black;
+    max-height:100px;
+    overflow-y:hidden;
+    overflow-x:scroll;
+  }
+}

data/assets/stylesheets/main.scss

@@ -0,0 +1,28 @@
+@font-face {
+  font-family: 'Ubuntu';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Ubuntu'), url(/fonts/ubuntu.woff) format('woff');
+}
+
+body {
+  font-family: 'Ubuntu';
+  background-color:RGB(255,254,254);
+}
+
+.actions {
+  background-color:RGB(254,238,195);
+  text-align:center;
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+  a {
+    color: RGB(20,77,105);
+    text-decoration:none;
+  }
+  a:hover {
+    color: RGB(201,49,20);
+  }
+}
+
+
+

data/bait.gemspec

@@ -27,9 +27,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
 
   spec.add_runtime_dependency "sinatra"
+  spec.add_runtime_dependency "sinatra-contrib"
+  spec.add_runtime_dependency 'sinatra-asset-snack'
   spec.add_runtime_dependency "moneta"
   spec.add_runtime_dependency "toystore"
   spec.add_runtime_dependency "git"
   spec.add_runtime_dependency "haml"
   spec.add_runtime_dependency "thin"
+  spec.add_runtime_dependency "sucker_punch"
 end

data/lib/bait/api.rb

@@ -1,14 +1,22 @@
 require 'sinatra'
+require 'sinatra/streaming'
+require 'sinatra/asset_snack'
 require 'haml'
 require 'json'
+require 'bait/pubsub'
 require 'bait/build'
 
 module Bait
   class Api < Sinatra::Base
+    register Sinatra::AssetSnack
     set :port, 8417
+    set server: 'thin'
+
+    asset_map '/javascript/application.js', ['assets/js/**/*.js', 'assets/js/**/*.coffee']
+    asset_map '/stylesheets/application.css', ['assets/stylesheets/**/*.css', 'assets/stylesheets/**/*.scss']
 
     get '/' do
-      redirect '/build'
+      haml :builds
     end
 
     post '/' do
@@ -25,8 +33,9 @@ module Bait
     end
 
     get '/build' do
+      content_type :json
       @builds = Bait::Build.all
-      haml :builds
+      @builds.to_json
     end
 
     post '/build/create' do
@@ -35,21 +44,26 @@ module Bait
         name:params["clone_url"].split('/').last
       })
       build.test_later
-      redirect '/build'
     end
 
-    get '/build/:id/remove' do
+    delete '/build/:id' do
       Build.destroy params["id"]
-      redirect '/build'
     end
 
-    get '/build/:id/retest' do
+    post '/build/:id/retest' do
       build = Build.find params['id']
-      build.tested = false
-      build.output = ""
-      build.save
       build.test_later
-      redirect '/build'
+    end
+
+    helpers Sinatra::Streaming
+
+    get '/events', provides: 'text/event-stream' do
+      stream(:keep_open) do |out|
+        Bait.add_subscriber out
+        out.callback do
+          Bait.remove_subscriber out
+        end
+      end
     end
   end
 end