heidi 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/heidi_web

@@ -2,7 +2,16 @@
 #
 # hartog/20120131: Heidi, the CI mistress
 
+if %w(-h --h --help -help -? /?).include? ARGV[0]
+  $stderr.puts "heidi_web [host] [port] [/path/to/projects_dir]"
+  exit 1
+end
 
 require 'heidi/web'
-Heidi::Web.start
+args = []
+while !ARGV[0].nil? && !ARGV[0].empty?
+  args << ARGV.shift
+end
+
+Heidi::Web.start(*args)
 

data/heidi.gemspec

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

data/lib/heidi/git.rb

@@ -18,7 +18,7 @@ class Heidi
 
     # get the latest commit hash
     def commit
-      res = @shell.git "log", "-n", "1", "--pretty=%H"
+      res = @shell.git "log", "-n", "1", "--pretty=format:%H"
       res.out
     end
     alias_method :HEAD, :commit

data/lib/heidi/hook.rb

@@ -9,9 +9,14 @@ class Heidi
     end
 
     def perform(where=build.build_root)
+      # before / failure hooks might like this
+      if !File.exists?(where)
+        where = build.root
+      end
+
       env = {
         'HEIDI_LOG_DIR'   => build.log_root,
-        'HEIDI_BUILD_DIR' => build.build_root,
+        'HEIDI_BUILD_DIR' => where
       }
 
       shell = SimpleShell.new(where, env)

data/lib/heidi/integrator.rb

@@ -63,7 +63,7 @@ class Heidi
 
       hooks_failed = false
       build.hooks[where].each do |hook|
-        res = hook.perform(build.build_root)
+        res = hook.perform
 
         if res.S?.to_i != 0
           build.log :error, "--- #{where} hook: #{hook.name} failed ---"

data/lib/heidi/project.rb

@@ -50,6 +50,13 @@ class Heidi
       @git["build.latest"] = self.commit
     end
 
+    def current_build
+      @git["build.current"]
+    end
+    def record_current_build
+      @git["build.current"] = self.commit
+    end
+
     def build_status
       @git["build.status"]
     end
@@ -75,8 +82,7 @@ class Heidi
     end
 
     def fetch
-      @git.fetch
-      if integration_branch
+      if integration_branch && @git.branch != integration_branch
         if @git.branches.include? integration_branch
           @git.switch(integration_branch)
           @git.merge "origin/#{integration_branch}"
@@ -87,7 +93,13 @@ class Heidi
         end
       end
 
-      record_last_commit
+      @git.pull
+
+      # when the head has changed, update some stuff
+      if last_commit != self.commit
+        record_last_commit
+        record_current_build
+      end
     end
 
     def lock(&block)

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

@@ -1,7 +1,23 @@
 <h1><%= project.name %></h1>
 
+<a href="/"><< back</a><br /><br />
 <h2 class="<%= project.build_status %>"><%= project.build_status %></h2>
 
+<%
+  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 %>
+
+
 <h2>Build history</h2>
 
 <ul>

data/lib/heidi/web.rb

@@ -19,7 +19,6 @@ class Heidi
     }
 
     dir = File.dirname(File.expand_path(__FILE__))
-    $stderr.puts dir
 
     set :sessions, true
 

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ require 'heidi'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-
+  config.tty = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heidi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &78955270 !ruby/object:Gem::Requirement
+  requirement: &79065560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78955270
+  version_requirements: *79065560
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &78955000 !ruby/object:Gem::Requirement
+  requirement: &79065280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78955000
+  version_requirements: *79065280
 - !ruby/object:Gem::Dependency
   name: sinatra-assetpack
-  requirement: &78954750 !ruby/object:Gem::Requirement
+  requirement: &79064970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78954750
+  version_requirements: *79064970
 - !ruby/object:Gem::Dependency
   name: simple_shell
-  requirement: &78954490 !ruby/object:Gem::Requirement
+  requirement: &79064650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78954490
+  version_requirements: *79064650
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78954240 !ruby/object:Gem::Requirement
+  requirement: &79064400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *78954240
+  version_requirements: *79064400
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78950220 !ruby/object:Gem::Requirement
+  requirement: &79064110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *78950220
+  version_requirements: *79064110
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78949910 !ruby/object:Gem::Requirement
+  requirement: &79063860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *78949910
+  version_requirements: *79063860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78949650 !ruby/object:Gem::Requirement
+  requirement: &79063620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *78949650
+  version_requirements: *79063620
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &78949400 !ruby/object:Gem::Requirement
+  requirement: &79063320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78949400
+  version_requirements: *79063320
 description: CI-Joe alike CI system called Heidi.
 email: hartog@organisedminds.com
 executables:
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 785079379
+      hash: -61331469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: