cijoe 0.2.0 → 0.3.0

data/README.markdown

@@ -83,6 +83,18 @@ Or do it the old fashion way:
     etc.
 
 
+Checkin' Status
+---------------
+
+Want to see how your build's doing without any of this fancy UI crap?
+Ping Joe for the lowdown:
+
+    curl http://localhost:4567/ping
+
+Joe will return `200 OK` if all is quiet on the Western Front. If
+Joe's busy building or your last build failed, you'll get `412
+PRECONDITION FAILED`.
+
 Multiple Projects
 -----------------
 

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gemspec.authors = ["Chris Wanstrath"]
     gemspec.add_dependency 'choice'
     gemspec.add_dependency 'sinatra'
+    gemspec.add_development_dependency 'rack-test'
     gemspec.version = CIJoe::Version.to_s
   end
 rescue LoadError

data/bin/cijoe

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
-require 'cijoe'
 require 'choice'
 
 Choice.options do
@@ -46,4 +45,8 @@ Choice.options do
 end
 
 options = Choice.choices
-CIJoe::Server.start(options[:host], options[:port], Choice.rest[0])
+$project_path = File.expand_path(Choice.rest[0])
+
+require 'cijoe'
+
+CIJoe::Server.start(options[:host], options[:port], $project_path)

data/examples/build-failed

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Put this file to $PROJECT/.git/hooks/ for email notifications.
+#
+# You should have mail command provided by mailutils package on Debian
+# based systems.
+#
+# sudo apt-get install mailutils
+#
+# You should have mail server running
+#
+# Do not forget: chmod +x build-failed
+#
+echo "
+Visit http://ci.example.org/ for details
+
+Author:  $AUTHOR
+Message:
+$MESSAGE
+
+$OUTPUT
+" | mail -s "[example.org] BUILD FAILED $SHA" --to first@gmail.com second@gmail.com

data/examples/build-worked

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Put this file to $PROJECT/.git/hooks/ for email notifications.
+#
+# You should have mail command provided by mailutils package on Debian
+# based systems.
+#
+# sudo apt-get install mailutils
+#
+# You should have mail server running
+#
+# Do not forget: chmod +x build-worked
+#
+echo "
+Visit http://ci.example.org/ for details
+
+Author: $AUTHOR
+Message:
+$MESSAGE
+
+" | mail -s "[example.org] build OK"  --to first@gmail.com second@gmail.com
+

data/lib/cijoe/build.rb

@@ -20,8 +20,21 @@ class CIJoe
       status == :worked
     end
 
+    def building?
+      status == :building
+    end
+
+    def duration
+      return if building?
+      finished_at - started_at
+    end
+
     def short_sha
-      sha[0,7] if sha
+      if sha
+        sha[0,7]
+      else
+        "<unknown>"
+      end
     end
 
     def clean_output

data/lib/cijoe/config.rb

@@ -5,8 +5,9 @@ class CIJoe
     end
 
     def initialize(command, parent = nil)
-      @command = command
-      @parent = parent
+      @command  = command
+      @parent   = parent
+      @project_path = $project_path || File.join(File.dirname(__FILE__), '../../')
     end
 
     def method_missing(command, *args)
@@ -14,10 +15,10 @@ class CIJoe
     end
 
     def to_s
-      git_command = "git config #{config_string}"
+      git_command = "cd #{@project_path} && git config #{config_string}"
       result = `#{git_command} 2>&1`.chomp
       process_status = $?
-      
+
       if successful_command?(process_status) || config_command_with_empty_value?(result,process_status)
         return result
       else
@@ -28,15 +29,15 @@ class CIJoe
     def config_string
       @parent ? "#{@parent.config_string}.#{@command}" : @command
     end
-    
+
     private
-    
+
     def successful_command?(process_status)
       process_status.exitstatus.to_i == 0
     end
-    
+
     def config_command_with_empty_value?(result, process_status)
       process_status.exitstatus.to_i == 1 && result.empty?
-    end    
+    end
   end
 end

data/lib/cijoe/public/screen.css

@@ -83,7 +83,8 @@ ul.posts {
     line-height: 1.75em;
   }
  
-  ul.posts .date {
+  ul.posts .date,
+  ul.posts .duration {
     color: #aaa;
     font-family: Monaco, "Courier New", monospace;
     font-size: 80%;
@@ -98,7 +99,7 @@ ul.posts {
 .site {
   font-size: 110%;
   text-align: justify;
-  width: 40em;
+  width: 80%;
   margin: 3em auto 2em auto;
   line-height: 1.5em;
 }

data/lib/cijoe/server.rb

@@ -3,6 +3,8 @@ require 'erb'
 
 class CIJoe
   class Server < Sinatra::Base
+    attr_reader :joe
+
     dir = File.dirname(File.expand_path(__FILE__))
 
     set :views,  "#{dir}/views"
@@ -10,16 +12,24 @@ class CIJoe
     set :static, true
     set :lock, true
 
-    before { @joe.restore }
+    before { joe.restore }
+
+    get '/ping' do
+      if joe.building? || !joe.last_build || !joe.last_build.worked?
+        halt 412, joe.last_build ? joe.last_build.sha : "building"
+      end
+
+      joe.last_build.sha
+    end
 
     get '/?' do
-      erb(:template, {}, :joe => @joe)
+      erb(:template, {}, :joe => joe)
     end
 
     post '/?' do
       payload = params[:payload].to_s
-      if payload.empty? || payload.include?(@joe.git_branch)
-        @joe.build
+      if payload.empty? || payload.include?(joe.git_branch)
+        joe.build
       end
       redirect request.path
     end

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = "0.2.0"
+  Version = "0.3.0"
 end

data/lib/cijoe/views/template.erb

@@ -29,7 +29,12 @@
           <% end %>
           
           <% if joe.last_build %>
-            <li><span class="date"><%= pretty_time(joe.last_build.finished_at) %></span> &raquo; Built <a href="<%= joe.url %>/commits/<%= joe.last_build.sha %>"><%= joe.last_build.short_sha %></a> <span class="<%= joe.last_build.status %>">(<%= joe.last_build.status %>)</span></li>
+            <li>
+              <span class="date"><%= pretty_time(joe.last_build.finished_at) %></span> &raquo; Built <a href="<%= joe.url %>/commits/<%= joe.last_build.sha %>"><%= joe.last_build.short_sha %></a> <span class="<%= joe.last_build.status %>">(<%= joe.last_build.status %>)</span>
+              <% if joe.last_build.duration %>
+                in <span class="duration"><%= joe.last_build.duration %></span> seconds.
+              <% end %>
+            </li>
             <% if joe.last_build.failed? %>
               <li><pre class="terminal"><code><%=ansi_color_codes h(joe.last_build.output) %></code></pre></li>
             <% end %>

data/lib/cijoe.rb

@@ -68,6 +68,7 @@ class CIJoe
     @current_build.status = status
     @current_build.output = output
     @last_build = @current_build
+
     @current_build = nil
     write_build 'current', @current_build
     write_build 'last', @last_build
@@ -83,6 +84,20 @@ class CIJoe
     Thread.new { build! }
   end
 
+  def open_pipe(cmd)
+    read, write = IO.pipe
+
+    pid = fork do
+      read.close
+      $stdout.reopen write
+      exec cmd
+    end
+
+    write.close
+
+    yield read, pid
+  end
+
   # update git then run the build
   def build!
     build = @current_build
@@ -91,14 +106,21 @@ class CIJoe
     build.sha = git_sha
     write_build 'current', build
 
-    IO.popen("#{runner_command} 2>&1") do |pipe|
+    open_pipe("#{runner_command} 2>&1") do |pipe, pid|
+      puts "#{Time.now.to_i}: Building #{build.short_sha}: pid=#{pid}"
+
       build.pid = pid
       write_build 'current', build
       output = pipe.read
     end
 
-    $?.exitstatus.to_i == 0 ? build_worked(output) : build_failed('', output)
+    Process.waitpid(build.pid)
+    status = $?.exitstatus.to_i
+    puts "#{Time.now.to_i}: Built #{build.short_sha}: status=#{status}"
+
+    status == 0 ? build_worked(output) : build_failed('', output)
   rescue Object => e
+    puts "Exception building: #{e.message} (#{e.class})"
     build_failed('', e.to_s)
   end
 
@@ -147,8 +169,14 @@ class CIJoe
 
   # restore current / last build state from disk.
   def restore
-    @last_build = read_build('last')
-    @current_build = read_build('current')
+    unless @last_build
+      @last_build = read_build('last')
+    end
+
+    unless @current_build
+      @current_build = read_build('current')
+    end
+
     Process.kill(0, @current_build.pid) if @current_build && @current_build.pid
   rescue Errno::ESRCH
     # build pid isn't running anymore. assume previous

data/test/helper.rb

@@ -5,5 +5,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cijoe'
 
+CIJoe::Server.set :project_path, "."
+CIJoe::Server.set :environment,  "test"
+
 class Test::Unit::TestCase
 end

data/test/test_cijoe_server.rb

@@ -0,0 +1,50 @@
+require "helper"
+require "rack/test"
+require "cijoe/server"
+
+class TestCIJoeServer < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  class ::CIJoe
+    attr_writer :current_build, :last_build
+  end
+
+  attr_accessor :app
+
+  def setup
+    @app = CIJoe::Server.new
+  end
+
+  def test_ping
+    app.joe.last_build = build :worked
+    assert !app.joe.building?, "have a last build, but not a current"
+
+    get "/ping"
+    assert_equal 200, last_response.status
+    assert_equal app.joe.last_build.sha, last_response.body
+  end
+
+  def test_ping_building
+    app.joe.current_build = build :building
+    assert app.joe.building?, "buildin' a awsum project"
+
+    get "/ping"
+    assert_equal 412, last_response.status
+    assert_equal "building", last_response.body
+  end
+
+  def test_ping_failed
+    app.joe.last_build = build :failed
+
+    get "/ping"
+    assert_equal 412, last_response.status
+    assert_equal app.joe.last_build.sha, last_response.body
+  end
+
+  # Create a new, fake build. All we care about is status.
+
+  def build status
+    CIJoe::Build.new "user", "project", Time.now, Time.now,
+      "deadbeef", status, "output", 1337
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cijoe
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -08:00
+date: 2010-02-28 00:00:00 -08:00
 default_executable: cijoe
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: CI Joe is a simple Continuous Integration server.
 email: chris@ozmm.org
 executables: 
@@ -48,6 +58,8 @@ files:
 - Rakefile
 - bin/cijoe
 - deps.rip
+- examples/build-failed
+- examples/build-worked
 - examples/cijoe.ru
 - examples/cijoed
 - lib/cijoe.rb
@@ -63,6 +75,7 @@ files:
 - lib/cijoe/views/template.erb
 - test/helper.rb
 - test/test_cijoe.rb
+- test/test_cijoe_server.rb
 has_rdoc: true
 homepage: http://github.com/defunkt/cijoe
 licenses: []
@@ -94,3 +107,4 @@ summary: CI Joe is a simple Continuous Integration server.
 test_files: 
 - test/helper.rb
 - test/test_cijoe.rb
+- test/test_cijoe_server.rb