sr-bobette 0.0.2 → 0.0.4

data/README.md

@@ -1,11 +1,17 @@
 # Bobette — Bob's sister
 
-Bobette is a Rack app that, when `POST`-ed a [GitHub-like payload][gh-payload],
-builds your code using [Bob][].
+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][].
 
-You probably don't care about this, though. I am just experimenting
-with some ideas for [Integrity][].
+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.
 
-[Integrity]: http://github.com/integrity/integrity
+## Acknowledgement
+
+Thanks a lot to [Tim Carey-Smith](http://github.com/halorgium) for
+all his very useful feedbacks.
+
+[Rack]: http://rack.rubyforge.org
 [Bob]: http://github.com/integrity/bob
-[gh-payload]: http://github.com/guides/post-receive-hooks
+[Integrity]: http://github.com/integrity/integrity

data/lib/bobette.rb

@@ -13,11 +13,13 @@ module Bobette
     end
 
     def call(env)
-      payload = env["bobette.payload"]
-      commits = payload["commits"].collect { |c| c["id"] }
-      @buildable.from(payload).build(commits)
+      payload   = env["bobette.payload"]
 
-      Rack::Response.new("OK", 200).finish
+      @buildable.call(payload).each { |buildable|
+        buildable.build if buildable.respond_to?(:build)
+      }
+
+      [200, {"Content-Type" => "text/plain"}, ["OK"]]
     end
   end
 end

data/lib/bobette/github.rb

@@ -10,21 +10,24 @@ module Bobette
     def call(env)
       payload = Rack::Request.new(env).POST["payload"] || ""
       payload = JSON.parse(payload)
-      payload["kind"]   = "git"
-      payload["uri"]    = uri(payload.delete("repository")["url"]).to_s
+      payload["scm"]    = "git"
+      payload["uri"]    = uri(payload.delete("repository"))
       payload["branch"] = payload.delete("ref").split("/").last
       if (head = payload.delete("after")) && @head.call
         payload["commits"] = [{"id" => head}]
       end
-      env["bobette.payload"] = payload
 
-      @app.call(env)
+      @app.call(env.update("bobette.payload" => payload))
     rescue JSON::JSONError
       Rack::Response.new("Unparsable payload", 400).finish
     end
 
-    def uri(url)
-      URI(url).tap { |u| u.scheme = "git" }
+    def uri(repository)
+      if repository["private"]
+        "git@github.com:#{URI(repository["url"]).path[1..-1]}"
+      else
+        URI(repository["url"]).tap { |u| u.scheme = "git" }.to_s
+      end
     end
   end
 end

data/test/bobette_github_test.rb

@@ -16,37 +16,48 @@ class BobetteGitHubTest < Bobette::TestCase
   end
 
   def setup
+    super
     $head = false
   end
 
-  def github_payload(repo, commits=[], branch="master")
+  def payload(repo, commits=[], is_private=false, branch="master")
     { "ref"        => "refs/heads/#{branch}",
       "after"      => commits.last["id"],
       "commits"    => commits,
-      "repository" => {"url" => "http://github.com/#{repo}"} }
+      "repository" => {"url"     => "http://github.com/#{repo}",
+                       "private" => is_private } }
   end
 
   def test_transform_payload
     commits = %w(b926de8 737bf26 8ba250e 78bb2de).map { |c| {"id" => c} }
 
-    post("/", :payload => github_payload("integrity/bob", commits).to_json) { |response|
-      assert response.ok?
+    post("/", :payload =>
+         payload("integrity/bob", commits).to_json) { |response|
 
+      assert response.ok?
       assert_equal(
         { "uri"     => "git://github.com/integrity/bob",
-          "kind"    => "git",
+          "scm"     => "git",
           "branch"  => "master",
           "commits" => commits }, JSON.parse(response.body))
     }
+
+    post("/", :payload =>
+         payload("integrity/bob", commits, true).to_json) { |response|
+
+      assert response.ok?
+      assert_equal "git@github.com:integrity/bob", JSON.parse(response.body)["uri"]
+    }
   end
 
   def test_head_commit
     $head = true
     commits = %w(b926de8 737bf26 8ba250e 78bb2de).map { |c| {"id" => c} }
 
-    post("/", :payload => github_payload("integrity/bob", commits).to_json) { |response|
-      assert response.ok?
+    post("/", :payload =>
+         payload("integrity/bob", commits).to_json) { |response|
 
+      assert response.ok?
       assert_equal [commits.last], JSON.parse(response.body)["commits"]
     }
   end

data/test/bobette_test.rb

@@ -4,13 +4,19 @@ class BobetteTest < Bobette::TestCase
   def app
     @app ||= Rack::Builder.new {
       use Rack::Lint
-      run Bobette.new(TestHelper::BuildableStub)
+      run Bobette.new(BuildableStub)
     }
   end
 
+  def payload(repo, branch="master")
+    { "branch"  => branch,
+      "commits" => repo.commits.map { |c| {"id" => c[:identifier]} },
+      "uri"     => repo.path,
+      "scm"     => "git" }
+  end
+
   def setup
-    Bob.logger = Logger.new("/dev/null")
-    Bob.directory = "/tmp/bobette-builds"
+    super
 
     @repo = GitRepo.new(:my_test_project)
     @repo.create
@@ -30,10 +36,6 @@ class BobetteTest < Bobette::TestCase
     }
   end
 
-  def teardown
-    FileUtils.rm_rf(Bob.directory)
-  end
-
   def test_valid_payload
     assert post("/", {}, "bobette.payload" => payload(@repo)).ok?
 
@@ -52,4 +54,14 @@ class BobetteTest < Bobette::TestCase
     assert_raise(NoMethodError) { assert post("/") }
     assert_raise(NoMethodError) { post("/", {}, "bobette.payload" => "</3") }
   end
+
+  def test_no_buildable
+    BuildableStub.no_buildable = true
+
+    payload = payload(@repo).update("branch" => "unknown")
+
+    post("/", {}, "bobette.payload" => payload) { |response|
+      assert_equal 200, response.status
+    }
+  end
 end

data/test/helper.rb

@@ -9,8 +9,8 @@ begin
 rescue LoadError
 end
 
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib"),
+  File.expand_path(File.dirname(__FILE__))
 
 require "bobette"
 
@@ -24,21 +24,20 @@ require "helper/buildable_stub"
 
 class Bobette::TestCase < Test::Unit::TestCase
   include Rack::Test::Methods
-  include TestHelper
   include Bob::Test
+  include Bobette::TestHelper
 
-  def app
-    @app ||= Rack::Builder.new {
-      use Rack::Lint
-      run Bobette.new(TestHelper::BuildableStub)
-    }
+  def setup
+    Bob.logger    = Logger.new("/dev/null")
+    Bob.directory = File.dirname(__FILE__) + "/../tmp"
+
+    FileUtils.mkdir(Bob.directory)
+
+    BuildableStub.no_buildable = false
   end
 
-  def payload(repo, branch="master")
-    { "branch"  => branch,
-      "commits" => repo.commits.map { |c| {"id" => c[:identifier]} },
-      "uri"     => repo.path,
-      "kind"    => "git" }
+  def teardown
+    FileUtils.rm_rf(Bob.directory)
   end
 end
 

data/test/helper/buildable_stub.rb

@@ -1,12 +1,20 @@
-module TestHelper
+module Bobette::TestHelper
   class BuildableStub < Bob::Test::BuildableStub
-    def self.from(payload)
-      kind         = payload["kind"]
+    class << self
+      attr_accessor :no_buildable
+    end
+
+    def self.call(payload)
+      return [] if no_buildable
+
+      scm          = payload["scm"]
       uri          = payload["uri"]
       branch       = payload["branch"]
       build_script = "./test"
 
-      new(kind, uri, branch, build_script)
+      payload["commits"].map { |commit|
+        new(scm, uri, branch, commit["id"], build_script)
+      }
     end
 
     def start_building(commit_id, commit_info)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sr-bobette
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bob-the-builder
+  name: bob
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -63,16 +63,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: sr-bob-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: Bob's sister
 email: info@integrityapp.com
 executables: []
@@ -113,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: integrity
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2