bait 0.4.1 → 0.5.0

data/lib/bait/build.rb

@@ -1,5 +1,7 @@
 require 'bait/object'
 require 'bait/tester'
+require 'json'
+require 'bait/pubsub'
 
 module Bait
   class Build < Bait::Object
@@ -11,39 +13,103 @@ module Bait
     attribute :owner_email, String
     attribute :name, String
     attribute :clone_url, String
-    attribute :passed, Boolean
     attribute :output, String, default: ""
-    attribute :tested, Boolean, default: false
+    attribute :status, String, default: "queued"
 
     validates_presence_of :name
     validates_presence_of :clone_url
 
-    def tester
-      @tester ||= Bait::Tester.new(self)
+    after_create do
+      Bait.broadcast(:global, :new_build, self)
+    end
+
+    after_destroy do
+      self.broadcast(:remove)
+      self.cleanup!
+    end
+
+    def test!
+      Open3.popen2e(self.script) do |stdin, oe, wait_thr|
+        self.status = "testing"
+        self.broadcast :status, self.status
+        self.save
+        oe.each do |line|
+          self.output << line
+          self.broadcast(:output, line)
+        end
+        if wait_thr.value.exitstatus == 0
+          self.status = "passed"
+        else
+          self.status = "failed"
+        end
+      end
+    rescue Errno::ENOENT => ex
+      self.output << "A test script was expected but missing.\nError: #{ex.message}"
+      self.status = "script missing"
+    ensure
+      self.save
+      self.broadcast(:status, status)
     end
 
     def test_later
-      self.tested = false
+      self.status = "queued"
+      self.output = ""
       self.save
-      fork do
-        self.tester.clone!
-        self.tester.test!
-      end
+      Bait::Tester.new.async.perform(self.id) unless Bait.env == "test"
       self
     end
 
     def queued?
-      !self.reload.tested?
+      self.reload.status == "queued"
+    end
+
+    def passed?
+      self.reload.status == "passed"
+    end
+
+    def clone_path
+      File.join(sandbox_directory, self.name)
     end
 
-    def status
-      if queued?
-        "queued"
-      elsif tested?
-        passed? ? "passed" : "failed"
+    def bait_dir
+      File.join(clone_path, ".bait")
+    end
+
+    def script
+      File.join(bait_dir, "test.sh")
+    end
+    
+    def cloned?
+      Dir.exists? File.join(clone_path, ".git/")
+    end
+
+    def cleanup!
+      FileUtils.rm_rf(sandbox_directory) if Dir.exists?(sandbox_directory)
+    end
+
+    def sandbox_directory
+      File.join Bait.storage_dir, "tester", self.name, self.id
+    end
+
+    def clone!
+      unless cloned?
+        unless Dir.exists?(sandbox_directory)
+          FileUtils.mkdir_p sandbox_directory
+        end
+        begin
+          Git.clone(clone_url, name, :path => sandbox_directory)
+        rescue => ex
+          msg = "Failed to clone #{clone_url}"
+          self.output << "#{msg}\n\n#{ex.message}\n\n#{ex.backtrace.join("\n")}"
+          self.save
+        end
       end
     end
 
-    after_destroy  { tester.cleanup! }
+    protected
+
+    def broadcast attr, *args
+      Bait.broadcast :build, attr, self.id, *args
+    end
   end
 end

data/lib/bait/cli.rb

@@ -1,3 +1,6 @@
+require 'celluloid'
+require 'bait/build'
+
 module Bait
   module CLI
     USAGE = %{usage:
@@ -9,7 +12,7 @@ module Bait
     ##
     # Start the server
     def self.server
-      puts "Starting bait server"
+      puts "== Bait/#{Bait::VERSION} booting up..."
       require 'bait/api'
       Bait::Api.run!
     end

data/lib/bait/public/stylesheets/reset.css

@@ -0,0 +1,8 @@
+/*
+YUI 3.11.0 (build d549e5c)
+Copyright 2013 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+http://yuilibrary.com/license/
+*/
+
+html{color:#000;background:#FFF}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}ol,ul{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:''}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:text-top}sub{vertical-align:text-bottom}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}input,textarea,select{*font-size:100%}legend{color:#000}#yui3-css-stamp.cssreset{display:none}

data/lib/bait/pubsub.rb

@@ -0,0 +1,18 @@
+require 'json'
+
+module Bait
+  class << self
+    @@Subscribers = []
+    def add_subscriber stream
+      @@Subscribers << stream
+    end
+    def remove_subscriber stream
+      @@Subscribers.delete stream        
+    end
+    def broadcast *args
+      @@Subscribers.each do |out|
+        out << "data: #{args.to_json}\n\n"
+      end
+    end
+  end
+end

data/lib/bait/tester.rb

@@ -2,63 +2,15 @@ require 'bait'
 require 'bait/build'
 require 'git'
 require 'open3'
+require 'sucker_punch'
 
 module Bait
   class Tester
-    attr_reader :passed
-
-    def initialize build
-      @build = build
-    end
-
-    def bait_dir
-      File.join(clone_path, ".bait")
-    end
-
-    def script
-      File.join(bait_dir, "test.sh")
-    end
-
-    def test!
-      Open3.popen2e(script) do |stdin, oe, wait_thr|
-        oe.each {|line| @build.output << line }
-        @build.passed = wait_thr.value.exitstatus == 0
-      end
-      @build.tested = true
-    rescue Errno::ENOENT => ex
-      @build.output << "A test script was expected but missing.\nError: #{ex.message}"
-    ensure
-      @build.save
-    end
-
-    def clone_path
-      File.join(sandbox_directory, @build.name)
-    end
-
-    def clone!
-      unless cloned?
-        begin
-          Git.clone(@build.clone_url, @build.name, :path => sandbox_directory)
-        rescue => ex
-          msg = "Failed to clone #{@build.clone_url}"
-          @build.output << "#{msg}\n\n#{ex.message}\n\n#{ex.backtrace}"
-          @build.save
-        end
-      end
-    end
-
-    def cloned?
-      Dir.exists? File.join(clone_path, ".git/")
-    end
-
-    def cleanup!
-      FileUtils.rm_rf sandbox_directory
-    end
-
-    def sandbox_directory
-      @sandbox_directory ||= begin
-        dir = File.join Bait.storage_dir, "build_tester", @build.id
-        FileUtils.mkdir_p(dir) && dir
+    include SuckerPunch::Job
+    def perform(build_id)
+      if @build = ::Bait::Build.find(build_id)
+        @build.clone!
+        @build.test!
       end
     end
   end

data/lib/bait/views/builds.haml

@@ -1,26 +1,9 @@
-Listing Builds
-%ul
-  - @builds.each do |build|
-    %li.build{id:build.id}
-      .header{class:build.status}
-        .status_icon= build.status
-        %a{href:build.clone_url}= build.name
-        .ref build.ref
-      .output
-        %pre= build.output
-      .actions
-        %a{href:"/build/#{build.id}/remove"} Remove
-        |
-        %a{href:"/build/#{build.id}/retest"} Retest
+%ul#builds
+  %li#loading Loading builds...
 
 %hr
 
 .manual_clone
-  To clone manually without waiting for a post-receive hook, enter the following and hit submit
-  %form{ :action => "/build/create", :method => "post"}
-    %fieldset
-      %ol
-        %li
-          %label{:for => "clone_url"} clone_url:
-          %input{:type => "text", :name => "clone_url", :class => "text"}
-      %input{:type => "submit", :value => "Go", :class => "button"}
+  Manually clone a local or remote repository: 
+  %input{:type => "text", :name => "clone_url", :class => "text"}
+  %button Go

data/lib/bait/views/layout.haml

@@ -2,10 +2,11 @@
 %html
   %head
     %title Bait
-    %link{rel:'stylesheet', href:'css/styles.css'}
-    %script{src:'js/zepto.min.js'}
-    %script{src:'js/ansi2html.js'}
-    %script{src:'js/main.js'}
+    %link{rel:'stylesheet', href:'/stylesheets/reset.css'}
+    %link{rel:'stylesheet', href:nocache('/stylesheets/application.css')}
+    %script{src:'/javascript/zepto.min.js'}
+    %script{src:'/javascript/ansi2html.js'}
+    %script{src:nocache('/javascript/application.js')}
   %body
     #nav
       %a{href:'/'}Home

data/spec/lib/bait/api_spec.rb

@@ -66,11 +66,13 @@ describe Bait::Api do
 
   describe "GET /" do
     before { get '/' }
-    it { should be_redirect }
+    it "renders the loading screen" do
+      subject.body.should match /Loading/
+    end
   end
 
-  describe "GET /build" do
-    before do
+  describe "GET /build"  do
+    before do 
       Bait::Build.create(name: "quickfox", clone_url:'...')
       Bait::Build.create(name: "slowsloth", clone_url:'...')
       get '/build'
@@ -78,9 +80,8 @@ describe Bait::Api do
 
     it { should be_ok }
 
-    it "shows the builds" do
-      subject.body.should match /quickfox/
-      subject.body.should match /slowsloth/
+    it "returns the builds as JSON" do
+      JSON.parse(subject.body).should have(2).items
     end
   end
 
@@ -94,35 +95,43 @@ describe Bait::Api do
     specify { build.should be_queued }
   end
 
-  describe "GET /build/:id/remove" do
+  describe "DELETE /build/:id" do
     before do
       @build = Bait::Build.create(name: "quickfox", clone_url:'...')
-      @sandbox = @build.tester.sandbox_directory
-      get "/build/#{@build.id}/remove"
+      @sandbox = @build.sandbox_directory
+      delete "/build/#{@build.id}"
     end
     it "removes the build from store and its files from the filesystem" do
       expect{@build.reload}.to raise_error Toy::NotFound
       Bait::Build.ids.should be_empty
       Pathname.new(@sandbox).should_not exist
     end
-    it { should be_redirect }
   end
 
-  describe "GET /build/:id/retest" do
+  describe "POST /build/:id/retest" do
     before do
       @build = Bait::Build.create(name: "quickfox", clone_url:'...')
-      @build.tested = true
       @build.output = "bla bla old output"
       @build.save
-      get "/build/#{@build.id}/retest"
-      @build.reload
+      post "/build/#{@build.id}/retest"
     end
     it "queues the build for retesting" do
-      @build.should be_queued
+      @build.reload.status.should eq 'queued'
     end
     it "clears the previous output" do
-      @build.output.should be_blank
+      @build.reload.output.should be_blank
+    end
+  end
+
+  describe "GET /events" do
+    let (:connect!) { get "/events" }
+    it "adds a global and build subscriber" do
+      Bait.should_receive(:add_subscriber).with(anything()).once
+      connect!
+    end
+    it "provides an event stream connection" do
+      connect!
+      last_response.content_type.should match(/text\/event-stream/)
     end
-    it { should be_redirect }
   end
 end

data/spec/lib/bait/build_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'bait/build'
 
 describe Bait::Build do
-    subject { Bait::Build }
+  subject { Bait::Build }
 
   describe ".all" do
     context "with nothing in the store" do
@@ -41,24 +41,20 @@ describe Bait::Build do
 
   let (:build) { Bait::Build.create(name: "app", clone_url:'...') }
 
-  describe "#test_later" do
-    it "forks in order to clone and test" do
-      build.should_receive(:fork) do |&block|
-        build.tester.should_receive(:clone!)
-        build.tester.should_receive(:test!)
-        block.call
+  describe "hooks" do
+    describe "after_create hook" do
+      it "broadcasts its creation" do
+        Bait.should_receive(:broadcast).with(:global, :new_build, kind_of(Bait::Build))
+        build
       end
-      build.test_later
     end
-  end
-
-  describe "#tester" do
-    specify { build.tester.should be_a Bait::Tester }
-  end
 
-  describe "#passed" do
-    it "starts as nil" do
-      build.passed.should be_nil
+    describe "after_destroy hook" do
+      before { build }
+      it "broadcasts its removal" do
+        Bait.should_receive(:broadcast).with(:build, :remove, build.id)
+        build.destroy
+      end
     end
   end
 
@@ -74,43 +70,37 @@ describe Bait::Build do
     end
   end
 
-  describe "#queued" do
-    subject { build }
-    context "already tested" do
-      before { build.tested = true ; build.save }
-      it { should_not be_queued }
+  describe "#sandbox_directory" do
+    it "is beneath Bait storage directory" do
+      build.sandbox_directory.should match Bait.storage_dir
     end
+  end
 
-    context "not tested" do
-      before { build.tested = false ; build.save }
-      it { should be_queued }
-    end
+  describe "#cloned?" do
+    specify { build.should_not be_cloned }
   end
 
-  describe "#status" do
-    subject { build.reload.status }
-    context 'queued' do
-      before do
-        build.tested = false
-        build.save
-      end
-      it { should eq "queued" }
+  describe "#clone!" do
+    context 'valid clone url' do
+      before { build.clone_url = repo_path ; build.clone! }
+      specify { build.output.should_not match /Failed to clone/ }
+      specify { build.should be_cloned }
     end
-    context 'passed' do
-      before do
-        build.tested = true
-        build.passed = true
-        build.save
-      end
-      it { should eq "passed" }
+    context "invalid clone url" do
+      before { build.clone_url = "invalid" ; build.clone! }
+      specify { build.output.should match /Failed to clone/ }
+      specify { build.should_not be_cloned }
     end
-    context 'failed' do
-      before do
-        build.tested = true
-        build.passed = false
-        build.save
-      end
-      it { should eq "failed" }
+  end
+
+  describe "cleanup!" do
+    before do
+      build.clone!
+    end
+    it "removes the entire sandbox" do
+      Dir.exists?(build.sandbox_directory).should be_true
+      build.cleanup!
+      Dir.exists?(build.sandbox_directory).should be_false
     end
   end
 end