heidi 0.0.4 → 0.1.0

data/README.rdoc

@@ -93,6 +93,35 @@ Any build is named after it's commit hash (5f6db178c for instance)
 Any successful integration attempt is stored in a tar-ball with the name of
 the build (5f6db178c.tar.bz2) inside projects/$project/logs/$build/
 
+== Locking
+
+Heidi locks the projects she's working on. Letting two Heidi's onto the
+mountain should not be a problem. If you believe a project's lock is stale
+just remove projects/$project/.lock
+
+== Integrating
+
+With crontab for instance...
+
+  PATH=$PATH:/usr/local/bin
+  MAILTO=icann@example.org
+
+  # m h  dom mon dow   command
+  */5 * * * 1-6   cd /path/to/heidi_root && bundle exec heidi integrate
+
+Or by hand
+
+  heidi integrate [$project]
+
+== Results
+
+And off course you would like to see some results...
+
+  % cd /path/to/heidi
+  % heidi_web
+
+Just make sure to set your firewall straight
+
 == 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.

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/bin/heidi

@@ -6,6 +6,8 @@ require 'heidi'
 cmd   = ARGV.shift
 for_a = ARGV.shift
 
+ENV['PATH'] = "/bin:/usr/bin:/usr/local/bin"
+
 shell = SimpleShell.new
 
 def check_heidi_root()
@@ -58,8 +60,17 @@ when "project"
       cached.git %W(config heidi.name #{for_a})
     end
   end
+  puts "Creating default test hook: projects/#{for_a}/hooks/test/01_rspec"
+  File.open("projects/#{for_a}/hooks/tests/01_rspec", File::CREAT|File::WRONLY) do |f|
+    f.puts %q(#!/bin/sh
+
+# edit this file to your needs
+bundle exec rake spec
+)
+  end
+  shell.chmod %W(+x projects/#{for_a}/hooks/test/01_rspec)
   puts "\n"
-  puts "Now define some hooks in projects/#{for_a}/hooks/tests"
+  puts "Now edit or add some hooks and run: heidi integrate #{for_a}"
 
 when "drop"
   check_heidi_root
@@ -80,7 +91,7 @@ when "integrate"
     next if !for_a.nil? && project.name != for_a
     project.fetch
     msg = project.integrate
-    unless msg.nil?
+    unless msg.nil? || msg == true
       $stderr.puts "#{project.name}: #{msg}"
     end
   end

data/heidi.gemspec

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

data/lib/heidi/build.rb

@@ -105,6 +105,7 @@ class Heidi
     end
 
     def unlock
+      return unless locked?
       log(:info, "Unlocking build")
       File.unlink lock_file
     end
@@ -148,8 +149,12 @@ class Heidi
           "DNF"
     end
 
-    def create_tar_ball
-      # TODO
+    # file handle to tar ball
+    def tar_ball
+      ball = File.join(@root, "#{commit}.tar.bz2")
+
+      return nil if !File.exists?(ball)
+      return File.open(ball, File::RDONLY)
     end
 
     class Logs

data/lib/heidi/builder.rb

@@ -82,7 +82,7 @@ class Heidi
 
     def create_tar_ball
       shell = SimpleShell.new(build.root)
-      shell.mv %W(build, #{build.commit})
+      shell.mv %W(build #{build.commit})
       tar = shell.tar %W(-cjf #{build.commit}.tar.bz2 #{build.commit})
       if tar.S?.to_i == 0
         shell.rm %W(-rf #{build.commit}/)

data/lib/heidi/hook.rb

@@ -16,7 +16,10 @@ class Heidi
 
       env = {
         'HEIDI_LOG_DIR'   => build.log_root,
-        'HEIDI_BUILD_DIR' => where
+        'HEIDI_BUILD_DIR' => where,
+        'RUBYOPT'         => nil,
+        'BUNDLE_BIN_PATH' => nil,
+        'BUNDLE_GEMFILE'  => nil,
       }
 
       shell = SimpleShell.new(where, env)

data/lib/heidi/integrator.rb

@@ -8,9 +8,10 @@ class Heidi
     attr_reader :build, :project
 
     def initialize(project)
-      @project = project
-      @build   = Heidi::Build.new(project)
-      @failed  = false
+      @project   = project
+      @build     = Heidi::Build.new(project)
+      @failed    = false
+      @hooks_ran = []
     end
 
     def failure
@@ -32,9 +33,11 @@ class Heidi
     end
 
     def integrate
-      @start = Time.now
-      build.lock
       build.load_hooks
+      return "no test hooks!" if build.hooks[:tests].empty?
+
+      build.lock
+      @start = Time.now
       build.clean
 
       return failure if !run_hooks(:before)
@@ -64,11 +67,10 @@ class Heidi
       # always unlock the build root, no matter what
       build.unlock
 
-      return @failed == true ? false : true
-
     end
 
     def run_hooks(where)
+      return true if @hooks_ran.include?(where)
       return true if build.hooks[where].nil? || build.hooks[where].empty?
 
       hooks_failed = false
@@ -87,6 +89,8 @@ class Heidi
         end
       end
 
+      @hooks_ran << where
+
       return hooks_failed == true ? false : true
     end
 

data/lib/heidi/project.rb

@@ -71,11 +71,19 @@ class Heidi
 
     def integrate
       return "locked" if locked?
+      return true if self.current_build == self.commit
+
+      status = "unknown"
 
-      status = ""
       self.lock do
         res = Heidi::Integrator.new(self).integrate
-        status = res != true ? "failed" : "passed"
+        if res == true
+          status = nil
+        elsif res.is_a? String
+          status = res
+        else
+          status = "failed"
+        end
       end
 
       return status

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

@@ -5,6 +5,11 @@
 
 <h2 class="<%= build.status %>"><%= build.commit %></h2>
 
+<% if build.status == "passed" %>
+ <a href='/projects/<%= project.name %>/build/<%= build.commit %>/tar_ball'>download</a>
+<br /><br />
+<% end %>
+
 | <% build.logs.each do |log| %>
  <a href="#<%= log.file_name %>"><%= log.file_name %></a> |
 <% end %>

data/lib/heidi/web.rb

@@ -27,10 +27,10 @@ class Heidi
     set :root, dir
 
     get '/' do
-      redirect '/projects', 302
+      redirect '/projects/', 302
     end
 
-    get '/projects' do
+    get '/projects/' do
       erb(:home, { :locals => { :projects => @heidi.projects }})
     end
 
@@ -54,6 +54,36 @@ class Heidi
       erb(:build, { :locals => { :build => build, :project => project }})
     end
 
+    get '/projects/:name/build/:commit/tar_ball' 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])
+
+      ball = build.tar_ball
+      if ball.nil?
+        return "no tar ball here..."
+      end
+
+      content_type 'application/x-tar'
+      headers "Content-type" => "application/x-tar",
+        "Content-disposition" => "attachment; filename=#{build.commit}.tar.bz2"
+
+      stream do |out|
+        while true
+          begin
+            out << ball.sysread(1024)
+          rescue EOFError
+            break
+          end
+        end
+      end
+
+    end
+
     put '/projects/:name/build' do
       project = $heidi[params[:name]]
       if project.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heidi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &88342980 !ruby/object:Gem::Requirement
+  requirement: &74669360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *88342980
+  version_requirements: *74669360
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &88342660 !ruby/object:Gem::Requirement
+  requirement: &74669010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *88342660
+  version_requirements: *74669010
 - !ruby/object:Gem::Dependency
   name: simple_shell
-  requirement: &88342390 !ruby/object:Gem::Requirement
+  requirement: &74668670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *88342390
+  version_requirements: *74668670
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &88342100 !ruby/object:Gem::Requirement
+  requirement: &74668320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *88342100
+  version_requirements: *74668320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &88336620 !ruby/object:Gem::Requirement
+  requirement: &74667940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *88336620
+  version_requirements: *74667940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &88336290 !ruby/object:Gem::Requirement
+  requirement: &74667560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *88336290
+  version_requirements: *74667560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &88335980 !ruby/object:Gem::Requirement
+  requirement: &74667230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *88335980
+  version_requirements: *74667230
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &88335610 !ruby/object:Gem::Requirement
+  requirement: &74666910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88335610
+  version_requirements: *74666910
 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: 976853793
+      hash: -666476931
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: