ssp-cijoe 0.4.1 → 0.4.3

data/lib/cijoe/build.rb

@@ -41,12 +41,20 @@ class CIJoe
       "#{short_sha}.#{finished_at.to_i.to_s}"
     end
     
+    def metrics_dir
+      "#{Config.cijoe.metricsdir}/#{project}/#{full_id}"
+    end
+    
+    def coverage_dir
+      "#{Config.cijoe.coveragedir}/#{project}/#{full_id}"
+    end
+    
     def metrics_url
-      "#{Config.cijoe.metricshost}/#{full_id}/metrics/index.html"
+      "http://ci.secretsaucepartners.com/metrics/#{project}/#{full_id}/index.html"
     end
     
     def coverage_url
-      "#{Config.cijoe.metricshost}/#{full_id}/coverage/index.html"
+      "http://ci.secretsaucepartners.com/coverage/#{project}/#{full_id}/index.html"
     end
 
     def clean_output

data/lib/cijoe/public/screen.css

@@ -16,7 +16,7 @@ html, body {
 }
 
 body {
-  background-color: white;
+  background-color: #f0f0f0;
   font: 13.34px helvetica, arial, clean, sans-serif;
   *font-size: small;
   text-align: center;
@@ -26,25 +26,72 @@ h1, h2, h3, h4, h5, h6 {
   font-size: 100%;
 }
 
-h1 {
+h1, h2 {
   margin-bottom: 1em;
+  height: 34px;
 }
 
-h1 a {
+h1 a, h2 a {
+  font-size: 24px;
+  background: white;
+  padding: 6px 10px;
   text-decoration: none;
-  color: #000;
+  color: #e61e4e;
+  display: block;
+  float: left;
+}
+
+h2 a {
+  margin-right: 10px;
+}
+
+h1 span.build form {
+  display: inline;
+}
+
+h2 span {
+  display: block;
+  line-height: 30px;
+  color: #999;
+  padding: 6px 0 0 10px;
+}
+
+h1 span.build form input {
+  font-size: 24px;
+  background: #aab2ac;
+  height: 34px;
+  padding: 0 10px;
+  color: white;
+  border: 1px solid #8c938e;
+  margin-left: 10px;
+}
+
+h1 span.build form input:hover {
+  background: #8c938e;
+}
+
+.current {
+  clear: both;
+  margin: 18px 0;
+}
+
+.failed, .worked, .errored {
+  color: white !important;
+  font-size: 11px;
+  padding: 2px 5px;
+  font-weight: bold;
 }
 
 .failed, .color31 {
-  color: red !important;
+  background: red;
 }
 
 .worked, .color32 {
-  color: green !important;
+  background: green;
 }
 
 .errored, .color33 {
-  color: yellow !important;
+  background: yellow;
 }
 
 p {
@@ -77,18 +124,37 @@ table {
 ul.posts {
   list-style-type: none;
   margin-bottom: 2em;
+  clear: both;
 }
 
   ul.posts li {
     line-height: 1.75em;
+    margin-bottom: 18px;
   }
- 
+  
   ul.posts .date,
   ul.posts .duration {
     color: #aaa;
     font-family: Monaco, "Courier New", monospace;
     font-size: 80%;
   }
+  
+  ul.posts span.metrics {
+    margin-left: 20px;
+    line-height: 18px;
+    font-size: 11px;
+  }
+
+  ul.posts span.metrics a {
+    color: #e61e4e;
+    background: #fff;
+    padding: 2px 5px;
+  }
+  
+  ul.posts span.metrics a:hover {
+    background: #e61e4e;
+    color: #fff;
+  }
 
 /*****************************************************************************/
 /*

data/lib/cijoe/server.rb

@@ -49,6 +49,10 @@ class CIJoe
       include Rack::Utils
       alias_method :h, :escape_html
 
+      def logger
+        LOGGER
+      end
+
       # thanks integrity!
       def ansi_color_codes(string)
         string.gsub("\e[0m", '</span>').

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = "0.4.1"
+  Version = "0.4.3"
 end

data/lib/cijoe/views/_build.erb

@@ -1,12 +1,9 @@
 <li>
-  <span class="date"><%= pretty_time(build.finished_at) %></span> &raquo; Built <a href="<%= build.commit.url %>"><%= build.short_sha %></a> <span class="<%= build.status %>">(<%= build.status %>)</span>
-  <span class="metrics">
-    [ <a href="<%= build.metrics_url %>">Metrics</a> ]
-  </span>
-  <span class="coverage">
-     [ <a href="<%= build.coverage_url %>">Coverage</a> ]
-   </span>
+  <span class="date"><%= pretty_time(build.finished_at) %></span> &raquo; <span class="<%= build.status %>"><%= build.status %></span> &raquo; Built <a href="<%= build.commit.url %>"><%= build.short_sha %></a> 
   <% if build.duration %>
     in <span class="duration"><%= build.duration %></span> seconds.
   <% end %>
+  <span class="metrics">
+    <a class="metrics" href="<%= build.metrics_url %>">Metrics</a> <a class="coverage" href="<%= build.coverage_url %>">Coverage</a>
+  </span>
 </li>

data/lib/cijoe/views/template.erb

@@ -3,31 +3,29 @@
   <head>
     <link href="<%= cijoe_root %>/screen.css" media="screen" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="<%= cijoe_root %>/favicon.ico" type="image/x-icon" />
-    <title><%= h(joe.project) %>: CI Joe</title>
+    <title><%= h(joe.project) %>: SSP Joe</title>
   </head>
   <body>
     <div class="site">
-      <div class="title">
-        <a href="<%= cijoe_root %>/">CI Joe</a>
-        <span class="extra">because knowing is half the battle</span>
-      </div>
-
       <div id="home">
-        <h1><a href="<%= joe.url %>"><%= joe.project %></a></h1>
+        <h1>
+          <a href="<%= joe.url %>"><%= joe.project %></a>
+          <span class="build">
+            <% unless joe.current_build %>
+              <form method="POST"><input type="submit" value="&raquo; Build"/></form>
+            <% end %>
+          </span>  
+        </h1>
+        <% if joe.current_build %>
+          <div class="current">
+            <% if joe.current_build.sha %>
+              Building <a href="<%= joe.current_build.commit.url %>"><%= joe.current_build.short_sha %></a> <small>(pid: <%= joe.pid %>)</small>
+            <% else %>
+              Build starting...
+            <% end %>
+          </div>
+        <% end %>
         <ul class="posts">
-          <% if joe.current_build %>
-            <li>
-              <span class="date"><%= pretty_time(joe.current_build.started_at) if joe.current_build %></span> &raquo;
-              <% if joe.current_build.sha %>
-                Building <a href="<%= joe.current_build.commit.url %>"><%= joe.current_build.short_sha %></a> <small>(pid: <%= joe.pid %>)</small>
-              <% else %>
-                Build starting...
-              <% end %>
-            </li>
-          <% else %>
-            <li><form method="POST"><input type="submit" value="Build"/></form></li>
-          <% end %>
-          
           <% if joe.last_build %>
             <%= partial :build, :locals => {:build => joe.last_build} %>
             <% if joe.last_build.failed? %>
@@ -37,7 +35,7 @@
         </ul>
           
         <% unless joe.build_history.empty? %>
-          <h1><a href="<%= joe.url %>"><%= joe.project %></a> <span style="color: #999;">build history</span></h1>
+          <h2><a href="<%= joe.url %>"><%= joe.project %></a> <span style="color: #999;">build history</span></h2>
           <ul class="posts">
           <% joe.build_history.each do |current_build| %>
             <%= partial :build, :locals => {:build => current_build} %>

data/lib/cijoe.rb

@@ -19,6 +19,7 @@ require 'cijoe/commit'
 require 'cijoe/build'
 require 'cijoe/campfire'
 require 'cijoe/server'
+require 'fileutils'
 
 class CIJoe
   
@@ -149,6 +150,19 @@ class CIJoe
   rescue Object => e
     puts "Exception building: #{e.message} (#{e.class})"
     build_failed('', e.to_s)
+  else
+    publish_metrics_and_coverage(build)
+  end
+
+  def publish_metrics_and_coverage(build)
+    puts "Creating metrics dir ..."
+    `mkdir #{build.metrics_dir}`
+    puts "Creating coverage dir ..."
+    `mkdir #{build.coverage_dir}`
+    puts "Publishing coverage ..."
+    `cp -r coverage/* #{build.coverage_dir}`
+    puts "Publishing metrics ..."
+    `cp -r tmp/metric_fu/output/* #{build.metrics_dir}`
   end
 
   # shellin' out
@@ -232,6 +246,6 @@ class CIJoe
     history = build_entries.inject([]) do |builds, entry|
       builds << read_build(entry)
     end
-    history
+    history.sort { |b,a| a.finished_at <=> b.finished_at }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ssp-cijoe
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 +02:00
+date: 2010-06-10 00:00:00 +02:00
 default_executable: cijoe
 dependencies: 
 - !ruby/object:Gem::Dependency