heidi 0.3.1 → 0.4.0

data/Gemfile

@@ -6,6 +6,7 @@ gem "simple_shell"
 
 group :development do
   gem "rspec", "~> 2.8.0"
+  gem "rack-test", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.8.3"

data/Gemfile.lock

@@ -14,6 +14,8 @@ GEM
     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)
@@ -43,6 +45,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.8.3)
+  rack-test
   rcov
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/README.rdoc

@@ -79,6 +79,7 @@ following directories:
   - test/
   - success/
   - failure/
+  - after/
 
 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.
@@ -89,6 +90,25 @@ these scripts will be executed inside the build directory at a given time.
 [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.
+[after]    Runs after success or failure.
+
+=== Environment
+
+Each hook is called with a Pretty-Clean-Environment. At the very least it is
+made sure that you are not hindered by GemBundler.
+
+How Heidi hooks hold up with RVM; I'm just not sure...
+
+There is a number of Heidi variables passed into the hook as well
+
+[$HEIDI_DIR]           The project directory
+[$HEIDI_LOG_DIR]       The build's log directory (so you can write your own)
+[$HEIDI_BUILD_DIR]     The build root
+[$HEIDI_BUILD_COMMIT]  The abbrev. of the commit currently working on.
+
+==== Caveat
+
+These environment variable might be subject to change in the (near) future
 
 == History
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/bin/heidi

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'simple_shell'
-require 'heidi'
+require 'heidi/shell'
 
 cmd   = ARGV.shift
 for_a = ARGV.shift
@@ -12,32 +11,14 @@ if ENV['HEIDI_PATH']
   ENV['HEIDI_PATH'] = nil
 end
 
-shell = SimpleShell.new
 
-def check_heidi_root()
-  if !File.exists?("./projects")  && File.directory?("./projects")
-    $stderr.puts "You're not inside Heidi"
-    exit 1
-  end
-end
+
+include Heidi::Shell
+noisy
 
 case cmd
 when "new"
-  puts "creating #{for_a}/"
-  puts "creating #{for_a}/projects"
-  shell.mkdir %W(-p #{for_a}/projects)
-  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 "\nIf you like you can run: bundle install --binstubs"
-  puts "this will tie heidi and heidi_web to this location"
-  puts "\nFor even more tying down, run: bundle install --deployment"
-  puts "after running bundle install --binstubs"
-
+  new_heidi_root(for_a)
 
 when "project"
   repo = ARGV.shift
@@ -48,69 +29,14 @@ when "project"
   end
 
   check_heidi_root
+  new_project(for_a, repo)
 
-  if File.exists? "projects/#{for_a}"
-    $stderr.puts "projects/#{for_a} is in the way. Please remove it"
-    exit 1
-  end
-
-  # create a logs dir
-  puts "creating projects/#{for_a}"
-  puts "creating projects/#{for_a}/logs"
-  shell.mkdir %W(-p projects/#{for_a}/logs)
-
-  %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
-  shell.in("projects/#{for_a}") do |sh|
-    puts "filling #{for_a} cache"
-
-    puts "git clone #{repo}"
-    sh.git %W(clone #{repo} cached)
-
-    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 "Creating default test hook: projects/#{for_a}/hooks/tests/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/tests/01_rspec)
-  puts "\n"
-  puts "Now edit or add some hooks and run: heidi integrate #{for_a}"
 
 when "drop"
   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)
+  remove_project(for_a)
 
 when "integrate"
-  heidi = Heidi.new
-  heidi.projects.each do |project|
-    next if !for_a.nil? && project.name != for_a
-
-    project.fetch
-    msg = project.integrate(!for_a.nil?)
-    unless msg.nil? || msg == true
-      $stderr.puts "#{project.name}: #{msg}"
-    end
-  end
+  integrate(for_a)
 
 end

data/heidi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heidi"
-  s.version = "0.3.1"
+  s.version = "0.4.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-15"
+  s.date = "2012-03-01"
   s.description = "CI-Joe alike CI system called Heidi."
   s.email = "hartog@organisedminds.com"
   s.executables = ["heidi", "heidi_web"]
@@ -36,34 +36,70 @@ Gem::Specification.new do |s|
     "lib/heidi/hook.rb",
     "lib/heidi/integrator.rb",
     "lib/heidi/project.rb",
+    "lib/heidi/shell.rb",
     "lib/heidi/tester.rb",
     "lib/heidi/web.rb",
-    "lib/heidi/web/public/css/screen.css",
-    "lib/heidi/web/public/images/HeidiBlue-480.png",
-    "lib/heidi/web/public/images/HeidiBlue.gif",
-    "lib/heidi/web/public/images/OrganisedMinds.png",
-    "lib/heidi/web/public/images/heidi.jpeg",
+    "lib/heidi/web/assets/css/bootstrap-responsive.css",
+    "lib/heidi/web/assets/css/bootstrap.css",
+    "lib/heidi/web/assets/css/colors.css",
+    "lib/heidi/web/assets/css/docs.css",
+    "lib/heidi/web/assets/images/HeidiBlue-480.png",
+    "lib/heidi/web/assets/images/HeidiBlue.gif",
+    "lib/heidi/web/assets/images/OrganisedMinds.png",
+    "lib/heidi/web/assets/images/heidi.jpeg",
+    "lib/heidi/web/assets/img/glyphicons-halflings-white.png",
+    "lib/heidi/web/assets/img/glyphicons-halflings.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_009_magic.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_042_group.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_079_podium.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_082_roundabout.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_155_show_thumbnails.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_163_iphone.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_214_resize_small.png",
+    "lib/heidi/web/assets/img/glyphicons/glyphicons_266_book_open.png",
+    "lib/heidi/web/assets/js/README.md",
+    "lib/heidi/web/assets/js/application.js",
+    "lib/heidi/web/assets/js/bootstrap-alert.js",
+    "lib/heidi/web/assets/js/bootstrap-button.js",
+    "lib/heidi/web/assets/js/bootstrap-carousel.js",
+    "lib/heidi/web/assets/js/bootstrap-collapse.js",
+    "lib/heidi/web/assets/js/bootstrap-dropdown.js",
+    "lib/heidi/web/assets/js/bootstrap-modal.js",
+    "lib/heidi/web/assets/js/bootstrap-popover.js",
+    "lib/heidi/web/assets/js/bootstrap-scrollspy.js",
+    "lib/heidi/web/assets/js/bootstrap-tab.js",
+    "lib/heidi/web/assets/js/bootstrap-tooltip.js",
+    "lib/heidi/web/assets/js/bootstrap-transition.js",
+    "lib/heidi/web/assets/js/bootstrap-typeahead.js",
+    "lib/heidi/web/assets/js/google-code-prettify/prettify.css",
+    "lib/heidi/web/assets/js/google-code-prettify/prettify.js",
+    "lib/heidi/web/assets/js/jquery.js",
     "lib/heidi/web/views/build.erb",
     "lib/heidi/web/views/commit.erb",
     "lib/heidi/web/views/config.erb",
     "lib/heidi/web/views/home.erb",
     "lib/heidi/web/views/layout.erb",
+    "lib/heidi/web/views/new_project.erb",
     "lib/heidi/web/views/project.erb",
+    "lib/heidi/web/views/project_header.erb",
     "spec/heidi/build_spec.rb",
     "spec/heidi/builder_spec.rb",
     "spec/heidi/git_spec.rb",
     "spec/heidi/hook_spec.rb",
     "spec/heidi/integrator_spec.rb",
     "spec/heidi/project_spec.rb",
-    "spec/heidi/tester_spec.rb",
+    "spec/heidi/shell_spec.rb",
     "spec/heidi/web_spec.rb",
     "spec/heidi_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/01_rworld.rb",
+    "spec/support/mock_project.rb",
+    "spec/support/survivable.rb"
   ]
   s.homepage = "http://github.com/coffeeaddict/heid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.16"
   s.summary = "A naive CI system"
 
   if s.respond_to? :specification_version then
@@ -74,6 +110,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<simple_shell>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -83,6 +120,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<simple_shell>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -93,6 +131,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<simple_shell>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

data/lib/heidi.rb

@@ -4,6 +4,10 @@ require 'simple_shell'
 require 'heidi/project'
 
 class Heidi
+  PASSED = "passed"
+  FAILED = "failed"
+  DNF     = "DNF"
+
   attr_reader :projects
 
   def initialize(root=Dir.pwd)

data/lib/heidi/build.rb

@@ -8,6 +8,9 @@ class Heidi
   # A build is tied to a commit
   #
   class Build
+    FAILURE = "FAILURE"
+    SUCCESS = "SUCCESS"
+
     attr_reader :project, :commit, :root, :log_root, :build_root, :shell,
       :hooks, :logs
 
@@ -26,6 +29,8 @@ class Heidi
 
       @shell.mkdir %W(-p #{@log_root}) unless File.exists?(@log_root)
       @logs = Logs.new(@log_root)
+
+      @i_locked_build = false
     end
 
     def author
@@ -36,6 +41,16 @@ class Heidi
       project.date(@commit)
     end
 
+    def message
+      project.message(@commit)
+    end
+
+    def time
+      Time.parse(date)
+    rescue
+      Time.now
+    end
+
     def load_hooks
       log :info, "Loading hooks"
       @hooks  = {
@@ -77,7 +92,7 @@ class Heidi
         shell.mv %W(#{@log_root} #{@log_root}.0)
       end
 
-      %w(build/ SUCCESS FAILURE).each do |inode|
+      %W(build/ #{SUCCESS} #{FAILURE}).each do |inode|
         shell.rm("-r", "-f", inode) if File.exists? File.join(@root, inode)
       end
 
@@ -103,9 +118,11 @@ class Heidi
     def lock(&block)
       log(:info, "Locking build")
       File.open(lock_file, File::CREAT|File::TRUNC|File::WRONLY) do |f|
+        @i_locked_build = true
         f.puts Time.now.ctime
       end
 
+
       if block_given?
         yield
         unlock
@@ -116,23 +133,28 @@ class Heidi
       return unless locked?
       log(:info, "Unlocking build")
       File.unlink lock_file
+      @i_locked_build = false
     end
 
     def locked?
       File.exists? lock_file
     end
 
+    def locked_build?
+      @i_locked_build == true ? true : false
+    end
+
     def record(what)
       flags = File::CREAT|File::TRUNC|File::WRONLY
       file = nil
       case what
       when :failure
-        project.build_status = "failed"
-        file = File.open(File.join(@root, "FAILURE"), flags)
+        project.build_status = Heidi::FAILED
+        file = File.open(File.join(@root, FAILURE), flags)
       when :success
-        project.build_status = "passed"
+        project.build_status = Heidi::PASSED
         project.record_latest_build
-        file = File.open(File.join(@root, "SUCCESS"), flags)
+        file = File.open(File.join(@root, SUCCESS), flags)
       end
 
       unless file.nil?
@@ -142,19 +164,19 @@ class Heidi
     end
 
     def failed?
-      File.exists?(File.join(@root, "FAILURE"))
+      File.exists?(File.join(@root, FAILURE))
     end
 
     def success?
-      File.exists?(File.join(@root, "SUCCESS"))
+      File.exists?(File.join(@root, SUCCESS))
     end
 
     def status
       self.failed? ?
-        "failed" :
+        Heidi::FAILED :
         self.success? ?
-          "passed" :
-          "DNF"
+          Heidi::PASSED :
+          Heidi::DNF
     end
 
     # file handle to tar ball
@@ -170,6 +192,8 @@ class Heidi
         @log_root = log_root
         @logs = []
 
+        FileUtils.mkdir_p log_root if !File.directory?(log_root)
+
         Dir[File.join(@log_root, "*")].each do |file|
           @logs << Log.new(file)
         end
@@ -205,6 +229,14 @@ class Heidi
               f.puts msg
             end
           end
+
+          read
+        end
+
+        def read
+          @contents = File.read(@file)
+        rescue
+          @contents = ""
         end
 
         def raw(msg)

data/lib/heidi/builder.rb

@@ -15,6 +15,11 @@ class Heidi
     end
 
     def setup_build_dir
+      if build.locked? and !build.locked_build?
+        build.log(:error, "The build was locked externaly")
+        return false
+      end
+
       if File.exists? build.build_root
         build.log(:info, "Removing previous build")
         build.shell.do "rm", "-r", build.build_root
@@ -28,10 +33,10 @@ class Heidi
         return false
       end
 
-      if project.integration_branch
+      if project.branch
         @git = Heidi::Git.new(build.build_root)
 
-        branch = project.integration_branch
+        branch = project.branch
         build.log(:info, "Switching to integration branch: #{branch}")
         res = @git.switch(branch)
         if res.nil?