heidi 0.0.1 → 0.0.2

data/Gemfile

@@ -2,6 +2,8 @@ source "http://rubygems.org"
 
 gem "thin"
 gem "sinatra"
+# gem 'sinatra-assetpack'
+gem 'sinatra-assetpack', :require => 'sinatra/assetpack', :git => 'git://github.com/rstacruz/sinatra-assetpack.git'
 gem "simple_shell"
 
 group :development do

data/Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: git://github.com/rstacruz/sinatra-assetpack.git
+  revision: ab2a413026099492807bd19affd60bd3d3bc1cca
+  specs:
+    sinatra-assetpack (0.0.10)
+      jsmin
+      rack-test
+      sinatra
+      tilt (>= 1.3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -10,10 +20,13 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
+    jsmin (1.0.1)
     json (1.6.5)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
     rake (0.9.2.2)
     rcov (0.9.10)
     rdoc (3.12)
@@ -26,7 +39,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simple_shell (1.0.0)
+    simple_shell (1.0.1)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -48,4 +61,5 @@ DEPENDENCIES
   rspec (~> 2.8.0)
   simple_shell
   sinatra
+  sinatra-assetpack!
   thin

data/README.rdoc

@@ -1,9 +1,14 @@
-= heidi
+= Heidi
 
-Description goes here.
+A Continious Integration thingy. Naive, and therefor called Heidi.
+
+http://www.tv-nostalgie.de/sound/Heidi2.jpg
+
+Heidi is still taking form and is/will-be used to do CI at OrganisedMinds.com
+(http://organisedminds.com) - Why don't you sign up there? It's free!
 
 == Contributing to heidi
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/heidi

@@ -1,70 +1,74 @@
-#!/bin/sh
+#!/usr/bin/env ruby
 
-command=$1
-for_a=$2
+require 'simple_shell'
+require 'heidi'
 
-check_heidi_root()
-{
-  if [ ! -e ./projects ] && [ ! -d ./projects ]
-  then
-    echo "You're not inside Heidi" >&2
+cmd   = ARGV.shift
+for_a = ARGV.shift
+
+shell = SimpleShell.new
+
+def check_heidi_root()
+  if !File.exists?("./projects")  && File.directory?("./projects")
+    $stderr.puts "You're not inside Heidi"
     exit 1
-  fi
-}
+  end
+end
 
-case $command in
-  new)
-    echo "creating $for_a"
-    echo "creating $for_a/projects"
-    mkdir -p $for_a/projects
-    echo "creating $for_a/bin"
-    mkdir -p $for_a/bin
-  ;;
+case cmd
+when "new"
+  puts "creating #{for_a}"
+  puts "creating #{for_a}/projects"
+  shell.mkdir %W(-p #{for_a}/projects)
+  puts "creating #{for_a}/bin"
+  shell.mkdir %W(-p #{for_a}/bin)
 
-  project)
-    check_heidi_root
+when "project"
+  check_heidi_root
 
-    # create a logs dir
-    echo "creating projects/$for_a"
-    echo "creating projects/$for_a/logs"
-    mkdir -p projects/$for_a/logs
+  # create a logs dir
+  puts "creating projects/#{for_a}"
+  puts "creating projects/#{for_a}/logs"
+  shell.mkdir %W(-p projects/#{for_a}/logs)
 
-    echo "creating projects/$for_a/hooks/build"
-    echo "creating projects/$for_a/hooks/tests"
-    mkdir -p projects/$for_a/hooks/build
-    mkdir -p projects/$for_a/hooks/tests
+  %w(build tests failure success before).each do |hook|
+    puts "creating projects/#{for_a}/hooks/#{hook}"
+    shell.mkdir %W(-p projects/#{for_a}/hooks/#{hook})
+  end
 
-    # make a clone
-    cd projects/$for_a
-    echo "filling $for_a cache"
-    git clone $3 cached
-    cd cached
+  # make a clone
+  shell.in("projects/#{for_a}") do |sh|
+    puts "filling #{for_a} cache"
+    repo = ARGV.shift
+    puts "git clone #{repo}"
+    sh.git %W(clone #{repo} cached)
 
-    echo "setting the name of the project to: $for_a"
-    git config heidi.name $for_a
-  ;;
+    sh.in("cached") do |cached|
+      puts "setting the name of the project to: #{for_a}"
+      cached.git %W(config heidi.name #{for_a})
+    end
+  end
+  puts "\n"
+  puts "Now define some hooks in projects/#{for_a}/hooks/tests"
 
-  drop)
-    check_heidi_root
+when "drop"
+  check_heidi_root
 
-    # remove build and cache dir, expose logs directly
-    echo "removing build dir"
-    rm -r projects/$for_a/build
-    echo "removing cache (preserving project config)"
-    cp -pr projects/$for_a/cached/.git/config projects/$for_a
-    rm -r projects/$for_a/cached
-    echo "exposing builds"
-    mv projects/$for_a/logs/* projects/$for_a/
-    rm -r projects/$for_a/logs
-  ;;
-  web)
-    check_heidi_root
+  # remove build and cache dir, expose logs directly
+  puts "removing build dir"
+  shell.rm %W(-r projects/#{for_a}/build)
+  puts "removing cache (preserving project config)"
+  shell.cp %W(-pr projects/#{for_a}/cached/.git/config projects/#{for_a})
+  shell.rm %W(-r projects/#{for_a}/cached)
+  puts "exposing builds"
+  shell.mv %W(projects/#{for_a}/logs/* projects/#{for_a}/)
+  shell.rm %W(-r projects/#{for_a}/logs)
 
-    heidi_web
-  ;;
-  console)
-    check_heidi_root
+when "integrate"
+  heidi = Heidi.new
+  heidi.projects.each do |project|
+    next if !for_a.nil? && project.name != for_a
+    project.fetch && project.integrate
+  end
 
-    heidi_console
-  ;;
-esac
+end

data/bin/heidi_web

@@ -2,11 +2,7 @@
 #
 # hartog/20120131: Heidi, the CI mistress
 
-require 'sinatra'
-require 'heidi'
-require 'heidi/web'
 
-$heidi = Heidi.new
+require 'heidi/web'
+Heidi::Web.start
 
-# modular setup with all the freebees of a non modular setup.
-include Heidi::Web::Routes

data/heidi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heidi"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   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-01"
+  s.date = "2012-02-06"
   s.description = "CI-Joe alike CI system called Heidi."
   s.email = "hartog@organisedminds.com"
   s.executables = ["heidi", "heidi_console", "heidi_cron", "heidi_web"]
@@ -40,9 +40,12 @@ Gem::Specification.new do |s|
     "lib/heidi/project.rb",
     "lib/heidi/tester.rb",
     "lib/heidi/web.rb",
-    "lib/heidi/web/routes.rb",
-    "lib/heidi/web/routes/home.rb",
-    "lib/heidi/web/routes/projects.rb",
+    "lib/heidi/web/public/css/screen.css",
+    "lib/heidi/web/public/images/heidi.jpeg",
+    "lib/heidi/web/views/build.erb",
+    "lib/heidi/web/views/home.erb",
+    "lib/heidi/web/views/layout.erb",
+    "lib/heidi/web/views/project.erb",
     "spec/heidi/build_spec.rb",
     "spec/heidi/builder_spec.rb",
     "spec/heidi/git_spec.rb",
@@ -66,6 +69,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thin>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra-assetpack>, [">= 0"])
       s.add_runtime_dependency(%q<simple_shell>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -75,6 +79,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<sinatra-assetpack>, [">= 0"])
       s.add_dependency(%q<simple_shell>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -85,6 +90,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<sinatra-assetpack>, [">= 0"])
     s.add_dependency(%q<simple_shell>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

data/lib/heidi/build.rb

@@ -8,40 +8,46 @@ class Heidi
   # A build is tied to a commit
   #
   class Build
-    attr_reader :project, :commit, :root, :shell, :hooks
+    attr_reader :project, :commit, :root, :log_root, :build_root, :shell,
+      :hooks, :logs
 
     def initialize(project, commit=project.commit)
       @project = project
       @commit  = commit
-      @root    = File.join(project.root, "logs", commit)
+
+      @root       = File.join(project.root, "logs", commit)
+      @log_root   = File.join(@root, "logs")
+      @build_root = File.join(@root, "build")
 
       if !File.exists? @root
         SimpleShell.new(project.root).mkdir %W(-p #{@root})
       end
-
       @shell = SimpleShell.new(@root)
+
+      @shell.mkdir %W(-p #{@log_root}) unless File.exists?(@log_root)
+      @logs = Logs.new(@log_root)
     end
 
     def load_hooks
       log :info, "Loading hooks"
       @hooks  = {
-        :build  => [],
-        :tests  => [],
-        :before => [],
-        :after  => [],
-        :failed => [],
+        :build   => [],
+        :tests   => [],
+        :before  => [],
+        :success => [],
+        :failure => [],
       }
 
       @hooks.keys.each do |key|
         log :debug, "Loading #{key} hooks"
 
-        Dir[File.join(project.root, "hooks", key.to_s, "*")].each do |hook|
+        Dir[File.join(project.root, "hooks", key.to_s, "*")].sort.each do |hook|
           next if File.directory? hook
           next unless File.executable? hook
 
           log :debug, "Loaded hook: #{hook}"
 
-          @hooks[key] << Heidi::Hook.new(self.project, hook)
+          @hooks[key] << Heidi::Hook.new(self, hook)
         end
       end
 
@@ -49,13 +55,26 @@ class Heidi
     end
 
     def clean
-      %w(heidi.info heidi.errors test.log builder.log build).each do |inode|
+      1.downto(0) do |i|
+        if File.exists? "#{@log_root}.#{i}"
+          if i - 1 < 0
+            shell.mv %W(#{@log_root}.#{i} #{@log_root}.#{i+1})
+          else
+            shell.rm %W(-rf #{@log_root}.#{i})
+          end
+        end
+      end
+
+      if File.exists? "#{@log_root}"
+        shell.mv %W(#{@log_root} #{@log_root}.0)
+      end
+
+      %w(build/ SUCCESS FAILURE).each do |inode|
         shell.rm("-r", "-f", inode) if File.exists? File.join(@root, inode)
       end
-    end
 
-    def build_root
-      File.join(@root, "build")
+      # re-instate the logs
+      @shell.mkdir %W(-p #{@log_root})
     end
 
     def log(type, msg)
@@ -66,12 +85,7 @@ class Heidi
         "heidi.#{type}"
       end
 
-      File.open(
-        File.join(@root, name),
-        File::CREAT|File::WRONLY|File::APPEND
-      ) do |f|
-        f.puts "%s\t%s" % [ Time.now.strftime("%c"), msg ]
-      end
+      logs[name].write(msg)
     end
 
     def lock_file
@@ -134,14 +148,56 @@ class Heidi
           "DNF"
     end
 
-    def logs(what)
-      File.read(File.join(@root, what))
-    rescue
-      ""
-    end
-
     def create_tar_ball
       # TODO
     end
+
+    class Logs
+      def initialize(log_root)
+        @log_root = log_root
+        @logs = []
+
+        Dir[File.join(@log_root, "*")].each do |file|
+          @logs << Log.new(file)
+        end
+      end
+
+      def [](key)
+        log = @logs.select { |log| log.file_name == "#{key}" }.first
+        if log.nil?
+          @logs << ( log = Log.new( File.join(@log_root, "#{key}") ) )
+        end
+
+        return log
+      end
+
+      def each(&block)
+        @logs.each(&block)
+      end
+
+      class Log
+        attr_reader :file_name, :contents
+        def initialize(file)
+          @file      = file
+          @file_name = File.basename(file)
+          @contents  = File.read(file) rescue ""
+        end
+
+        def write(msg,fmt=true)
+          File.open(@file, File::CREAT|File::APPEND|File::WRONLY) do |f|
+            if fmt == true
+              f.puts "%s\t%s" % [ Time.now.strftime("%c"), msg ]
+            else
+              f.puts msg
+            end
+          end
+        end
+
+        def raw(msg)
+          write(msg, false)
+        end
+      end
+    end
+
   end
-end
+end

data/lib/heidi/builder.rb

@@ -21,12 +21,12 @@ class Heidi
           res = hook.perform(build.build_root)
           if res.S?.to_i != 0
             log("--- Build hook #{hook.name} failed ---")
-            log(res.err)
+            log(res.err.empty? ? "no error message given" : res.err)
             build_failed = true
             break
 
           else
-            log(res.out)
+            log(res.out) unless res.out.empty?
           end
         end
 
@@ -83,12 +83,7 @@ class Heidi
 
 
     def log(string)
-      File.open(
-        File.join(project.log_root, "builder.log"),
-        File::CREAT|File::WRONLY|File::APPEND
-      ) do |f|
-        f.puts string
-      end
+      build.logs["builder.log"].raw(string)
     end
 
   end

data/lib/heidi/hook.rb

@@ -2,13 +2,19 @@ require 'simple_shell'
 
 class Heidi
   class Hook
-    def initialize(project, script)
-      @project = project
-      @script  = script
+    attr_reader :build
+    def initialize(build, script)
+      @build  = build
+      @script = script
     end
 
-    def perform(where)
-      shell = SimpleShell.new(where)
+    def perform(where=build.build_root)
+      env = {
+        'HEIDI_LOG_DIR'   => build.log_root,
+        'HEIDI_BUILD_DIR' => build.build_root,
+      }
+
+      shell = SimpleShell.new(where, env)
       res = shell.do @script
       return res
     end

data/lib/heidi/tester.rb

@@ -24,14 +24,14 @@ class Heidi
 
         if res.S?.to_i != 0
           log "--- test #{hook.name} failed ---"
-          log res.err
+          log(res.err.empty? ? "No error message given" : res.err)
 
           @message = "tests failed"
           tests_failed = true
           break
 
         else
-          log res.out
+          log(res.out) unless res.out.empty?
         end
       end
 
@@ -39,12 +39,7 @@ class Heidi
     end
 
     def log(string)
-      File.open(
-        File.join(build.root, "test.log"),
-        File::CREAT|File::WRONLY|File::APPEND
-      ) do |f|
-        f.puts string
-      end
+      build.logs["test.log"].raw(string)
     end
 
 

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

@@ -0,0 +1,93 @@
+* {
+  margin: 0;
+  padding: 0;
+}
+
+html, body {
+  height: 100%;
+}
+
+body {
+  background-color: white;
+  font: 13.34px helvetica, arial, clean, sans-serif;
+  *font-size: small;
+  text-align: center;
+}
+
+h1, h2, h3 {
+  margin-bottom: 1em;
+}
+
+h1 a {
+  text-decoration: none;
+  color: #000;
+}
+
+.failed, .color31 {
+  color: red !important;
+}
+
+.passed, .worked, .color32 {
+  color: green !important;
+}
+
+.errored, .color33 {
+  color: yellow !important;
+}
+
+p {
+  margin: 1em 0;
+}
+
+a {
+  color: #00a;
+}
+
+a:hover {
+  color: black;
+}
+
+a:visited {
+  color: #a0a;
+}
+
+table {
+  font-size: inherit;
+  font: 100%;
+}
+
+
+.container {
+  width: 80%;
+  text-align: justify;
+  margin: 2em auto;
+}
+
+pre.terminal {
+  font-family: 'Bitstream Vera Sans Mono', 'Courier', monospace;
+  border: 1px solid black;
+  background-color: #333;
+  color: white;
+  padding: 5px;
+  overflow: auto;
+  word-wrap: break-word;
+  margin-bottom: 1em;
+  clear: both;
+}
+
+ul {
+  margin-left: 3em;
+}
+
+.top {
+  float: left;
+  padding-left: 2em;
+}
+
+.log {
+  float: left;
+}
+
+.clear {
+  clear: both;
+}

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

@@ -0,0 +1,20 @@
+<h1><%= project.name %></h1>
+
+<a href="/projects/<%= project.name %>"><< back</a>
+<br /><br />
+
+<h2 class="<%= build.status %>"><%= build.commit %></h2>
+
+| <% build.logs.each do |log| %>
+ <a href="#<%= log.file_name %>"><%= log.file_name %></a> |
+<% end %>
+<br class="clear" />
+<br />
+<br />
+
+<% build.logs.each do |log| %>
+  <h3 class="log"><%= log.file_name %></h3>
+  <a name="<%= log.file_name %>" href="#top" class="top">top</a>
+  <pre class="terminal"><%= ansi_color_codes(log.contents) %></pre>
+<% end %>
+<br /><br />

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

@@ -0,0 +1,7 @@
+<br />
+<img src='/images/heidi.jpeg' />
+
+<h1>Projects</h1>
+<ul><% projects.each do |project| %>
+  <li><a href="/projects/<%= project.name %>"><%= project.name %></a> - <%= project.build_status %></li>
+<% end %></ul>

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

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="stylesheet" media="screen" href="/css/screen.css" />
+    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+    <title>Heidi!</title>
+  </head>
+  <body>
+    <div class="container">
+      <%= yield %>
+    </div>
+  </body>
+</html>

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

@@ -0,0 +1,11 @@
+<h1><%= project.name %></h1>
+
+<h2 class="<%= project.build_status %>"><%= project.build_status %></h2>
+
+<h2>Build history</h2>
+
+<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>

data/lib/heidi/web.rb

@@ -1,8 +1,75 @@
-require 'sinatra'
-require 'heidi/web/routes'
+require 'sinatra/base'
+require 'heidi'
+require 'simple_shell'
 
 class Heidi
-  module Web
-    SimpleShell.noisy = true
+  class Web < Sinatra::Base
+
+    def self.start(host="0.0.0.0", port="4567", project_path=Dir.pwd)
+      @project_path = project_path
+      Heidi::Web.run! :host => host, :port => port
+    end
+
+    def self.project_path
+      @project_path
+    end
+
+    before {
+      @heidi = Heidi.new(self.class.project_path)
+    }
+
+    dir = File.dirname(File.expand_path(__FILE__))
+    $stderr.puts dir
+
+    set :sessions, true
+
+    set :views,  "#{dir}/web/views"
+    set :public_folder, "#{dir}/web/public"
+    set :root, dir
+
+    get '/' do
+      redirect '/projects', 302
+    end
+
+    get '/projects' do
+      erb(:home, { :locals => { :projects => @heidi.projects }})
+    end
+
+    get '/projects/:name' do
+      project = @heidi[params[:name]]
+      if project.nil?
+        return "no project by that name: #{params[:name]}"
+      end
+
+      erb(:project, { :locals => { :project => project }})
+    end
+
+    get '/projects/:name/build/:commit' do
+      project = @heidi[params[:name]]
+      if project.nil?
+        return "no project by that name: #{params[:name]}"
+      end
+
+      # load build of project
+      build = Heidi::Build.new(project, params[:commit])
+      erb(:build, { :locals => { :build => build, :project => project }})
+    end
+
+    put '/projects/:name/build' do
+      project = $heidi[params[:name]]
+      if project.nil?
+        return "no project by that name: #{params[:name]}"
+      end
+
+      project.integrate
+    end
+
+
+    helpers do
+      def ansi_color_codes(string)
+        string.gsub("\e[0m", '</span>').
+          gsub(/\e\[(\d+)m/, "<span class=\"color\\1\">")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heidi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &85728350 !ruby/object:Gem::Requirement
+  requirement: &78955270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85728350
+  version_requirements: *78955270
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &85728090 !ruby/object:Gem::Requirement
+  requirement: &78955000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85728090
+  version_requirements: *78955000
+- !ruby/object:Gem::Dependency
+  name: sinatra-assetpack
+  requirement: &78954750 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *78954750
 - !ruby/object:Gem::Dependency
   name: simple_shell
-  requirement: &85727850 !ruby/object:Gem::Requirement
+  requirement: &78954490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85727850
+  version_requirements: *78954490
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85727610 !ruby/object:Gem::Requirement
+  requirement: &78954240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *85727610
+  version_requirements: *78954240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &85727370 !ruby/object:Gem::Requirement
+  requirement: &78950220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *85727370
+  version_requirements: *78950220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85727130 !ruby/object:Gem::Requirement
+  requirement: &78949910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *85727130
+  version_requirements: *78949910
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85726860 !ruby/object:Gem::Requirement
+  requirement: &78949650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *85726860
+  version_requirements: *78949650
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &85726580 !ruby/object:Gem::Requirement
+  requirement: &78949400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85726580
+  version_requirements: *78949400
 description: CI-Joe alike CI system called Heidi.
 email: hartog@organisedminds.com
 executables:
@@ -133,9 +144,12 @@ files:
 - lib/heidi/project.rb
 - lib/heidi/tester.rb
 - lib/heidi/web.rb
-- lib/heidi/web/routes.rb
-- lib/heidi/web/routes/home.rb
-- lib/heidi/web/routes/projects.rb
+- lib/heidi/web/public/css/screen.css
+- lib/heidi/web/public/images/heidi.jpeg
+- lib/heidi/web/views/build.erb
+- lib/heidi/web/views/home.erb
+- lib/heidi/web/views/layout.erb
+- lib/heidi/web/views/project.erb
 - spec/heidi/build_spec.rb
 - spec/heidi/builder_spec.rb
 - spec/heidi/git_spec.rb
@@ -161,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 899278159
+      hash: 785079379
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/heidi/web/routes/home.rb

@@ -1,9 +0,0 @@
-class Heidi; module Web; module Routes
-
-  module Home
-    get '/' do
-      '<h1>Welcome to Heidi!</h1>Psst. Want to see my <a href="/projects">projects</a>?'
-    end
-  end
-
-end; end; end

data/lib/heidi/web/routes/projects.rb

@@ -1,61 +0,0 @@
-class Heidi; module Web; module Routes
-
-  module Projects
-    get '/projects' do
-      output = ""
-      $heidi.projects.each do |project|
-        output += "<a href='/projects/#{project.name}'>#{project.name}</a><br />"
-      end
-
-      output
-    end
-
-    get '/projects/:name' do
-      project = $heidi[params[:name]]
-      if project.nil?
-        return "no project by that name: #{params[:name]}"
-      end
-
-      output = "<h1>#{project.name}</h1>"
-      output += "Build status: #{project.build_status}"
-      output += "<br /><br /><h2>Build history</h2>"
-      project.builds.each do |build|
-        output += %Q{<a href="/projects/#{project.name}/build/#{build.commit}">#{build.commit}</a> - #{build.status}<br />}
-      end
-
-      output
-    end
-
-    get '/projects/:name/build/:commit' do
-      project = $heidi[params[:name]]
-      if project.nil?
-        return "no project by that name: #{params[:name]}"
-      end
-
-      # load build of project
-      build = Heidi::Build.new(project, params[:commit])
-      output = "<h1>#{project.name}</h1>"
-      output += "<h2>Build: #{build.commit} - #{build.status}<h2>"
-
-      %w(heidi.info heidi.errors build.log test.log).each do |log_file|
-        log = build.logs(log_file)
-        if (!log.nil? and !log.empty?)
-          output += "<h3>#{log_file}</h3>"
-          output += "<pre>#{log}</pre>"
-        end
-      end
-
-      output
-    end
-
-    put '/projects/:name/build' do
-      project = $heidi[params[:name]]
-      if project.nil?
-        return "no project by that name: #{params[:name]}"
-      end
-
-      project.integrate
-    end
-  end
-
-end; end; end

data/lib/heidi/web/routes.rb

@@ -1,13 +0,0 @@
-require 'heidi/web/routes/projects'
-require 'heidi/web/routes/home'
-
-class Heidi
-  module Web
-    module Routes
-      def self.included(base)
-        base.extend Routes::Home
-        base.extend Routes::Projects
-      end
-    end
-  end
-end