juici 0.0.0.alpha1 → 0.0.0

data/lib/juici/url_helpers.rb

@@ -0,0 +1,15 @@
+# So this is pretty much just horrific, but at least an interestingish
+# proof of concept
+# XXX Deprecated
+module Juici
+  def self.url_helpers(route)
+    Module.new do
+      @@route = route
+
+      def url_for(child)
+        "/#{@@route}/#{child}"
+      end
+
+    end
+  end
+end

data/lib/juici/views/README.markdown

@@ -13,8 +13,8 @@ It's designed to work well with [agent99](https://github.com/99designs/agent99)
 
 ## Important but Miscellaneous
 
-If you create child processes in modules/plugins then you need to register your
-disinterest or JuiCI will think they're builds and that would be bad.
+If you create child process in modules/plugins then you need to register your
+disinterest or JuiCI will think they're builds and that would be bad
 
 ## Setup
 
@@ -27,26 +27,12 @@ bundle exec bin/juici
 
 is all you need to have a working instance (provided that you have mongo installed)
 
-### Gotchas
-
-Make sure you don't do something innocuous like
-
-```bash
-bundle install --path .bundle
-```
-
-this might look sane (and it is, kinda) but owing to a quick in bundler, it
-will break any ruby code you try to build.
-
-I'm working on a workaround, but in the meantime the fix is to not do it!
-
 ## Usage
 
-JuiCI is very focused on minimal configuration; meaning that beyond starting
-the server and pointing it at a mongoDB instance, you do not need to do
-anything special to build a new project. Just request a build; however this
-means that on your first build you will need to send the commands to create
-your test environment)
+JuiCI chooses to be very "Mongo" (which is an adjective now), in that you don't
+need to formally create a project. Just request a build; however this means
+that on your first build you will need to send the commands to create your test
+environment)
 
 Example:
 
@@ -81,20 +67,6 @@ called with an (as yet unformalised) json body as the body if/when the build
 reaches that state. Alternately you may specify "any" as the callback state and
 it will be called on all state changes.
 
-## Integration
-
-Apps written in ruby wanting to interact with Juici can include the
-`juici-interface` gem, which presently exposes a few constants to line up with
-JuiCI's internal state.
-Over time this will be expanded, but for now they are:
-
-```ruby
-Juici::BuildStatus::PASS
-Juici::BuildStatus::FAIL
-Juici::BuildStatus::START
-Juici::BuildStatus::WAIT
-```
-
 ## Security
 
 JuiCI poses some interesting security conecerns. First off, it will allow
@@ -120,19 +92,8 @@ specifically implement it, your process won't see any of the signal handling
 madness. The shell(`/bin/sh`) will see everything, and if killed, your
 processes will become orphaned, but carry on.
 
-## Authors
-
-* [Richo Healey](https://github.com/rcho)
-* [Alec Sloman](https://github.com/alecsloman)
-
 ## Contact
 
 JuiCI's code lives on [Github](https://github.com/richo/juici)
 and the [author](mailto:richo@psych0tik.net) can be contacted on
  [Twitter](https://twitter.com/rich0H)
-
-## Legalese
-
-(c) Richo Healey 2012, richo@psych0tik.net
-
-Released under the terms of the MIT license.

data/lib/juici/views/about.erb

@@ -1,12 +1,12 @@
-<div class="row-fluid">
-  <div class="span9">
+<div class="row">
+  <div class="span8">
     <div>
-      <%= content %>
+      <%= GitHub::Markdown.render(File.read("lib/juici/views/README.markdown")) %>
     </div>
   </div>
-  <div class="span2 offset1">
+  <div class="span4">
     <div>
-      <h3 class="block-header builds-header--failure">quick links</h3>
+      <p>Quick Links</p>
       <ul>
         <li>richo on <a href="https://twitter.com/rich0H">twitter</a></li>
         <li>richo on <a href="https://github.com/richo">github</a></li>

data/lib/juici/views/builds/list.erb

@@ -1,27 +1,34 @@
-<script>
-  $(function() {
-    $('.accordion-set-url').on('click', '.set-url', function() {
-      history.pushState(null, null, $(this).data('url'));
-    })
-  });
-</script>
-
-<div class="row-fluid">
-  <!-- Pagination -->
-  <div class="span1">
-    <% pages.times.with_index do |page| %>
-      <a href="?page=<%= page %>" class="bloop<%= " active" if page == params[:page] %>"><%= page %></a>
-    <% end %>
-  </div>
-  <!-- Main contents -->
-  <div class="span11">
-    <!-- Create a new build -->
-    <h3 class="project-title"><a href="<%= build_url_for(project) %>"><%= project.name %></a><a class="btn pull-right" href="/builds/new?project=<%= project.name %>">New Build</a></h3>
-    <!-- Build history -->
-    <% builds.each_with_index do |build, idx| %>
-      <div class="accordion accordion-set-url" id="accordion<%= idx %>">
-        <%= erb(:"partials/builds/show", :locals => { :build => build, :idx => idx }) %>
+<% if proj = ::Juici::Project.where(name: project).first %>
+  <script>
+    $(document).ready(function() {
+      $(".collapse").collapse();
+    });
+  </script>
+  <h3><em><%= proj.name %></em> - <a href="/builds/new?project=<%= proj.name %>"><em>New Build</em></a></h3>
+  <% ::Juici::Build.where(parent: proj.name).sort.reverse.each_with_index do |build, idx| %>
+    <div class="accordion" id="accordion<%= idx %>">
+      <div class="accordion-heading">
+        <a class="accordion-toggle <%= build.heading_color %>" data-toggle="collapse" data-parent="#accordion<%= idx+1 %>" href="#collapse_<%= idx %>">
+          <%= build.display_title %>&nbsp;<% build[:warnings].each do |warning| %><span class="label label-important"><%= warning %></span><% end %>
+        </a>
       </div>
-    <% end %>
-  </div>
-</div>
+      <div id="collapse_<%= idx %>" class="accordion-body collapse in">
+        <div class="row">
+          <div class="span8">
+            <div>
+              <a href="<%= build_url_for(build) %>">Link to this build</a>
+            </div>
+            <div class="accordion-inner build-output">
+<%= build.output if build.respond_to? :output %>
+            </div>
+          </div>
+          <div class="span4">
+<%= erb(:"partials/builds/debug", :locals => { :build => build }) %>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  No such project.
+<% end %>

data/lib/juici/views/builds/new.erb

@@ -1,43 +1,38 @@
-<div class="row-fluid">
-
-  <div class="span4">
-    <%= erb(:"partials/index/recently_built") %>
-  </div>
-
-  <div class="span8">
-
-    <h1 class="block-header">new</h1>
-    <p>From here you can create a new build</p>
-    <p>Name is a unique identifier for the project. It doesn't need to already exist, but builds for a like project need to be named identically</p>
-    <p>Environment is a json hash of KEY - VALUE pairs, to be passed into the child environment</p>
-    <p>Command is where the magic happens. Often they'll be longwinded, but a reasonable boilerplate might look <a href="#">something like this.</a><p>
-    <hr>
-
-    <form action="/builds/new" method="post" class="submit-build">
-
-      <div class="row-fluid">
-
-        <!-- First Column -->
-        <div class="span3">
-          <label>Project Name</label>
-          <input type="text" name="project" value="<%= params[:project] %>" <%= "readonly" if params[:project] %>>
-          <label>Environment</label>
-          <input type="text" name="environment" placeholder="expects a valid json hash" value="">
-          <label>Priority</label>
-          <input type="text" name="priority" value="1">
-        </div><!-- End first column -->
-
-        <div class="span8 offset1">
-          <label>Command</label>
-          <textarea name="command" class="input-xxlarge" rows="4"></textarea>
-          <%# TODO -> When callbacks get implemented %>
-          <%# <label>Callback URL</label> %>
-          <%# <input type="text" name="callback" class="span3"> %>
-          <!-- <label><%# HACK %></label> -->
-          <button type="submit">START BUILD</button>
-        </div>
-
-      </div>
-    </form>
-  </div>
+<div class="row">
+<div class="span6">
+  <form class="well" action="/builds/new" method="post">
+    <label>Project Name</label>
+    <input type="text" name="project" class="span3" value="<%= params[:project] %>" <%= "readonly" if params[:project] %>>
+    <label>Environment</label>
+    <input type="text" name="environment" class="span3" value="">
+    <span class="help-block">nb: Expects a valid json hash</span>
+    <label>Priority</label>
+    <input type="text" name="priority" class="span3" value="1">
+    <label>Command</label>
+    <textarea name="command" class="span3"></textarea>
+    <%# TODO -> When callbacks get implemented %>
+    <%# <label>Callback URL</label> %>
+    <%# <input type="text" name="callback" class="span3"> %>
+    <label><%# HACK %></label>
+    <button type="submit" class="btn">Submit</button>
+  </form>
+</div>
+<div class="span6">
+  <p>From here you can create a new build</p>
+  <p>Name is a unique identifier for the project. It doesn't need to already exist, but builds for a like project need to be named identically</p>
+  <p>Environment is a json hash of KEY - VALUE pairs, to be passed into the child environment</p>
+  <p>Command is where the magic happens. Often they'll be longwinded, but a reasonable boilerplate might look something like<p>
+  <pre class="prettyprint linenums">
+if [ ! -d .git ]; then
+  git init .
+  git remote add origin git://github.com/$user/$project.git
+fi
+
+git fetch origin
+git checkout -fq origin/master
+
+bundle install --path .bundle
+bundle exec rake spec
+  </pre>
+</div>
 </div>

data/lib/juici/views/builds/show.erb

@@ -1,4 +1,28 @@
-<h3 class="project-title"><a href="<%= build_url_for(project) %>"><%= project.name %></a><a class="btn pull-right" href="/builds/new?project=<%= project.name %>">New Build</a></h3>
-<div class="accordion" id="accordion0">
-  <%= erb(:"partials/builds/show", :locals => { :build => build, :idx => 0, :show => true }) %>
-</div>
+<% if proj = ::Juici::Project.where(name: project).first %>
+  <h3><em><%= proj.name %></em> - <a href="/builds/new?project=<%= proj.name %>"><em>New Build</em></a></h3>
+  <% build =::Juici::Build.where(parent: proj.name, _id: id).first %>
+    <div class="accordion" id="accordion0">
+      <div class="accordion-heading">
+        <a class="accordion-toggle <%= build.heading_color %>" data-toggle="collapse" data-parent="#accordion0" href="#collapse_0">
+          <%= build.create_time %>&nbsp;<% build[:warnings].each do |warning| %><span class="label label-important"><%= warning %></span><% end %>
+        </a>
+      </div>
+      <div id="collapse_0" class="accordion-body collapse in">
+        <div class="row">
+          <div class="span8">
+            <div>
+              <a href="/builds/<%= proj.name %>/show/<%= build[:_id] %>">Link to this build</a>
+            </div>
+            <div class="accordion-inner build-output">
+<%= build.output if build.respond_to? :output %>
+            </div>
+          </div>
+          <div class="span4">
+<%= erb(:"partials/builds/debug", :locals => { :build => build }) %>
+          </div>
+        </div>
+      </div>
+    </div>
+<% else %>
+  No such project.
+<% end %>

data/lib/juici/views/index.erb

@@ -1,30 +1,13 @@
-<div class="row-fluid">
-  <div class="span8">
-    <h1 class="block-header">JuiCI</h1>
-    <p>
-      JuiCI is a CI server, written at RailsCamp after Jenkins left me feeling a little dead inside. JuiCI aims to solve some of the issues with existing (and outstanding) CI solutions like <a href="http://jenkins-ci.org/">Jenkins</a> and <a href="http://travis-ci.org">Travis</a>, by not trying to be all things to all people.
-    </p>
-    <p>
-      JuiCI has a very thin wrapper around build triggers, is almost entirely API driven, and has a queuing system with a notion of priority, globally shared across all projects.
-    </p>
-    <div>
-      In the past, this instance of Juici has built code for:
-      <ul>
-        <% ::Juici::Project.all.each do |p| %>
-          <li><a href="<%= build_url_for(p) %>"><%= p.name %></a></li>
-        <% end %>
-      </ul>
-    </div>
-  </div>
-  <div class="span4">
-    <h4 class="block-header builds-header">currently building</h4>
-      <ul class="builds">
-        <% $build_queue.currently_building.each do |build| %>
-          <li>
-            <a class="<%= build.heading_color %>" href="<%= build_url_for(build) %>"><%= build.link_title %></a>
-          </li>
-        <% end %>
-      </ul>
-    <%= erb(:"partials/index/recently_built") %>
-  </div>
-</div>
+<h1>JuiCI</h1>
+<p>
+JuiCI is a CI server, written at RailsCamp after Jenkins left me feeling a little dead inside. JuiCI aims to solve some of the issues with existing (and outstanding) CI solutions like <a href="http://jenkins-ci.org/">Jenkins</a> and <a href="http://travis-ci.org">Travis</a>, by not trying to be all things to all people.
+</p>
+<p>
+JuiCI has a very thin wrapper around build triggers, is almost entirely API driven, and has a queuing system with a notion of priority, globally shared across all projects.
+</p>
+<p>
+In the past, this instance of Juici has built code for:
+<ul><% ::Juici::Project.all.each do |p| %>
+    <li><a href="<%= build_url_for(p) %>"><%= p.name %></a></li>
+<% end %></ul>
+</p>

data/lib/juici/views/layout.erb

@@ -1,43 +1,34 @@
 <!doctype html>
 <html>
   <head>
-    <meta charset="UTF-8">
-  <% if ::Juici.env == "development" %>
-    <link href="/vendor/bootstrap.css" rel="stylesheet">
-    <script src="/vendor/jquery.js"></script>
-    <script src="/vendor/bootstrap.js"></script>
-  <% else %>
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap.min.css" rel="stylesheet">
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-    <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
-  <% end %>
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap.min.css" rel="stylesheet">
     <link href="/styles/juici.css" rel="stylesheet">
-    <% styles.each do |style| %>
-      <link href="/styles/<%= style %>.css" rel="stylesheet">
-    <% end rescue nil%>
+    <% if @page # This will 404 a ton of page XXX %>
+      <link href="/styles/<%= @page %>.css" rel="stylesheet">
+    <% end %>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
+    <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/js/bootstrap.min.js"></script>
     <title>JuiCI</title>
     <% if @redirect_to %>
-      <meta http-equiv="Refresh" content="0; url=<%= @redirect_to %>" />
+      <meta http-equiv="Refresh" content="0; url=<%= URI.escape(@redirect_to) %>" />
     <% end %>
   </head>
   <body>
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container-fluid">
+        <div class="container">
           <div class="nav-collapse">
             <ul class="nav">
-              <% active rescue active = nil %>
-              <li class="main <%= "active" if active == :index %>"><a href="/">JuiCI</a></li>
-              <li class="<%= "active" if active == :new_build %>"><a href="/builds/new">New Build</a></li>
-              <li class="<%= "active" if active == :about %>"><a href="/about">About</a></li>
-              <li class="<%= "active" if active == :support %>"><a href="/support">Support</a></li>
-              <li class="<%= "active" if active == :queue %>"><a href="/queue">Build Queue</a></li>
+              <li class="<%= "active" if @page == :index %>"><a class="brand" href="/">JuiCI</a></li>
+              <li class="<%= "active" if @page == :builds && @action == :new %>"><a href="/builds/new">New Build</a></li>
+              <li class="<%= "active" if @page == :about %>"><a href="/about">About</a></li>
+              <li class="<%= "active" if @page == :support %>"><a href="/support">Support</a></li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>
       </div>
     </div>
-    <div class="container-fluid">
+    <div class="container">
       <%= yield %>
     </div>
   </body>

data/lib/juici/views/partials/builds/debug.erb

@@ -1,22 +1,28 @@
-<div class="debug-output">
+<% if build[:environment] %>
+  <h3>Environment:</h3>
+  <pre class="prettyprint">
+  <% build[:environment].each do |k, v| %>
+   <%= "#{k}=#{v}" %>
+  <% end %>
+  </pre>
+<% end %>
 <% if build[:priority] %>
-  <h3 class="block-header">priority:</h3>
+  <h3>Priority:</h3>
+  <pre class="prettyprint">
   <%= build[:priority] %>
+  </pre>
 <% end %>
 <% if build[:command] %>
-  <h3 class="block-header">command:</h3>
+  <h3>Command:</h3>
+  <pre class="prettyprint">
   <%= build[:command] %>
-<% end %>
-<% if build[:environment] %>
-  <h3 class="block-header">environment:</h3>
-  <% build[:environment].reject{|k, v| v.nil?}.each do |k, v| %>
-    <p><strong><%="#{k} = " %></strong><%="#{v}" %></p>
-  <% end %>
+  </pre>
 <% end %>
 <% if build[:callbacks] %>
-  <h3 class="block-header">callbacks:</h3>
+  <h3>Callbacks:</h3>
+  <pre class="prettyprint">
   <% build[:callbacks].each do |callback| %>
-    <p><%= callback %><p>
+<%= callback %>
   <% end %>
+  </pre>
 <% end %>
-</div>

data/lib/juici/watcher.rb

@@ -1,47 +1,39 @@
 module Juici
-  class Watcher
+  class Watcher < Thread
 
-    def self.instance
-      @@instance ||= self.new
-    end
-
-    def initialize
-      @active = true
+    def self.start!
+      new do
+        self.mainloop
+      end
     end
 
-    def register_handler
-      Signal.trap("CHLD") do
+    def self.mainloop
+      #XXX No classvariables ever!
+      loop do
         begin
-          if @active
-            pid, status = Process.wait2(-1)
-            $build_queue.purge(:pid, OpenStruct.new(:pid => pid))
-            ::Juici.dbgp "Trying to find pid: #{pid}"
-            handle(pid, status)
-          end
+          pid, status = catch_child
         rescue Errno::ECHILD
-          nil
+          # No children available, sleep for a while until some might exist
+          # TODO: It'd be a nice optimisation to actually die here, and
+          # optionally start a worker if we're the first child
+          sleep 5
+          next
         end
-        $build_queue.bump! if $build_queue && @active
-      end
-    end
+        next unless pid
+        build = $build_queue.get_build_by_pid(pid)
 
-    def handle(pid, status)
-      build = $build_queue.get_build_by_pid(pid)
-
-      if status == 0
-        build.success!
-      else
-        build.failure!
+        if status == 0
+          build.success!
+        else
+          build.failure!
+        end
+        $build_queue.bump! if $build_queue
       end
-      $build_queue.bump! if $build_queue
-    end
-
-    def shutdown!
-      @active = false
     end
 
-    def start
-      register_handler
+    # Hook for testing
+    def self.catch_child
+      Process.wait2(-1, Process::WNOHANG)
     end
 
   end