cijoe 0.3.0 → 0.4.0

data/README.markdown

@@ -12,19 +12,13 @@ Because knowing is half the battle.
 Quickstart
 ----------
 
-Rip:
-
-    $ rip install git://github.com/defunkt/cijoe.git
-    $ git clone git://github.com/you/yourrepo.git
-    $ cijoe yourrepo
-
-Gemcutter:
+RubyGems:
 
     $ gem install cijoe
     $ git clone git://github.com/you/yourrepo.git
     $ cijoe yourrepo
 
-Boom. Navigate to http://localhost:4567 to see Joe in action.
+Boom. Navigate to <http://localhost:4567> to see Joe in action.
 Check `cijoe -h` for other options.
 
 Basically you need to run `cijoe` and hand it the path to a git
@@ -55,15 +49,27 @@ build. Pull any metadata you want out of that scro.
 
 
 Other Branches
---------------
+----------------------
 
 Want joe to run against a branch other than `master`? No problem:
 
     $ git config --add cijoe.branch deploy
 
 
+Concurrent Push's - a kind of "queueing"
+----------------------------------------
+
+Joe runs just one build at the time. If you expect concurrent push's
+to your repo and want joe to build each in a kind of queue, just set:
+
+    $ git config --add cijoe.buildallfile tmp/cijoe.txt
+
+Joe will save requests while another build runs. If more than one push
+hits joe, he just picks the last after finishing the prior.
+
+
 Campfire
---------
+-------------
 
 Campfire notification is included, because it's what we use. Want Joe
 notify your Campfire? Put this in your repo's `.git/config`:
@@ -84,7 +90,7 @@ Or do it the old fashion way:
 
 
 Checkin' Status
----------------
+----------------------
 
 Want to see how your build's doing without any of this fancy UI crap?
 Ping Joe for the lowdown:
@@ -95,15 +101,18 @@ 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
------------------
+------------------------
 
 Want CI for multiple projects? Just start multiple instances of Joe!
 He can run on any port - try `cijoe -h` for more options.
 
+If you're using Passenger, see [this blog post](http://chrismdp.github.com/2010/03/multiple-ci-joes-with-rack-and-passenger/).
+
 
 HTTP Auth
----------
+----------------
 
 Worried about people triggering your builds? Setup HTTP auth:
 
@@ -112,7 +121,7 @@ Worried about people triggering your builds? Setup HTTP auth:
 
 
 GitHub Integration
-------------------
+--------------------------
 
 Any POST to Joe will trigger a build. If you are hiding Joe behind
 HTTP auth, that's okay - GitHub knows how to authenticate properly.
@@ -124,7 +133,7 @@ of your project's "Admin" tab.
 
 
 Daemonize
----------
+----------------
 
 Want to run Joe as a daemon? Use `nohup`:
 
@@ -132,7 +141,7 @@ Want to run Joe as a daemon? Use `nohup`:
 
 
 Other CI Servers
-----------------
+------------------------
 
 Need more features? More notifiers? Check out one of these bad boys:
 
@@ -140,10 +149,11 @@ Need more features? More notifiers? Check out one of these bad boys:
 * [Integrity](http://integrityapp.com/)
 * [CruiseControl.rb](http://cruisecontrolrb.thoughtworks.com/)
 * [BuildBot](http://buildbot.net/trac)
+* [Signal](http://www.github.com/dcrec1/signal)
 
 
 Screenshots
------------
+------------------
 
 ![Building](http://img.skitch.com/20090806-ryw34ksi5ixnrdwxcptqy28iy7.png)
 
@@ -151,7 +161,7 @@ Screenshots
 
 
 Questions? Concerns?
---------------------
+---------------------------------
 
 [Issues](http://github.com/defunkt/cijoe/issues) or [the mailing list](http://groups.google.com/group/cijoe).
 

data/Rakefile

@@ -20,10 +20,18 @@ begin
     gemspec.version = CIJoe::Version.to_s
   end
 rescue LoadError
-  puts "Jeweler not available." 
+  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/lib/cijoe.rb

@@ -48,6 +48,12 @@ class CIJoe
 
   # kill the child and exit
   def stop
+    # another build waits
+    if Config.cijoe.buildallfile && File.exist?(Config.cijoe.buildallfile.to_s)
+      # clean out on stop
+      FileUtils.rm(Config.cijoe.buildallfile.to_s)
+    end
+
     Process.kill(9, pid) if pid
     exit!
   end
@@ -73,12 +79,29 @@ class CIJoe
     write_build 'current', @current_build
     write_build 'last', @last_build
     @last_build.notify if @last_build.respond_to? :notify
+
+    # another build waits
+    if Config.cijoe.buildallfile && File.exist?(Config.cijoe.buildallfile.to_s)
+      # clean out before new build
+      FileUtils.rm(Config.cijoe.buildallfile.to_s)
+      build
+    end
   end
 
-  # run the build but make sure only
-  # one is running at a time
+  # run the build but make sure only one is running
+  # at a time (if new one comes in we will park it)
   def build
-    return if building?
+    if building?
+      # only if switched on to build all incoming requests
+      if Config.cijoe.buildallfile
+        # and there is no previous request
+        return if File.exist?(Config.cijoe.buildallfile.to_s)
+        # we will mark awaiting builds
+        FileUtils.touch(Config.cijoe.buildallfile.to_s)
+      end
+      # leave anyway because a current build runs
+      return
+    end
     @current_build = Build.new(@user, @project)
     write_build 'current', @current_build
     Thread.new { build! }
@@ -162,8 +185,8 @@ class CIJoe
         else
           {}
         end
-      env = data.collect { |k, v| %(#{k}=#{v.inspect}) }.join(" ")
-      `#{env} sh #{file}`
+      data.each{ |k, v| ENV[k] = v }
+      `sh #{file}`
     end
   end
 

data/lib/cijoe/version.rb

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

data/lib/cijoe/views/template.erb

@@ -19,7 +19,7 @@
             <li>
               <span class="date"><%= pretty_time(joe.current_build.started_at) if joe.current_build %></span> &raquo;
               <% if joe.current_build.sha %>
-                Building <a href="<%= joe.url %>/commits/<%= joe.current_build.sha %>"><%= joe.current_build.short_sha %></a> <small>(pid: <%= joe.pid %>)</small>
+                Building <a href="<%= joe.current_build.commit.url %>"><%= joe.current_build.short_sha %></a> <small>(pid: <%= joe.pid %>)</small>
               <% else %>
                 Build starting...
               <% end %>
@@ -30,7 +30,7 @@
           
           <% 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>
+              <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>
               <% if joe.last_build.duration %>
                 in <span class="duration"><%= joe.last_build.duration %></span> seconds.
               <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cijoe
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-04-07 00:00:00 -07:00
 default_executable: cijoe
 dependencies: 
 - !ruby/object:Gem::Dependency