cijoe 0.4.0 → 0.5.0

data/Rakefile

@@ -1,37 +1,3 @@
-desc "Build a gem"
-task :gem => [ :gemspec, :build ]
-
-begin
-  require 'jeweler'
-
-  $LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
-  require 'cijoe/version'
-
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "cijoe"
-    gemspec.summary = "CI Joe is a simple Continuous Integration server."
-    gemspec.description = "CI Joe is a simple Continuous Integration server."
-    gemspec.email = "chris@ozmm.org"
-    gemspec.homepage = "http://github.com/defunkt/cijoe"
-    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
-  puts "Jeweler not available."
-  puts "Install it with: gem install jeweler"
-end
-
-desc "Publish a RubyGem"
-task :publish => :gem do
-  $LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
-  require 'cijoe/version'
-
-  sh "gem push pkg/cijoe-#{CIJoe::Version}.gem"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/bin/cijoe

@@ -45,8 +45,7 @@ Choice.options do
 end
 
 options = Choice.choices
-$project_path = File.expand_path(Choice.rest[0])
 
 require 'cijoe'
 
-CIJoe::Server.start(options[:host], options[:port], $project_path)
+CIJoe::Server.start(options[:host], options[:port], File.expand_path(Choice.rest[0]))

data/lib/cijoe.rb

@@ -24,8 +24,7 @@ class CIJoe
   attr_reader :user, :project, :url, :current_build, :last_build
 
   def initialize(project_path)
-    project_path = File.expand_path(project_path)
-    Dir.chdir(project_path)
+    @project_path = File.expand_path(project_path)
 
     @user, @project = git_user_and_project
     @url = "http://github.com/#{@user}/#{@project}"
@@ -49,9 +48,9 @@ class CIJoe
   # kill the child and exit
   def stop
     # another build waits
-    if Config.cijoe.buildallfile && File.exist?(Config.cijoe.buildallfile.to_s)
+    if !repo_config.buildallfile.to_s.empty? && File.exist?(repo_config.buildallfile.to_s)
       # clean out on stop
-      FileUtils.rm(Config.cijoe.buildallfile.to_s)
+      FileUtils.rm(repo_config.buildallfile.to_s)
     end
 
     Process.kill(9, pid) if pid
@@ -81,9 +80,9 @@ class CIJoe
     @last_build.notify if @last_build.respond_to? :notify
 
     # another build waits
-    if Config.cijoe.buildallfile && File.exist?(Config.cijoe.buildallfile.to_s)
+    if !repo_config.buildallfile.to_s.empty? && File.exist?(repo_config.buildallfile.to_s)
       # clean out before new build
-      FileUtils.rm(Config.cijoe.buildallfile.to_s)
+      FileUtils.rm(repo_config.buildallfile.to_s)
       build
     end
   end
@@ -93,16 +92,16 @@ class CIJoe
   def build
     if building?
       # only if switched on to build all incoming requests
-      if Config.cijoe.buildallfile
+      if !repo_config.buildallfile.to_s.empty?
         # and there is no previous request
-        return if File.exist?(Config.cijoe.buildallfile.to_s)
+        return if File.exist?(repo_config.buildallfile.to_s)
         # we will mark awaiting builds
-        FileUtils.touch(Config.cijoe.buildallfile.to_s)
+        FileUtils.touch(repo_config.buildallfile.to_s)
       end
       # leave anyway because a current build runs
       return
     end
-    @current_build = Build.new(@user, @project)
+    @current_build = Build.new(@project_path, @user, @project)
     write_build 'current', @current_build
     Thread.new { build! }
   end
@@ -129,7 +128,7 @@ class CIJoe
     build.sha = git_sha
     write_build 'current', build
 
-    open_pipe("#{runner_command} 2>&1") do |pipe, pid|
+    open_pipe("cd #{@project_path} && #{runner_command} 2>&1") do |pipe, pid|
       puts "#{Time.now.to_i}: Building #{build.short_sha}: pid=#{pid}"
 
       build.pid = pid
@@ -149,44 +148,47 @@ class CIJoe
 
   # shellin' out
   def runner_command
-    runner = Config.cijoe.runner.to_s
+    runner = repo_config.runner.to_s
     runner == '' ? "rake -s test:units" : runner
   end
 
   def git_sha
-    `git rev-parse origin/#{git_branch}`.chomp
+    `cd #{@project_path} && git rev-parse origin/#{git_branch}`.chomp
   end
 
   def git_update
-    `git fetch origin && git reset --hard origin/#{git_branch}`
+    `cd #{@project_path} && git fetch origin && git reset --hard origin/#{git_branch}`
     run_hook "after-reset"
   end
 
   def git_user_and_project
-    Config.remote.origin.url.to_s.chomp('.git').split(':')[-1].split('/')[-2, 2]
+    Config.remote(@project_path).origin.url.to_s.chomp('.git').split(':')[-1].split('/')[-2, 2]
   end
 
   def git_branch
-    branch = Config.cijoe.branch.to_s
+    branch = repo_config.branch.to_s
     branch == '' ? "master" : branch
   end
 
   # massage our repo
   def run_hook(hook)
-    if File.exists?(file=".git/hooks/#{hook}") && File.executable?(file)
+    if File.exists?(file=path_in_project(".git/hooks/#{hook}")) && File.executable?(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
+            "OUTPUT" => @last_build.env_output
           }
         else
           {}
         end
+
       data.each{ |k, v| ENV[k] = v }
-      `sh #{file}`
+      ret = `cd #{@project_path} && sh #{file}`
+      data.each{ |k, v| ENV[k] = nil }
+      ret
     end
   end
 
@@ -207,10 +209,14 @@ class CIJoe
     @current_build = nil
   end
 
+  def path_in_project(path)
+    File.join(@project_path, path)
+  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')
+    filename = path_in_project(".git/builds/#{name}")
+    Dir.mkdir path_in_project('.git/builds') unless File.directory?(path_in_project('.git/builds'))
     if build
       build.dump filename
     elsif File.exist?(filename)
@@ -218,8 +224,12 @@ class CIJoe
     end
   end
 
+  def repo_config
+    Config.cijoe(@project_path)
+  end
+
   # load build info from file.
   def read_build(name)
-    Build.load(".git/builds/#{name}")
+    Build.load(path_in_project(".git/builds/#{name}"), @project_path)
   end
 end

data/lib/cijoe/build.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 class CIJoe
-  class Build < Struct.new(:user, :project, :started_at, :finished_at, :sha, :status, :output, :pid)
+  class Build < Struct.new(:project_path, :user, :project, :started_at, :finished_at, :sha, :status, :output, :pid)
     def initialize(*args)
       super
       self.started_at ||= Time.now
@@ -41,9 +41,14 @@ class CIJoe
       output.gsub(/\e\[.+?m/, '').strip
     end
 
+    def env_output
+      out = clean_output
+      out.size > 100_000 ? out[-100_000,100_000] : out
+    end
+
     def commit
       return if sha.nil?
-      @commit ||= Commit.new(sha, user, project)
+      @commit ||= Commit.new(sha, user, project, project_path)
     end
 
     def dump(file)
@@ -52,9 +57,9 @@ class CIJoe
       File.open(file, 'wb') { |io| io.write(data) }
     end
 
-    def self.load(file)
+    def self.load(file, project_path)
       if File.exist?(file)
-        config = YAML.load(File.read(file))
+        config = YAML.load(File.read(file)).unshift(project_path)
         new *config
       end
     end

data/lib/cijoe/campfire.rb

@@ -47,10 +47,10 @@ class CIJoe
     def room
       @room ||= begin
         config = Campfire.config
-        options = {}
-        options[:ssl] = config[:ssl] ? true : false
-        campfire = Tinder::Campfire.new(config[:subdomain], options)
-        campfire.login(config[:user], config[:pass])
+        campfire = Tinder::Campfire.new(config[:subdomain], 
+            :username => config[:user], 
+            :password => config[:pass], 
+            :ssl => config[:ssl] || false)
         campfire.find_room_by_name(config[:room])
       end
     end

data/lib/cijoe/commit.rb

@@ -1,5 +1,5 @@
 class CIJoe
-  class Commit < Struct.new(:sha, :user, :project)
+  class Commit < Struct.new(:sha, :user, :project, :project_path)
     def url
       "http://github.com/#{user}/#{project}/commit/#{sha}"
     end
@@ -17,7 +17,7 @@ class CIJoe
     end
 
     def raw_commit
-      @raw_commit ||= `git show #{sha}`.chomp
+      @raw_commit ||= `cd #{project_path} && git show #{sha}`.chomp
     end
 
     def raw_commit_lines

data/lib/cijoe/config.rb

@@ -1,17 +1,17 @@
 class CIJoe
   class Config
     def self.method_missing(command, *args)
-      new(command)
+      new(command, args)
     end
 
-    def initialize(command, parent = nil)
+    def initialize(command, project_path = nil, parent = nil)
       @command  = command
       @parent   = parent
-      @project_path = $project_path || File.join(File.dirname(__FILE__), '../../')
+      @project_path = project_path || File.join(File.dirname(__FILE__), '../../')
     end
 
     def method_missing(command, *args)
-      Config.new(command, self)
+      Config.new(command, @project_path, self)
     end
 
     def to_s
@@ -22,7 +22,7 @@ class CIJoe
       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}"
+        raise "Error calling git config, is a recent version of git installed? Command: #{git_command.inspect}, Error: #{result.inspect}, Status: #{process_status.inspect}"
       end
     end
 

data/lib/cijoe/server.rb

@@ -34,13 +34,6 @@ class CIJoe
       redirect request.path
     end
 
-    user, pass = Config.cijoe.user.to_s, Config.cijoe.pass.to_s
-    if user != '' && pass != ''
-      use Rack::Auth::Basic do |username, password|
-        [ username, password ] == [ user, pass ]
-      end
-      puts "Using HTTP basic auth"
-    end
 
     helpers do
       include Rack::Utils
@@ -76,6 +69,17 @@ class CIJoe
       CIJoe::Server.run! :host => host, :port => port
     end
 
+    def self.project_path=(project_path)
+      user, pass = Config.cijoe(project_path).user.to_s, Config.cijoe(project_path).pass.to_s
+      if user != '' && pass != ''
+        use Rack::Auth::Basic do |username, password|
+          [ username, password ] == [ user, pass ]
+        end
+        puts "Using HTTP basic auth"
+      end
+      set :project_path, Proc.new{project_path}
+    end
+
     def check_project
       if options.project_path.nil? || !File.exists?(File.expand_path(options.project_path))
         puts "Whoops! I need the path to a Git repo."

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = "0.4.0"
+  Version = VERSION = "0.5.0"
 end

data/lib/cijoe/views/template.erb

@@ -30,7 +30,11 @@
           
           <% if joe.last_build %>
             <li>
-              <span class="date"><%= pretty_time(joe.last_build.finished_at) %></span> &raquo; Built <a href="<%= joe.last_build.commit.url %>"><%= joe.last_build.short_sha %></a> <span class="<%= joe.last_build.status %>">(<%= joe.last_build.status %>)</span>
+              <span class="date"><%= pretty_time(joe.last_build.finished_at) %></span> &raquo;
+              <% if joe.last_build.sha %>
+                Built <a href="<%= joe.last_build.commit.url %>"><%= joe.last_build.short_sha %></a>
+              <% end %>
+              <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 %>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cijoe
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,60 +14,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
-default_executable: cijoe
+date: 2010-07-24 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: choice
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: CI Joe is a simple Continuous Integration server.
+  type: :development
+  version_requirements: *id003
+description: "  cijoe is a sinatra-based continuous integration server. It's like an\n  old rusty pickup truck: it might be smelly and gross, but it gets the\n  job done.\n"
 email: chris@ozmm.org
 executables: 
 - cijoe
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- LICENSE
-- README.markdown
+- README.md
 - Rakefile
-- bin/cijoe
-- deps.rip
-- examples/build-failed
-- examples/build-worked
-- examples/cijoe.ru
-- examples/cijoed
-- lib/cijoe.rb
+- LICENSE
 - lib/cijoe/build.rb
 - lib/cijoe/campfire.rb
 - lib/cijoe/commit.rb
@@ -73,6 +75,8 @@ files:
 - lib/cijoe/server.rb
 - lib/cijoe/version.rb
 - lib/cijoe/views/template.erb
+- lib/cijoe.rb
+- bin/cijoe
 - test/helper.rb
 - test/test_cijoe.rb
 - test/test_cijoe_server.rb
@@ -81,30 +85,30 @@ homepage: http://github.com/defunkt/cijoe
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: CI Joe is a simple Continuous Integration server.
-test_files: 
-- test/helper.rb
-- test/test_cijoe.rb
-- test/test_cijoe_server.rb
+summary: cijoe builds your builds.
+test_files: []
+

data/.gitignore

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

data/deps.rip

@@ -1,4 +0,0 @@
-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

data/examples/build-failed

@@ -1,22 +0,0 @@
-#!/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

@@ -1,22 +0,0 @@
-#!/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/examples/cijoe.ru

@@ -1,15 +0,0 @@
-# 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

@@ -1,53 +0,0 @@
-#!/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