cijoe 0.1.2 → 0.2.0

data/.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+rdoc
+pkg
+*.tmproj
+tmp/**/*
+tmp/*

data/README.markdown

@@ -89,24 +89,6 @@ Multiple Projects
 Want CI for multiple projects? Just start multiple instances of Joe!
 He can run on any port - try `cijoe -h` for more options.
 
-Thanks to Dean Strelau you can also run multiple instances of CI Joe using
-a single `config.ru` file.
-
-In particular, it is possible to mount Server at a subpath:
-
-    map '/foo' do
-       run CIJoe::Server.set(:project_path => 'projects/foo')
-    end
-
-and you can even run multiple instances of Joe if you subclass:
-
-    map '/foo' do
-      run Class.new(CIJoe::Server).set(:project_path => 'projects/foo')
-    end
-    map '/bar' do
-      run Class.new(CIJoe::Server).set(:project_path => 'projects/bar')
-    end
-
 
 HTTP Auth
 ---------

data/Rakefile

@@ -16,10 +16,43 @@ begin
     gemspec.authors = ["Chris Wanstrath"]
     gemspec.add_dependency 'choice'
     gemspec.add_dependency 'sinatra'
-    gemspec.add_dependency 'open4'
     gemspec.version = CIJoe::Version.to_s
   end
 rescue LoadError
   puts "Jeweler not available." 
   puts "Install it with: gem install jeweler"
 end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "someproject #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/deps.rip

@@ -2,4 +2,3 @@ git://github.com/collectiveidea/tinder.git 1.2.0
 git://github.com/sinatra/sinatra.git 0.9.4
 git://github.com/rack/rack.git 1.0
 git://github.com/defunkt/choice.git 8b125564
-git://github.com/ahoward/open4.git 25c3ed8

data/examples/cijoe.ru

@@ -0,0 +1,15 @@
+# Example CI Joe rackup config. Drop a cijoe.ru file
+# in your projects direct
+require 'cijoe'
+
+# setup middleware
+use Rack::CommonLogger
+
+# configure joe
+CIJoe::Server.configure do |config|
+  config.set :project_path, File.dirname(__FILE__)
+  config.set :show_exceptions, true
+  config.set :lock, true
+end
+
+run CIJoe::Server

data/examples/cijoed

@@ -0,0 +1,53 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          cijoe
+# Required-Start:    $syslog $local_fs $network
+# Required-Stop:     $syslog $local_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 
+# Description:       Run the CIJoe CI server.  Yo Joe!!
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+REPO=/path/to/your/git/repository
+PORT=4567
+
+NAME=cijoe
+INSTALL_DIR=/usr/sbin
+DAEMON=$INSTALL_DIR/$NAME
+DAEMON_ARGS="-p $PORT $REPO"
+PIDFILE=/var/run/$NAME.pid
+DAEMON_USER=www-data
+DAEMON_GROUP=$DAEMON_USER
+
+# test -f $DAEMON || exit 0
+# test -f $PROJECT_DIR || exit 0
+
+case "$1" in
+start)
+	log_daemon_msg "Starting cijoe" "cijoe"
+	start-stop-daemon --background --make-pidfile --exec $DAEMON --start --name $NAME --pidfile $PIDFILE --chuid $DAEMON_USER:$DAEMON_GROUP -- $DAEMON_ARGS
+	log_end_msg $?
+	;;
+stop)
+	log_daemon_msg "Stopping cijoe" "cijoe"
+	start-stop-daemon --stop --pidfile $PIDFILE --quiet --retry 10
+	log_end_msg $?
+	;;
+restart)
+	log_daemon_msg "Restarting cijoe" "cijoe"
+	start-stop-daemon --stop --pidfile $PIDFILE --quiet --retry 10
+	start-stop-daemon --background --make-pidfile --exec $DAEMON --start --name $NAME --pidfile $PIDFILE --chuid $DAEMON_USER:$DAEMON_GROUP -- $DAEMON_ARGS
+	log_end_msg $?
+	;;
+status)
+	status_of_proc $DAEMON $NAME && exit 0 || exit $?
+	;;
+*)
+	log_action_msg "Usage: /etc/init.d/cijoe (start|stop|restart)"
+	exit 2
+	;;
+esac
+
+exit 0

data/lib/cijoe.rb

@@ -13,12 +13,6 @@
 #
 # Seriously, I'm gonna be nuts about keeping this simple.
 
-begin
-  require 'open4'
-rescue LoadError
-  abort "** Please install open4"
-end
-
 require 'cijoe/version'
 require 'cijoe/config'
 require 'cijoe/commit'
@@ -49,7 +43,7 @@ class CIJoe
 
   # the pid of the running child process
   def pid
-    building? and @pid
+    building? and current_build.pid
   end
 
   # kill the child and exit
@@ -75,6 +69,8 @@ class CIJoe
     @current_build.output = output
     @last_build = @current_build
     @current_build = nil
+    write_build 'current', @current_build
+    write_build 'last', @last_build
     @last_build.notify if @last_build.respond_to? :notify
   end
 
@@ -83,21 +79,25 @@ class CIJoe
   def build
     return if building?
     @current_build = Build.new(@user, @project)
+    write_build 'current', @current_build
     Thread.new { build! }
   end
 
   # update git then run the build
   def build!
-    out, err, status = '', '', nil
+    build = @current_build
+    output = ''
     git_update
-    @current_build.sha = git_sha
+    build.sha = git_sha
+    write_build 'current', build
 
-    status = Open4.popen4(runner_command) do |pid, stdin, stdout, stderr|
-      @pid = pid
-      err, out = stderr.read.strip, stdout.read.strip
+    IO.popen("#{runner_command} 2>&1") do |pipe|
+      build.pid = pid
+      write_build 'current', build
+      output = pipe.read
     end
 
-    status.exitstatus.to_i == 0 ? build_worked(out) : build_failed(out, err)
+    $?.exitstatus.to_i == 0 ? build_worked(output) : build_failed('', output)
   rescue Object => e
     build_failed('', e.to_s)
   end
@@ -129,7 +129,46 @@ class CIJoe
   # massage our repo
   def run_hook(hook)
     if File.exists?(file=".git/hooks/#{hook}") && File.executable?(file)
-      `sh #{file}`
+      data =
+        if @last_build && @last_build.commit
+          {
+            "MESSAGE" => @last_build.commit.message,
+            "AUTHOR" => @last_build.commit.author,
+            "SHA" => @last_build.commit.sha,
+            "OUTPUT" => @last_build.clean_output
+          }
+        else
+          {}
+        end
+      env = data.collect { |k, v| %(#{k}=#{v.inspect}) }.join(" ")
+      `#{env} sh #{file}`
+    end
+  end
+
+  # restore current / last build state from disk.
+  def restore
+    @last_build = read_build('last')
+    @current_build = read_build('current')
+    Process.kill(0, @current_build.pid) if @current_build && @current_build.pid
+  rescue Errno::ESRCH
+    # build pid isn't running anymore. assume previous
+    # server died and reset.
+    @current_build = nil
+  end
+
+  # write build info for build to file.
+  def write_build(name, build)
+    filename = ".git/builds/#{name}"
+    Dir.mkdir '.git/builds' unless File.directory?('.git/builds')
+    if build
+      build.dump filename
+    elsif File.exist?(filename)
+      File.unlink filename
     end
   end
+
+  # load build info from file.
+  def read_build(name)
+    Build.load(".git/builds/#{name}")
+  end
 end

data/lib/cijoe/build.rb

@@ -1,8 +1,10 @@
+require 'yaml'
+
 class CIJoe
-  class Build < Struct.new(:user, :project, :started_at, :finished_at, :sha, :status, :output)
+  class Build < Struct.new(:user, :project, :started_at, :finished_at, :sha, :status, :output, :pid)
     def initialize(*args)
       super
-      self.started_at = Time.now
+      self.started_at ||= Time.now
     end
 
     def status
@@ -27,7 +29,21 @@ class CIJoe
     end
 
     def commit
+      return if sha.nil?
       @commit ||= Commit.new(sha, user, project)
     end
+
+    def dump(file)
+      config = [user, project, started_at, finished_at, sha, status, output, pid]
+      data = YAML.dump(config)
+      File.open(file, 'wb') { |io| io.write(data) }
+    end
+
+    def self.load(file)
+      if File.exist?(file)
+        config = YAML.load(File.read(file))
+        new *config
+      end
+    end
   end
 end

data/lib/cijoe/commit.rb

@@ -5,15 +5,15 @@ class CIJoe
     end
 
     def author
-      raw_commit_lines[1].split(':')[-1]
+      raw_commit_lines.grep(/Author:/).first.split(':', 2)[-1]
     end
 
     def committed_at
-      raw_commit_lines[2].split(':', 2)[-1]
+      raw_commit_lines.grep(/Date:/).first.split(':', 2)[-1]
     end
 
     def message
-      raw_commit_lines[4].split(':')[-1].strip
+      raw_commit.split("\n\n", 3)[1].to_s.strip
     end
 
     def raw_commit

data/lib/cijoe/config.rb

@@ -14,11 +14,29 @@ class CIJoe
     end
 
     def to_s
-      `git config #{config_string}`.chomp
+      git_command = "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
+        raise "Error calling git config, is a recent version of git installed? Command: #{git_command}, Error: #{result}"
+      end
     end
 
     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

data/lib/cijoe/server.rb

@@ -8,6 +8,9 @@ class CIJoe
     set :views,  "#{dir}/views"
     set :public, "#{dir}/public"
     set :static, true
+    set :lock, true
+
+    before { @joe.restore }
 
     get '/?' do
       erb(:template, {}, :joe => @joe)

data/lib/cijoe/version.rb

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

data/lib/cijoe/views/template.erb

@@ -2,6 +2,7 @@
 <html>
   <head>
     <link href="<%= cijoe_root %>/screen.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="<%= cijoe_root %>/favicon.ico" type="image/x-icon" />
     <title><%= h(joe.project) %>: CI Joe</title>
   </head>
   <body>

data/test/helper.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'test/unit'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'cijoe'
+
+class Test::Unit::TestCase
+end

data/test/test_cijoe.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class TestCIJoe < Test::Unit::TestCase
+  def test_raise_error_on_invalid_command
+    assert_raise RuntimeError, LoadError do
+      CIJoe::Config.new('--invalid').to_s
+    end
+  end
+  
+  def test_return_value_of_config
+    assert_equal `git config blame`.chomp, CIJoe::Config.new('blame').to_s
+  end
+  
+  def test_return_empty_string_when_config_does_not_exist
+    assert_equal '', CIJoe::Config.new('invalid').to_s
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cijoe
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 -07:00
+date: 2009-12-24 00:00:00 -08:00
 default_executable: cijoe
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: open4
-  type: :runtime
-  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: 
@@ -52,21 +42,27 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- .gitignore
 - LICENSE
 - README.markdown
 - Rakefile
 - bin/cijoe
 - deps.rip
+- examples/cijoe.ru
+- examples/cijoed
 - lib/cijoe.rb
 - lib/cijoe/build.rb
 - lib/cijoe/campfire.rb
 - lib/cijoe/commit.rb
 - lib/cijoe/config.rb
+- lib/cijoe/public/favicon.ico
 - lib/cijoe/public/octocat.png
 - lib/cijoe/public/screen.css
 - lib/cijoe/server.rb
 - lib/cijoe/version.rb
 - lib/cijoe/views/template.erb
+- test/helper.rb
+- test/test_cijoe.rb
 has_rdoc: true
 homepage: http://github.com/defunkt/cijoe
 licenses: []
@@ -95,5 +91,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: CI Joe is a simple Continuous Integration server.
-test_files: []
-
+test_files: 
+- test/helper.rb
+- test/test_cijoe.rb