bobette 0.0.5 → 0.0.6

data/README.md

@@ -1,17 +1,28 @@
 # Bobette — Bob's sister
 
-Bobette is a [Rack][] app that will turn the payload specified
-via the `bobette.payload` Rack env key into a buildable object
-and then builds it using [Bob][].
+Bobette is a [Rack](http://rack.rubyforge.org) app that will turn the payload
+specified in the `bobette.payload` Rack env key into a buildable object and
+then build it using [Bob](http://github.com/integrity/bob).
 
-You probably don't care about this, though; check out [Integrity][]
-for a full fledged automated CI server or the test suite if you do.
+It also provides middlewares to normalize the payload format used
+by code hosting services into a common format:
 
-## Acknowledgement
+    {"scm" => "git",
+     "uri" => "git@github.com:integrity/integrity",
+     "branch" => "master",
+     "commits" =>
+     [{"id"      => "c6dd001c1a95763b2ea62201b73005a6b86c048e",
+       "message" => "Add rip files",
+       "author"  => {"name" => "Simon Rozet", :email => "simon@rozet.name"},
+       "timestamp" => "2009-09-30T06:16:12-07:00"}]}
+
+Only [GitHub](http://github.com) is supported so fare but it's easy to add
+support for other code hosting services.
 
-Thanks a lot to [Tim Carey-Smith](http://github.com/halorgium) for
-all his very useful feedbacks.
+Checkout [Integrity](http://integrityapp.com) for a full fledged automated
+Continuous Integration server.
+
+## Acknowledgement
 
-[Rack]: http://rack.rubyforge.org
-[Bob]: http://github.com/integrity/bob
-[Integrity]: http://github.com/integrity/integrity
+Thanks a lot to [Tim Carey-Smith](http://github.com/halorgium) for his early
+feedback.

data/bobette.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "bobette"
-  s.version = "0.0.5"
-  s.date    = "2009-10-10"
+  s.version = "0.0.6"
+  s.date    = "2009-11-06"
 
   s.summary     = "Bob's sister"
   s.description = "Bob's sister"

data/lib/bobette/github.rb

@@ -15,9 +15,9 @@ module Bobette
       payload["uri"]    = uri(payload.delete("repository"))
       payload["branch"] = payload.delete("ref").split("/").last
       if (head = payload.delete("after")) && @head.call
-        payload["commits"] = [head]
+        payload["commits"] = [payload["commits"].detect{|c| c["id"] == head }]
       else
-        payload["commits"] = payload.delete("commits").collect { |c| c["id"] }
+        payload["commits"] = payload.delete("commits")
       end
       @app.call(env.update("bobette.payload" => payload))
     rescue JSON::JSONError

data/test/bobette_github_test.rb

@@ -21,15 +21,23 @@ class BobetteGitHubTest < Bobette::TestCase
   end
 
   def test_transform_payload
-    commits = JSON.parse(@payload)["commits"].collect {|c| c["id"]}
+    commits = JSON.parse(@payload)["commits"]
 
     post("/", :payload => @payload) { |response|
+      payload = JSON.parse(response.body)
+
       assert response.ok?
-      assert_equal(
-        { "uri"     => "git://github.com/sr/bob",
-          "scm"     => "git",
-          "branch"  => "master",
-          "commits" => commits }, JSON.parse(response.body))
+
+      assert_equal "git",                     payload["scm"]
+      assert_equal "git://github.com/sr/bob", payload["uri"]
+      assert_equal "master",                  payload["branch"]
+      assert_equal 2,                         payload["commits"].size
+
+      commit = payload["commits"].first
+
+      assert_equal "c6dd001c1a95763b2ea62201b73005a6b86c048e", commit["id"]
+      assert_match /instead of private #path method/, commit["message"]
+      assert_equal "2009-09-30T06:10:44-07:00", commit["timestamp"]
     }
   end
 
@@ -46,9 +54,16 @@ class BobetteGitHubTest < Bobette::TestCase
   def test_head_commit
     $head = true
     post("/", :payload => @payload) { |response|
+      payload = JSON.parse(response.body)
+
       assert response.ok?
-      assert_equal ["b2f5af7a7cd70e69d1145a6b4ddbf87df22bd343"],
-        JSON.parse(response.body)["commits"]
+      assert_equal 1, payload["commits"].size
+
+      commit = payload["commits"].first
+
+      assert_equal "b2f5af7a7cd70e69d1145a6b4ddbf87df22bd343", commit["id"]
+      assert_equal "Add rip files",             commit["message"]
+      assert_equal "2009-09-30T06:16:12-07:00", commit["timestamp"]
     }
   end
 

data/test/bobette_test.rb

@@ -10,7 +10,7 @@ class BobetteTest < Bobette::TestCase
 
   def payload(repo)
     { "branch"  => repo.branch,
-      "commits" => repo.commits.collect { |c| c["identifier"] },
+      "commits" => repo.commits,
       "uri"     => repo.uri.to_s,
       "scm"     => repo.scm }
   end
@@ -26,7 +26,7 @@ class BobetteTest < Bobette::TestCase
     @builds  = {}
 
     Beacon.watch(:start) { |commit|
-      @id = commit["identifier"]
+      @id = commit["id"]
       @commits[@id] = commit
     }
 
@@ -47,7 +47,7 @@ class BobetteTest < Bobette::TestCase
     assert_equal "Running tests...\n", @builds[commit].last
     assert_equal "This commit will fail", @commits[commit]["message"]
     assert_equal "John Doe <johndoe@example.org>", @commits[commit]["author"]
-    assert_kind_of Time, @commits[commit]["committed_at"]
+    assert_kind_of Time, @commits[commit]["timestamp"]
   end
 
   def test_invalid_payload

data/test/helper/builder_stub.rb

@@ -8,7 +8,7 @@ module Bobette::TestHelper
       return [] if no_buildable
 
       payload.delete("commits").collect { |c|
-        new(payload.merge("command" => "./test", "commit" => c))
+        new(payload.merge("command" => "./test", "commit" => c["id"]))
       }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bobette
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +02:00
+date: 2009-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: integrity
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Bob's sister