cijoe 0.7.0 → 0.8.0

data/README.md

@@ -7,7 +7,9 @@ server that'll run your tests on demand and report their pass/fail status.
 
 Because knowing is half the battle.
 
-![The Battle](http://img.skitch.com/20090805-g4a2qhttwij8n2jr9t552efn3k.png)
+[![The Battle](http://img.skitch.com/20090805-g4a2qhttwij8n2jr9t552efn3k.png)](http://nerduo.com/thebattle/)
+
+([Buy the shirt](http://nerduo.com/thebattle/))
 
 Quickstart
 ----------
@@ -75,17 +77,16 @@ Campfire notification is included, because it's what we use. Want Joe
 notify your Campfire? Put this in your repo's `.git/config`:
 
     [campfire]
-      token = your_api_token
-      subdomain = whatever
-      room = Awesomeness
-      ssl = false
-
-Note: your API token may differ between subdomains!
+    	user = your@campfire.email
+    	pass = passw0rd
+    	subdomain = whatever
+    	room = Awesomeness
+    	ssl = false
 
 Or do it the old fashion way:
 
     $ cd yourrepo
-    $ git config --add campfire.token 98ADFLKJSDOIU7BLAH
+    $ git config --add campfire.user chris@ozmm.org
     $ git config --add campfire.subdomain github
     etc.
 

data/Rakefile

@@ -18,8 +18,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'

data/lib/cijoe.rb

@@ -89,7 +89,7 @@ class CIJoe
 
   # run the build but make sure only one is running
   # at a time (if new one comes in we will park it)
-  def build
+  def build(branch=nil)
     if building?
       # only if switched on to build all incoming requests
       if !repo_config.buildallfile.to_s.empty?
@@ -103,7 +103,7 @@ class CIJoe
     end
     @current_build = Build.new(@project_path, @user, @project)
     write_build 'current', @current_build
-    Thread.new { build! }
+    Thread.new { build!(branch) }
   end
 
   def open_pipe(cmd)
@@ -121,7 +121,8 @@ class CIJoe
   end
 
   # update git then run the build
-  def build!
+  def build!(branch=nil)
+    @git_branch = branch
     build = @current_build
     output = ''
     git_update
@@ -166,8 +167,9 @@ class CIJoe
   end
 
   def git_branch
+    return @git_branch if @git_branch
     branch = repo_config.branch.to_s
-    branch == '' ? "master" : branch
+    @git_branch = branch == '' ? "master" : branch
   end
 
   # massage our repo
@@ -194,13 +196,8 @@ class CIJoe
 
   # restore current / last build state from disk.
   def restore
-    unless @last_build
-      @last_build = read_build('last')
-    end
-
-    unless @current_build
-      @current_build = read_build('current')
-    end
+    @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

data/lib/cijoe/campfire.rb

@@ -11,11 +11,12 @@ class CIJoe
         end
 
         puts "Loaded Campfire notifier"
-      else
+      elsif ENV['RACK_ENV'] != 'test'
         puts "Can't load Campfire notifier."
         puts "Please add the following to your project's .git/config:"
         puts "[campfire]"
-        puts "\ttoken = your_api_token"
+        puts "\tuser = your@campfire.email"
+        puts "\tpass = passw0rd"
         puts "\tsubdomain = whatever"
         puts "\troom = Awesomeness"
         puts "\tssl = false"
@@ -25,15 +26,16 @@ class CIJoe
     def self.config
       campfire_config = Config.new('campfire', @project_path)
       @config ||= {
-        :subdomain => Config.campfire(@project_path).subdomain.to_s,
-        :token     => Config.campfire(@project_path).token.to_s,
-        :room      => Config.campfire(@project_path).room.to_s,
-        :ssl       => Config.campfire(@project_path).ssl.to_s.strip == 'true'
+        :subdomain => campfire_config.subdomain.to_s,
+        :user      => campfire_config.user.to_s,
+        :pass      => campfire_config.pass.to_s,
+        :room      => campfire_config.room.to_s,
+        :ssl       => campfire_config.ssl.to_s.strip == 'true'
       }
     end
 
     def self.valid_config?
-      %w( subdomain token room ).all? do |key|
+      %w( subdomain user pass room ).all? do |key|
         !config[key.intern].empty?
       end
     end
@@ -49,14 +51,17 @@ class CIJoe
       @room ||= begin
         config = Campfire.config
         campfire = Tinder::Campfire.new(config[:subdomain],
-            :token => config[:token],
+            :username => config[:user],
+            :password => config[:pass],
             :ssl => config[:ssl] || false)
         campfire.find_room_by_name(config[:room])
       end
     end
 
     def short_message
-      "Build #{short_sha} of #{project} #{worked? ? "was successful" : "failed"}"
+      "Build #{short_sha} of #{project} " +
+        (worked? ? "was successful" : "failed") +
+        " (#{duration.to_i}s)"
     end
 
     def full_message

data/lib/cijoe/config.rb

@@ -1,7 +1,7 @@
 class CIJoe
   class Config
     def self.method_missing(command, *args)
-      new(command, args)
+      new(command, *args)
     end
 
     def initialize(command, project_path = nil, parent = nil)

data/lib/cijoe/server.rb

@@ -27,10 +27,16 @@ class CIJoe
     end
 
     post '/?' do
-      payload = params[:payload].to_s
-      if payload.empty? || payload.include?(joe.git_branch)
-        joe.build
+      payload = YAML.load(params[:payload].to_s) || {}
+      pushed_branch = payload[:ref].to_s.split('/').last
+
+      # Only build if we were given an explicit branch via `?branch=blah`,
+      # no payload exists (we're probably testing), or the payload exists and
+      # the "ref" property matches our specified build branch.
+      if params[:branch] || payload.empty? || pushed_branch == joe.git_branch
+        joe.build(params[:branch])
       end
+
       redirect request.path
     end
 

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = VERSION = "0.7.0"
+  Version = VERSION = "0.8.0"
 end

data/test/helper.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'test/unit'
 
+ENV['RACK_ENV'] = 'test'
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cijoe'

data/test/test_cijoe_server.rb

@@ -13,6 +13,11 @@ class TestCIJoeServer < Test::Unit::TestCase
 
   def setup
     @app = CIJoe::Server.new
+    # make Build#restore a no-op so we don't overwrite our current/last
+    # build attributes set from tests.
+    joe = @app.joe
+    def joe.restore
+    end
   end
 
   def test_ping

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cijoe
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: choice
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -90,23 +97,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: cijoe builds your builds.