heidi 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/heidi

@@ -32,7 +32,7 @@ when "new"
 
   puts "running bundle install"
   shell.in(for_a) do |sh|
-    sh.bundle "install"
+    sh.bundle "install --binstubs --deployment"
   end
 
 when "project"

data/heidi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heidi"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   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-08"
+  s.date = "2012-02-09"
   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/build.rb

@@ -4,7 +4,7 @@ require 'time'
 class Heidi
   # An integration is called a build.
   # The collections of builds is the log of the project.
-  # A single build lives in $project/logs
+  # A single build lives in $project/
   # A build is tied to a commit
   #
   class Build
@@ -28,6 +28,14 @@ class Heidi
       @logs = Logs.new(@log_root)
     end
 
+    def author
+      project.author(@commit)
+    end
+
+    def date
+      project.date(@commit)
+    end
+
     def load_hooks
       log :info, "Loading hooks"
       @hooks  = {
@@ -77,7 +85,7 @@ class Heidi
       @shell.mkdir %W(-p #{@log_root})
     end
 
-    def log(type, msg)
+    def log(type, msg, raw=false)
       name = case type
       when :error
         "heidi.errors"
@@ -85,7 +93,7 @@ class Heidi
         "heidi.#{type}"
       end
 
-      logs[name].write(msg)
+      logs[name].send(raw == false ? :write : :raw, msg)
     end
 
     def lock_file
@@ -177,7 +185,8 @@ class Heidi
       end
 
       def each(&block)
-        @logs.each(&block)
+        heidi = @logs.select { |l| l.file_name =~ /heidi/ }
+        (heidi + (@logs - heidi)).each(&block)
       end
 
       class Log

data/lib/heidi/builder.rb

@@ -11,32 +11,7 @@ class Heidi
     end
 
     def build!
-      return false if self.setup_build_dir != true
-
-      if build.hooks[:build].any?
-        build_failed = false
-        build.hooks[:build].each do |hook|
-          next if build_failed == true
-
-          res = hook.perform(build.build_root)
-          if res.S?.to_i != 0
-            log("--- Build hook #{hook.name} failed ---")
-            log(res.err.empty? ? "no error message given" : res.err)
-            build_failed = true
-            break
-
-          else
-            log(res.out) unless res.out.empty?
-          end
-        end
-
-        if build_failed == true
-          build.log :error, "Build failed, revert to build.log for details"
-          return false
-        end
-      end
-
-      return true
+      return self.setup_build_dir
     end
 
     def setup_build_dir
@@ -83,7 +58,7 @@ class Heidi
     def create_tar_ball
       shell = SimpleShell.new(build.root)
       shell.mv %W(build #{build.commit})
-      tar = shell.tar %W(-cjf #{build.commit}.tar.bz2 #{build.commit})
+      tar = shell.tar %W(--exclude .git -cjf #{build.commit}.tar.bz2 #{build.commit})
       if tar.S?.to_i == 0
         shell.rm %W(-rf #{build.commit}/)
       else

data/lib/heidi/git.rb

@@ -100,6 +100,24 @@ class Heidi
       @shell.system(*command)
     end
 
+    def log(amount, format=nil, commit=nil)
+      args = %W(log -n#{amount})
+
+      if !format.nil? && format !~ /\%/
+        commit = format
+        format = nil
+      end
+
+      args << "--pretty=#{format}" unless format.nil?
+      args << commit unless commit.nil?
+
+      @shell.git(args).out
+    end
+
+    def graph(amount=40)
+      @shell.git %W(log -n#{amount} --color --graph --pretty=oneline --abbrev-commit)
+    end
+
     # git config $key $value
     def []=(key, value)
       @shell.system("git", "config", "heidi.#{key}", value)

data/lib/heidi/hook.rb

@@ -14,21 +14,49 @@ class Heidi
         where = build.root
       end
 
+      start = Time.now
       env = {
-        'HEIDI_LOG_DIR'   => build.log_root,
-        'HEIDI_BUILD_DIR' => where,
+        'HEIDI_LOG_DIR'      => build.log_root,
+        'HEIDI_BUILD_DIR'    => where,
+        'HEIDI_BUILD_COMMIT' => build.commit,
+
         'RUBYOPT'         => nil,
         'BUNDLE_BIN_PATH' => nil,
         'BUNDLE_GEMFILE'  => nil,
+        'GEM_HOME'        => nil,
+        'GEM_PATH'        => nil,
       }
 
       shell = SimpleShell.new(where, env)
-      res = shell.do @script
-      return res
+      @res = shell.do @script
+
+      return @res
+    end
+
+    def message
+      @res.err.empty? ?
+        @res.out.empty? ?
+          "No error message given" :
+          @res.out :
+      @res.err
+    end
+
+    def output
+      @res.out.empty? ?
+        @res.err.empty? ?
+          "No output" :
+          @res.err :
+      @res.out
+    end
+
+    def failed?
+      @res.S?.to_i != 0
+    rescue
+      false
     end
 
     def name
-      File.basename(@script)
+      File.join(File.basename(File.dirname(@script)), File.basename(@script))
     end
   end
 end

data/lib/heidi/integrator.rb

@@ -43,10 +43,12 @@ class Heidi
       return failure if !run_hooks(:before)
 
       builder = Heidi::Builder.new(build)
-      tester = Heidi::Tester.new(build)
-
       return failure if !builder.build!
+      return failure if !run_hooks(:build)
+
+      tester = Heidi::Tester.new(build)
       return failure if !tester.test!
+      return failure if !run_hooks(:tests)
 
       return failure if !run_hooks(:success)
 
@@ -62,7 +64,7 @@ class Heidi
       return $!
 
     ensure
-      run_hooks(:failed) if @failed == true
+      run_hooks(:failure) if @failed == true
 
       # always unlock the build root, no matter what
       build.unlock
@@ -75,18 +77,24 @@ class Heidi
 
       hooks_failed = false
       build.hooks[where].each do |hook|
-        res = hook.perform
+        start = Time.now
+        build.log :info, "Running #{hook.name} :"
+
+        hook.perform
 
-        if res.S?.to_i != 0
-          build.log :error, "--- #{where} hook: #{hook.name} failed ---"
-          build.log :error, res.err
+        if hook.failed?
+          build.log :info, "\tfailed. See heidi.error"
+          build.log :error, "--- #{hook.name}: failed ---"
+          build.log :error, hook.message, true
 
           hooks_failed = true
           break
 
         else
-          build.log :info, res.out
+          build.log :info, "#{hook.output.lines.collect { |l| "\t#{l}" }.join("")}", true
         end
+
+        build.log(:info, ("Took %.2fs" % (Time.now-start)))
       end
 
       @hooks_ran << where

data/lib/heidi/project.rb

@@ -5,14 +5,17 @@ require 'time'
 
 class Heidi
   class Project
-    attr_reader :root, :cached_root, :lock_file, :builds
+    attr_reader :root, :cached_root, :lock_file
 
     def initialize(root)
       @root        = root
       @lock_file   = File.join(root, ".lock")
       @cached_root = File.join(root, "cached")
       @git         = Heidi::Git.new(@cached_root)
-      load_builds
+    end
+
+    def builds
+      @builds || load_builds
     end
 
     def load_builds
@@ -27,9 +30,11 @@ class Heidi
         return nil unless commit.length >= 5
 
         self.select do |build|
-          build.commit == commit || build.commit =~ Regexp.new(commit)
+          build.commit == commit || build.commit =~ Regexp.new("^#{commit}")
         end.first
       end
+
+      return @builds
     end
 
     def name=(name)
@@ -45,6 +50,14 @@ class Heidi
       @git.commit[0..8]
     end
 
+    def author(commit=self.commit)
+      @git.log(1, "%cN <%cE>", commit)
+    end
+
+    def date(commit=self.commit)
+      @git.log(1, "%ci", commit)
+    end
+
     def last_commit
       @git["commit"]
     end
@@ -79,12 +92,13 @@ class Heidi
     end
 
     def integrate(forced=false)
-      return "locked" if locked?
       return true if !forced && self.current_build == self.commit
+      return "locked" if locked?
 
       status = "unknown"
 
       self.lock do
+        record_current_build
         res = Heidi::Integrator.new(self).integrate
         if res == true
           status = nil
@@ -115,7 +129,6 @@ class Heidi
       # when the head has changed, update some stuff
       if last_commit != self.commit
         record_last_commit
-        record_current_build
       end
     end
 
@@ -131,12 +144,12 @@ class Heidi
     end
 
     def log
-      shell = SimpleShell.new(@cached_root)
-      log = shell.git %W(log -n40 --color --graph --pretty=oneline --abbrev-commit)
+      log = @git.graph(120)
 
       lines = []
       log.out.lines.each do |line|
-        commit = line.scan(/^[|*\s\e\[m\d]+(\w+)/).flatten.first
+        color_less = line.gsub(/\e\[[^m]+m/, '')
+        commit = color_less.scan(/^[\| \*]+ ([a-z0-9]+)/).flatten.first
         lines << { :line => line, :build => builds.find(commit) }
       end
 

data/lib/heidi/tester.rb

@@ -11,37 +11,14 @@ class Heidi
     def test!
       build.log(:info, "Starting tests")
 
-      tests_failed = false
-
       if build.hooks[:tests].empty?
         build.log(:error, "There are no test hooks")
         @message = "There are no test hooks"
         return false
       end
 
-      build.hooks[:tests].each do |hook|
-        res = hook.perform(build.build_root)
-
-        if res.S?.to_i != 0
-          log "--- test #{hook.name} failed ---"
-          log(res.err.empty? ? "No error message given" : res.err)
-
-          @message = "tests failed"
-          tests_failed = true
-          break
-
-        else
-          log(res.out) unless res.out.empty?
-        end
-      end
-
-      return tests_failed ? false : true
-    end
-
-    def log(string)
-      build.logs["test.log"].raw(string)
+      return true
     end
 
-
   end
 end

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

@@ -39,8 +39,8 @@ h1 a {
   text-decoration: line-through;
 }
 
-.color30 {
-  color: black !important;
+.DNF, .color30 {
+  color: #333 !important;
 }
 
 .failed, .color31 {
@@ -63,7 +63,7 @@ h1 a {
   color: purple !important;
 }
 
-.color36 {
+.terminal .DNF, .color36 {
   color: aqua !important;
 }
 
@@ -102,7 +102,7 @@ h1 a {
 }
 
 .status {
-  padding-left: 2em;
+  padding-left: 3em;
 }
 
 p {
@@ -110,7 +110,7 @@ p {
 }
 
 a {
-  color: #00a;
+  color: #333;
 }
 
 a:hover {
@@ -118,7 +118,7 @@ a:hover {
 }
 
 a:visited {
-  color: #a0a;
+  color: #333;
 }
 
 table {

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

@@ -9,21 +9,21 @@
   latest  = builds.select { |b| b.commit == project.latest_build }.first
 %>
 
-<% unless current.nil? && latest.nil?%>
-  <h2>Overview</h2>
-  <strong class="label">Current</strong> :
+<h2>Overview</h2>
+<strong class="label">Current</strong> :
+<% unless current.nil? %>
   <a class="<%= current.status %>" href="/projects/<%= project.name %>/build/<%= current.commit %>"><%= current.commit %></a>
-  <br />
-  <strong class="label">Latest successful</strong> :
+<% end %>
+<br />
+<strong class="label">Latest successful</strong> :
+<% unless latest.nil? %>
   <a class="<%= latest.status %>" href="/projects/<%= project.name %>/build/<%= latest.commit %>"><%= latest == current ? "current" : latest.commit %></a>
-  <br />
-  <br />
-  <br />
 <% end %>
+<br />
+<br />
+<br />
 
 <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> <span class="status">[<span class="<%= build.status %>"><%= build.status %></span>]</span>
+<pre style="width: 75%" class="terminal"><% project.log.each do |line| %><% build = nil; if (build = line[:build]) %><a title="<%= build.author %>" href="/projects/<%= project.name %>/build/<%= build.commit %>"><%= ansi_color_codes(line[:line]).chomp %></a> <span class="status">[<span class="<%= build.status %>"><%= build.status %></span>] (<%= build.date %>, <%= build.author.gsub '<', '&lt;' %>)</span>
 <% else %><%= ansi_color_codes line[:line] %>
 <% end %><% end %></pre>
-</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heidi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &86199260 !ruby/object:Gem::Requirement
+  requirement: &85154280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86199260
+  version_requirements: *85154280
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &86198960 !ruby/object:Gem::Requirement
+  requirement: &85153980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86198960
+  version_requirements: *85153980
 - !ruby/object:Gem::Dependency
   name: simple_shell
-  requirement: &86198610 !ruby/object:Gem::Requirement
+  requirement: &85153630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86198610
+  version_requirements: *85153630
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &86198320 !ruby/object:Gem::Requirement
+  requirement: &85153340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *86198320
+  version_requirements: *85153340
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &86198000 !ruby/object:Gem::Requirement
+  requirement: &85153020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *86198000
+  version_requirements: *85153020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &86193660 !ruby/object:Gem::Requirement
+  requirement: &85148650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *86193660
+  version_requirements: *85148650
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &86193270 !ruby/object:Gem::Requirement
+  requirement: &85148280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *86193270
+  version_requirements: *85148280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &86192970 !ruby/object:Gem::Requirement
+  requirement: &85147950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86192970
+  version_requirements: *85147950
 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: -593404611
+      hash: -232203085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: