heidi 0.0.3 → 0.0.4

data/Gemfile

@@ -2,8 +2,6 @@ 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,13 +1,3 @@
-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:
@@ -20,13 +10,10 @@ 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)
@@ -61,5 +48,4 @@ DEPENDENCIES
   rspec (~> 2.8.0)
   simple_shell
   sinatra
-  sinatra-assetpack!
   thin

data/README.rdoc

@@ -4,9 +4,95 @@ 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
+Heidi is still taking form and is used to do CI at OrganisedMinds.com
 (http://organisedminds.com) - Why don't you sign up there? It's free!
 
+== The basics
+
+Install heidi
+
+  # gem install heidi
+
+Create a new CI projects root
+
+  % heidi new ci_root
+  creating ci_root
+  creating ci_root/projects
+  creating ci_root/bin
+  creating ci_root/Gemfile
+  running bundle install
+
+Create a first project to track
+
+  % cd ci_root
+  % heidi project simple_shell git://github.com/coffeeaddict/simple_shell
+  creating projects/simple_shell
+  creating projects/simple_shell/logs
+  creating projects/simple_shell/hooks/build
+  creating projects/simple_shell/hooks/tests
+  creating projects/simple_shell/hooks/failure
+  creating projects/simple_shell/hooks/success
+  creating projects/simple_shell/hooks/before
+  filling simple_shell cache
+  git clone git://github.com/coffeeaddict/simple_shell
+  setting the name of the project to: simple_shell
+
+  Now define some hooks in projects/simple_shell/hooks/tests
+
+== Configuration
+
+The configuration for each project is stored in it's cached clone.
+(projects/$project/cached). This is done using git-config(1). See
+projects/$project/cached/.git/config to find the heidi name.
+
+The following are available for you to edit:
+
+  [heidi]
+    name = Human Readable Name
+  [heidi "build"]
+    branch = branch_to_use_for_integration
+
+And these are being set (and used) by Heidi. Please dont edit (unless...)
+
+  [heidi]
+    commit = acc53b9c5
+  [heidi "build"]
+    status = failed
+    current = acc53b9c5
+
+== Hooks
+
+There is a hooks directory inside your projects directory, and it has the
+following directories:
+
+  - before/
+  - build/
+  - test/
+  - success/
+  - failure/
+
+If you place shell scripts in these directories and make them executable,
+these scripts will be executed inside the build directory at a given time.
+
+[before]   Runs before the build starts
+[build]    After the git-project has been checked out at the right branch
+[test]     To perform tests. You must have at least 1 test hook
+[success]  Is run when the tests where performed in good order. Send huray
+           emails here
+[failure]  Is run when the tests failed. Send he-or-she-broke-it emails here.
+
+== History
+
+Heidi keeps history; projects/$projects/logs/* is where all the integration
+attempts live. You can remove old attempts without any problem.
+
+Any build is named after it's commit hash (5f6db178c for instance)
+
+== Tar balls
+
+Any successful integration attempt is stored in a tar-ball with the name of
+the build (5f6db178c.tar.bz2) inside projects/$project/logs/$build/
+
 == 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.3
+0.0.4

data/bin/heidi

@@ -22,6 +22,16 @@ when "new"
   shell.mkdir %W(-p #{for_a}/projects)
   puts "creating #{for_a}/bin"
   shell.mkdir %W(-p #{for_a}/bin)
+  puts "creating #{for_a}/Gemfile"
+  File.open("#{for_a}/Gemfile", File::CREAT|File::WRONLY) do |f|
+    f.puts 'source "http://rubygems.org"'
+    f.puts 'gem "heidi"'
+  end
+
+  puts "running bundle install"
+  shell.in(for_a) do |sh|
+    sh.bundle "install"
+  end
 
 when "project"
   check_heidi_root
@@ -68,7 +78,11 @@ when "integrate"
   heidi = Heidi.new
   heidi.projects.each do |project|
     next if !for_a.nil? && project.name != for_a
-    project.fetch && project.integrate
+    project.fetch
+    msg = project.integrate
+    unless msg.nil?
+      $stderr.puts "#{project.name}: #{msg}"
+    end
   end
 
 end

data/heidi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heidi"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   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-06"
+  s.date = "2012-02-07"
   s.description = "CI-Joe alike CI system called Heidi."
   s.email = "hartog@organisedminds.com"
   s.executables = ["heidi", "heidi_console", "heidi_cron", "heidi_web"]
@@ -69,7 +69,6 @@ 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"])
@@ -79,7 +78,6 @@ 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"])
@@ -90,7 +88,6 @@ 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

@@ -31,9 +31,9 @@ class Heidi
     def load_hooks
       log :info, "Loading hooks"
       @hooks  = {
+        :before  => [],
         :build   => [],
         :tests   => [],
-        :before  => [],
         :success => [],
         :failure => [],
       }

data/lib/heidi/builder.rb

@@ -39,7 +39,6 @@ class Heidi
       return true
     end
 
-
     def setup_build_dir
       if File.exists? build.build_root
         build.log(:info, "Removing previous build")
@@ -81,6 +80,16 @@ class Heidi
       return true
     end
 
+    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})
+      if tar.S?.to_i == 0
+        shell.rm %W(-rf #{build.commit}/)
+      else
+        build.log(:error, "Creating tar-ball failed: #{tar.err}")
+      end
+    end
 
     def log(string)
       build.logs["builder.log"].raw(string)

data/lib/heidi/integrator.rb

@@ -15,11 +15,24 @@ class Heidi
 
     def failure
       @failed = true
+      run_hooks(:failure)
+      build.log :info, ("Integration failed after: %.2fs" % (Time.now - @start))
+
       build.record(:failure)
+
+      return false
+    end
+
+    def success
+      # record the new succesful
+      build.record(:success)
+      build.log :info, ("Integration took: %.2fs" % (Time.now - @start))
+
+      return true
     end
 
     def integrate
-      start = Time.now
+      @start = Time.now
       build.lock
       build.load_hooks
       build.clean
@@ -31,16 +44,13 @@ class Heidi
 
       return failure if !builder.build!
       return failure if !tester.test!
-      return failure if !run_hooks(:after)
 
-      # record the new succesful
-      build.record(:success)
+      return failure if !run_hooks(:success)
 
       # create a tarball
-      build.create_tar_ball
+      builder.create_tar_ball
 
-      build.log :info, ("Integration took: %.2fs" % (Time.now - start))
-      return true
+      return success
 
     rescue Exception => e
       $stderr.puts e.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heidi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &79065560 !ruby/object:Gem::Requirement
+  requirement: &88342980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79065560
+  version_requirements: *88342980
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &79065280 !ruby/object:Gem::Requirement
+  requirement: &88342660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79065280
-- !ruby/object:Gem::Dependency
-  name: sinatra-assetpack
-  requirement: &79064970 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *79064970
+  version_requirements: *88342660
 - !ruby/object:Gem::Dependency
   name: simple_shell
-  requirement: &79064650 !ruby/object:Gem::Requirement
+  requirement: &88342390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79064650
+  version_requirements: *88342390
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79064400 !ruby/object:Gem::Requirement
+  requirement: &88342100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *79064400
+  version_requirements: *88342100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &79064110 !ruby/object:Gem::Requirement
+  requirement: &88336620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *79064110
+  version_requirements: *88336620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &79063860 !ruby/object:Gem::Requirement
+  requirement: &88336290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *79063860
+  version_requirements: *88336290
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &79063620 !ruby/object:Gem::Requirement
+  requirement: &88335980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *79063620
+  version_requirements: *88335980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &79063320 !ruby/object:Gem::Requirement
+  requirement: &88335610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79063320
+  version_requirements: *88335610
 description: CI-Joe alike CI system called Heidi.
 email: hartog@organisedminds.com
 executables:
@@ -175,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -61331469
+      hash: 976853793
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: