heidi 0.1.0 → 0.1.1

data/README.rdoc

@@ -113,6 +113,9 @@ Or by hand
 
   heidi integrate [$project]
 
+Projects that have been integrated up-to the latest commit wont be integrated
+again, unless you explicitly specify the project.
+
 == Results
 
 And off course you would like to see some results...

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/heidi

@@ -89,8 +89,9 @@ when "integrate"
   heidi = Heidi.new
   heidi.projects.each do |project|
     next if !for_a.nil? && project.name != for_a
+
     project.fetch
-    msg = project.integrate
+    msg = project.integrate(!for_a.nil?)
     unless msg.nil? || msg == true
       $stderr.puts "#{project.name}: #{msg}"
     end

data/heidi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heidi"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hartog C. de Mik"]
-  s.date = "2012-02-07"
+  s.date = "2012-02-08"
   s.description = "CI-Joe alike CI system called Heidi."
   s.email = "hartog@organisedminds.com"
   s.executables = ["heidi", "heidi_console", "heidi_cron", "heidi_web"]

data/lib/heidi/project.rb

@@ -21,6 +21,15 @@ class Heidi
         next unless File.directory? build
         @builds << Heidi::Build.new(self, File.basename(build))
       end
+
+      def @builds.find(commit)
+        return nil unless commit.is_a?(String)
+        return nil unless commit.length >= 5
+
+        self.select do |build|
+          build.commit == commit || build.commit =~ Regexp.new(commit)
+        end.first
+      end
     end
 
     def name=(name)
@@ -69,9 +78,9 @@ class Heidi
       name == "" ? nil : name
     end
 
-    def integrate
+    def integrate(forced=false)
       return "locked" if locked?
-      return true if self.current_build == self.commit
+      return true if !forced && self.current_build == self.commit
 
       status = "unknown"
 
@@ -121,6 +130,19 @@ class Heidi
       end
     end
 
+    def log
+      shell = SimpleShell.new(@cached_root)
+      log = shell.git %W(log -n40 --color --graph --pretty=oneline --abbrev-commit)
+
+      lines = []
+      log.out.lines.each do |line|
+        commit = line.scan(/^[|*\s\e\[m\d]+(\w+)/).flatten.first
+        lines << { :line => line, :build => builds.find(commit) }
+      end
+
+      return lines
+    end
+
     def unlock
       File.unlink lock_file
     end

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

@@ -75,6 +75,15 @@ pre.terminal {
   clear: both;
 }
 
+.terminal a {
+  color: inherit;
+  text-decoration: none;
+  font-weight: bold;
+  border-bottom: dashed #ccc 1px;
+  margin: 4px 0;
+  display: inline-block;
+}
+
 ul {
   margin-left: 3em;
 }
@@ -91,3 +100,9 @@ ul {
 .clear {
   clear: both;
 }
+
+.column {
+  width: 48%;
+  margin-right: 10px;
+  float: left;
+}

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

@@ -1,27 +1,34 @@
 <h1><%= project.name %></h1>
 
 <a href="/"><< back</a><br /><br />
-<h2 class="<%= project.build_status %>"><%= project.build_status %></h2>
+<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
-%>
+  <%
+    builds = project.builds
+    current = builds.select { |b| b.commit == project.current_build }.first
+  %>
 
-<% 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 %>
+  <% 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 %>
 
+  <h2>Build history</h2>
 
-<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>
 
-<ul>
-  <% project.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 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>
+<% else %><%= ansi_color_codes line[:line] %>
+<% end %><% end %></pre>
+</div>

data/lib/heidi/web.rb

@@ -96,8 +96,8 @@ class Heidi
 
     helpers do
       def ansi_color_codes(string)
-        string.gsub("\e[0m", '</span>').
-          gsub(/\e\[(\d+)m/, "<span class=\"color\\1\">")
+        string.gsub(/\e\[0?m/, '</span>').
+          gsub(/\e\[([\d\;]+)m/, "<span class=\"color\\1\">")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heidi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &74669360 !ruby/object:Gem::Requirement
+  requirement: &77740420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74669360
+  version_requirements: *77740420
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &74669010 !ruby/object:Gem::Requirement
+  requirement: &77740120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74669010
+  version_requirements: *77740120
 - !ruby/object:Gem::Dependency
   name: simple_shell
-  requirement: &74668670 !ruby/object:Gem::Requirement
+  requirement: &77739770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74668670
+  version_requirements: *77739770
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74668320 !ruby/object:Gem::Requirement
+  requirement: &77739480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *74668320
+  version_requirements: *77739480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74667940 !ruby/object:Gem::Requirement
+  requirement: &77739180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *74667940
+  version_requirements: *77739180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74667560 !ruby/object:Gem::Requirement
+  requirement: &77734750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *74667560
+  version_requirements: *77734750
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74667230 !ruby/object:Gem::Requirement
+  requirement: &77734400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *74667230
+  version_requirements: *77734400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &74666910 !ruby/object:Gem::Requirement
+  requirement: &77734060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74666910
+  version_requirements: *77734060
 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: -666476931
+      hash: 967555357
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: