cijoe 0.8.0 → 0.8.1

data/lib/cijoe.rb

@@ -137,7 +137,7 @@ class CIJoe
       output = pipe.read
     end
 
-    Process.waitpid(build.pid)
+    Process.waitpid(build.pid, 1)
     status = $?.exitstatus.to_i
     puts "#{Time.now.to_i}: Built #{build.short_sha}: status=#{status}"
 

data/lib/cijoe/campfire.rb

@@ -15,8 +15,7 @@ class CIJoe
         puts "Can't load Campfire notifier."
         puts "Please add the following to your project's .git/config:"
         puts "[campfire]"
-        puts "\tuser = your@campfire.email"
-        puts "\tpass = passw0rd"
+        puts "\ttoken = your_api_token"
         puts "\tsubdomain = whatever"
         puts "\troom = Awesomeness"
         puts "\tssl = false"
@@ -27,15 +26,14 @@ class CIJoe
       campfire_config = Config.new('campfire', @project_path)
       @config ||= {
         :subdomain => campfire_config.subdomain.to_s,
-        :user      => campfire_config.user.to_s,
-        :pass      => campfire_config.pass.to_s,
+        :token     => campfire_config.token.to_s,
         :room      => campfire_config.room.to_s,
         :ssl       => campfire_config.ssl.to_s.strip == 'true'
       }
     end
 
     def self.valid_config?
-      %w( subdomain user pass room ).all? do |key|
+      %w( subdomain token room ).all? do |key|
         !config[key.intern].empty?
       end
     end
@@ -51,8 +49,7 @@ class CIJoe
       @room ||= begin
         config = Campfire.config
         campfire = Tinder::Campfire.new(config[:subdomain],
-            :username => config[:user],
-            :password => config[:pass],
+            :token => config[:token],
             :ssl => config[:ssl] || false)
         campfire.find_room_by_name(config[:room])
       end

data/lib/cijoe/server.rb

@@ -28,7 +28,7 @@ class CIJoe
 
     post '/?' do
       payload = YAML.load(params[:payload].to_s) || {}
-      pushed_branch = payload[:ref].to_s.split('/').last
+      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
@@ -40,6 +40,17 @@ class CIJoe
       redirect request.path
     end
 
+    get '/api/json' do
+        response  = [200, {'Content-Type' => 'application/json'}]
+        response_json = erb(:json, {}, :joe => joe)
+      if params[:jsonp]
+        response << params[:jsonp] + '(' +  response_json + ')'
+      else
+        response << response_json
+      end
+      response
+    end
+
 
     helpers do
       include Rack::Utils

data/lib/cijoe/version.rb

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

data/lib/cijoe/views/json.erb

@@ -0,0 +1,8 @@
+{ "jobs": [
+<% if joe.last_build %>
+{"name":"<%= joe.project %>",
+ "url":"<%= joe.url %>",
+ "color":"<%= joe.last_build.status.to_s == "failed" ? 'red' : 'blue' %>"
+ }
+<% end %>
+]}

data/test/test_cijoe_server.rb

@@ -64,6 +64,26 @@ class TestCIJoeServer < Test::Unit::TestCase
     assert_equal current_build, app.joe.current_build
   end
 
+  def test_jsonp_should_return_plain_json_without_param
+    app.joe.last_build = build :failed
+    get "/api/json"
+    assert_equal 200, last_response.status
+    assert_equal 'application/json', last_response.content_type
+  end
+
+  def test_jsonp_should_return_jsonp_with_param
+    app.joe.last_build = build :failed
+    get "/api/json?jsonp=fooberz"
+    puts last_response.inspect
+    assert_equal 200, last_response.status
+    assert_equal 'application/json', last_response.content_type
+    assert_match /^fooberz\(/, last_response.body 
+
+  end
+
+  def test_should_not_barf_when_no_build
+  end
+
   # Create a new, fake build. All we care about is status.
 
   def build status

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cijoe
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -08:00
+date: 2011-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - lib/cijoe/public/screen.css
 - lib/cijoe/server.rb
 - lib/cijoe/version.rb
+- lib/cijoe/views/json.erb
 - lib/cijoe/views/template.erb
 - lib/cijoe.rb
 - bin/cijoe