heidi 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/heidi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "heidi"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hartog C. de Mik"]

data/lib/heidi/web/public/css/screen.css

@@ -23,6 +23,26 @@ h1 a {
   color: #000;
 }
 
+.color1 {
+  font-weight: bold;
+}
+
+.color3 {
+  font-style: italic;
+}
+
+.color4 {
+  text-decoration: underline;
+}
+
+.color9 {
+  text-decoration: line-through;
+}
+
+.color30 {
+  color: black !important;
+}
+
 .failed, .color31 {
   color: red !important;
 }
@@ -35,6 +55,56 @@ h1 a {
   color: yellow !important;
 }
 
+.color34 {
+  color: blue !important;
+}
+
+.color35 {
+  color: purple !important;
+}
+
+.color36 {
+  color: aqua !important;
+}
+
+.color37, .color39 {
+  color: white !important;
+}
+
+.color40, .color49 {
+  background-color: #333;
+}
+
+.color41 {
+  background-color: red;
+}
+
+.color42 {
+  background-color: green;
+}
+
+.color43 {
+  background-color: yellow;
+}
+
+.color44 {
+  background-color:  blue;
+}
+
+.color45 {
+  background-color: purple;
+}
+.color46 {
+  background-color: aqua;
+}
+.color47 {
+  background-color: white;
+}
+
+.status {
+  padding-left: 2em;
+}
+
 p {
   margin: 1em 0;
 }
@@ -106,3 +176,8 @@ ul {
   margin-right: 10px;
   float: left;
 }
+
+.label {
+  display: inline-block;
+  min-width: 120px;
+}

data/lib/heidi/web/views/project.erb

@@ -1,34 +1,29 @@
 <h1><%= project.name %></h1>
 
 <a href="/"><< back</a><br /><br />
-<div class="column">
-  <h2 class="<%= project.build_status %>"><%= project.build_status %></h2>
-
-  <%
-    builds = project.builds
-    current = builds.select { |b| b.commit == project.current_build }.first
-  %>
+<h2 class="<%= project.build_status %>"><%= project.build_status %></h2>
 
-  <% unless current.nil? %>
-    <% builds -= [ current ] %>
-    <h2>Current build</h2>
-    <a class="<%= current.status %>" href="/projects/<%= project.name %>/build/<%= current.commit %>"><%= current.commit %></a>
-    <br />
-    <br />
-    <br />
-  <% end %>
+<%
+  builds = project.builds
+  current = builds.select { |b| b.commit == project.current_build }.first
+  latest  = builds.select { |b| b.commit == project.latest_build }.first
+%>
 
-  <h2>Build history</h2>
-
-  <ul>
-    <% builds.each do |build| %>
-      <li class="<%= build.status %>"><a href='/projects/<%= project.name %>/build/<%= build.commit %>'><%= build.commit %></a> - <%= build.status %></li>
-    <% end %>
-  </ul>
-</div>
+<% unless current.nil? && latest.nil?%>
+  <h2>Overview</h2>
+  <strong class="label">Current</strong> :
+  <a class="<%= current.status %>" href="/projects/<%= project.name %>/build/<%= current.commit %>"><%= current.commit %></a>
+  <br />
+  <strong class="label">Latest successful</strong> :
+  <a class="<%= latest.status %>" href="/projects/<%= project.name %>/build/<%= latest.commit %>"><%= latest == current ? "current" : latest.commit %></a>
+  <br />
+  <br />
+  <br />
+<% end %>
 
+<h2>Build history</h2>
 <div class="column">
-  <pre class="terminal"><% project.log.each do |line| %><% build = nil; if (build = line[:build]) %><a href="/projects/<%= project.name %>/build/<%= build.commit %>"><%= ansi_color_codes(line[:line]).chomp %></a>
+  <pre class="terminal"><% project.log.each do |line| %><% build = nil; if (build = line[:build]) %><a href="/projects/<%= project.name %>/build/<%= build.commit %>"><%= ansi_color_codes(line[:line]).chomp %></a> <span class="status">[<span class="<%= build.status %>"><%= build.status %></span>]</span>
 <% else %><%= ansi_color_codes line[:line] %>
 <% end %><% end %></pre>
 </div>

data/lib/heidi/web.rb

@@ -97,7 +97,11 @@ class Heidi
     helpers do
       def ansi_color_codes(string)
         string.gsub(/\e\[0?m/, '</span>').
-          gsub(/\e\[([\d\;]+)m/, "<span class=\"color\\1\">")
+          gsub /\e\[[^m]+m/ do |codes|
+            colors = codes.gsub(/[\e\[m]+/, '')
+            classes = colors.split(";").collect { |c| "color#{c}" }
+            "<span class=\"#{classes.join(" ")}\">"
+          end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heidi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &77740420 !ruby/object:Gem::Requirement
+  requirement: &86199260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77740420
+  version_requirements: *86199260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &77740120 !ruby/object:Gem::Requirement
+  requirement: &86198960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77740120
+  version_requirements: *86198960
 - !ruby/object:Gem::Dependency
   name: simple_shell
-  requirement: &77739770 !ruby/object:Gem::Requirement
+  requirement: &86198610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77739770
+  version_requirements: *86198610
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77739480 !ruby/object:Gem::Requirement
+  requirement: &86198320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *77739480
+  version_requirements: *86198320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77739180 !ruby/object:Gem::Requirement
+  requirement: &86198000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77739180
+  version_requirements: *86198000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77734750 !ruby/object:Gem::Requirement
+  requirement: &86193660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *77734750
+  version_requirements: *86193660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77734400 !ruby/object:Gem::Requirement
+  requirement: &86193270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *77734400
+  version_requirements: *86193270
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &77734060 !ruby/object:Gem::Requirement
+  requirement: &86192970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77734060
+  version_requirements: *86192970
 description: CI-Joe alike CI system called Heidi.
 email: hartog@organisedminds.com
 executables:
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 967555357
+      hash: -593404611
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: