bobette 0.0.3 → 0.0.5

data/Rakefile

@@ -2,6 +2,7 @@ require "rake/testtask"
 
 Rake::TestTask.new(:default) do |t|
   t.test_files = FileList["test/*_test.rb"]
+  t.libs << "test"
 end
 
 begin

data/bobette.gemspec

@@ -0,0 +1,35 @@
+Gem::Specification.new do |s|
+  s.name    = "bobette"
+  s.version = "0.0.5"
+  s.date    = "2009-10-10"
+
+  s.summary     = "Bob's sister"
+  s.description = "Bob's sister"
+
+  s.homepage    = "http://integrityapp.com"
+
+  s.authors = ["Nicolás Sanguinetti", "Simon Rozet"]
+  s.email   = "info@integrityapp.com"
+
+  s.require_paths     = ["lib"]
+  s.rubyforge_project = "integrity"
+  s.has_rdoc          = false
+  s.rubygems_version  = "1.3.1"
+
+  s.add_dependency "rack"
+
+  s.files = %w[
+LICENSE
+README.md
+Rakefile
+bobette.gemspec
+lib/bobette.rb
+lib/bobette/github.rb
+test/bobette_github_test.rb
+test/bobette_test.rb
+test/deps.rip
+test/helper.rb
+test/helper/builder_stub.rb
+test/helper/github_payload.js
+]
+end

data/lib/bobette/github.rb

@@ -10,13 +10,15 @@ module Bobette
     def call(env)
       payload = Rack::Request.new(env).POST["payload"] || ""
       payload = JSON.parse(payload)
+      payload.delete("before")
       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}]
+        payload["commits"] = [head]
+      else
+        payload["commits"] = payload.delete("commits").collect { |c| c["id"] }
       end
-
       @app.call(env.update("bobette.payload" => payload))
     rescue JSON::JSONError
       Rack::Response.new("Unparsable payload", 400).finish

data/lib/bobette.rb

@@ -1,28 +1,16 @@
-require "bob"
-
 module Bobette
-  def self.new(buildable)
-    App.new(buildable)
+  def self.new(builder)
+    App.new(builder)
   end
 
   class App
-    attr_reader :buildable
-
-    def initialize(buildable)
-      @buildable = buildable
+    def initialize(builder)
+      @builder = builder
     end
 
     def call(env)
-      payload   = env["bobette.payload"]
-      commits   = payload["commits"].collect { |c| c["id"] }
-      buildable = @buildable.call(payload)
-
-      if buildable.respond_to?(:build)
-        buildable.build(commits)
-        [200, {"Content-Type" => "text/plain"}, ["OK"]]
-      else
-        [412, {"Content-Type" => "text/plain"}, ["Precondition Failed"]]
-      end
+      @builder.call(env["bobette.payload"]).each { |b| b.build }
+      [200, {"Content-Type" => "text/plain"}, ["OK"]]
     end
   end
 end

data/test/bobette_github_test.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + "/helper"
-
+require "helper"
 require "bobette/github"
 
 class BobetteGitHubTest < Bobette::TestCase
@@ -16,48 +15,40 @@ class BobetteGitHubTest < Bobette::TestCase
   end
 
   def setup
+    super
     $head = false
-  end
-
-  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}",
-                       "private" => is_private } }
+    @payload = File.read("test/helper/github_payload.js")
   end
 
   def test_transform_payload
-    commits = %w(b926de8 737bf26 8ba250e 78bb2de).map { |c| {"id" => c} }
-
-    post("/", :payload =>
-         payload("integrity/bob", commits).to_json) { |response|
+    commits = JSON.parse(@payload)["commits"].collect {|c| c["id"]}
 
+    post("/", :payload => @payload) { |response|
       assert response.ok?
       assert_equal(
-        { "uri"     => "git://github.com/integrity/bob",
+        { "uri"     => "git://github.com/sr/bob",
           "scm"     => "git",
           "branch"  => "master",
           "commits" => commits }, JSON.parse(response.body))
     }
+  end
 
-    post("/", :payload =>
-         payload("integrity/bob", commits, true).to_json) { |response|
+  def test_transform_payload_private
+    payload = JSON.parse(@payload)
+    payload["repository"]["private"] = true
 
+    post("/", :payload => payload.to_json) { |response|
       assert response.ok?
-      assert_equal "git@github.com:integrity/bob", JSON.parse(response.body)["uri"]
+      assert_equal "git@github.com:sr/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 =>
-         payload("integrity/bob", commits).to_json) { |response|
-
+    post("/", :payload => @payload) { |response|
       assert response.ok?
-      assert_equal [commits.last], JSON.parse(response.body)["commits"]
+      assert_equal ["b2f5af7a7cd70e69d1145a6b4ddbf87df22bd343"],
+        JSON.parse(response.body)["commits"]
     }
   end
 

data/test/bobette_test.rb

@@ -1,74 +1,63 @@
-require File.dirname(__FILE__) + "/helper"
+require "helper"
 
 class BobetteTest < Bobette::TestCase
   def app
     @app ||= Rack::Builder.new {
       use Rack::Lint
-      run Bobette.new(BuildableStub)
+      run Bobette.new(BuilderStub)
     }
   end
 
-  def payload(repo, branch="master")
-    { "branch"  => branch,
-      "commits" => repo.commits.map { |c| {"id" => c[:identifier]} },
-      "uri"     => repo.path,
-      "scm"     => "git" }
+  def payload(repo)
+    { "branch"  => repo.branch,
+      "commits" => repo.commits.collect { |c| c["identifier"] },
+      "uri"     => repo.uri.to_s,
+      "scm"     => repo.scm }
   end
 
   def setup
-    Bob.logger = Logger.new("/dev/null")
-    Bob.directory = "/tmp/bobette-builds"
+    super
 
-    BuildableStub.no_buildable = false
-
-    @repo = GitRepo.new(:my_test_project)
+    @repo = GitRepo.new("my_test_project")
     @repo.create
-    3.times { |i|
-      i.odd? ? @repo.add_successful_commit : @repo.add_failing_commit
-    }
+    3.times{|i|i.odd? ? @repo.add_successful_commit : @repo.add_failing_commit}
 
-    @metadata = {}
-    @builds   = {}
+    @commits = {}
+    @builds  = {}
 
-    Beacon.watch(:start) { |commit_id, commit_info|
-      @metadata[commit_id] = commit_info
+    Beacon.watch(:start) { |commit|
+      @id = commit["identifier"]
+      @commits[@id] = commit
     }
 
-    Beacon.watch(:finish) { |commit_id, status, output|
-      @builds[commit_id] = [status ? :successful : :failed, output]
+    Beacon.watch(:finish) { |status, output|
+      @builds[@id] = [status ? :successful : :failed, output]
     }
   end
 
-  def teardown
-    FileUtils.rm_rf(Bob.directory)
-  end
-
   def test_valid_payload
     assert post("/", {}, "bobette.payload" => payload(@repo)).ok?
 
-    assert_equal 4, @metadata.count
     assert_equal 4, @builds.count
+    assert_equal 4, @commits.count
 
     commit = @repo.head
 
     assert_equal :failed, @builds[commit].first
     assert_equal "Running tests...\n", @builds[commit].last
-    assert_equal "This commit will fail", @metadata[commit][:message]
+    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"]
   end
 
   def test_invalid_payload
-    # TODO
     assert_raise(NoMethodError) { assert post("/") }
     assert_raise(NoMethodError) { post("/", {}, "bobette.payload" => "</3") }
   end
 
   def test_no_buildable
-    BuildableStub.no_buildable = true
-
+    BuilderStub.no_buildable = true
     payload = payload(@repo).update("branch" => "unknown")
-
-    post("/", {}, "bobette.payload" => payload) { |response|
-      assert_equal 412, response.status
-    }
+    post("/", {}, "bobette.payload" => payload) { |r| r.ok? }
   end
 end

data/test/deps.rip

@@ -0,0 +1,6 @@
+addressable 2.1.0
+beacon 0.1
+rack 1.0.0
+json 1.1.7
+rack-test 0.5.0
+git://github.com/integrity/bob 8a477f2

data/test/helper/builder_stub.rb

@@ -0,0 +1,23 @@
+module Bobette::TestHelper
+  class BuilderStub < Bob::Test::BuilderStub
+    class << self
+      attr_accessor :no_buildable
+    end
+
+    def self.call(payload)
+      return [] if no_buildable
+
+      payload.delete("commits").collect { |c|
+        new(payload.merge("command" => "./test", "commit" => c))
+      }
+    end
+
+    def started(commit_info)
+      Beacon.fire(:start, commit_info)
+    end
+
+    def completed(status, output)
+      Beacon.fire(:finish, status, output)
+    end
+  end
+end

data/test/helper/github_payload.js

@@ -0,0 +1,54 @@
+{
+  "after": "b2f5af7a7cd70e69d1145a6b4ddbf87df22bd343",
+  "before": "b260e5b541b87dd95768a4d0211be2dc66a26e1a",
+  "commits": [
+    {
+      "added": [],
+      "author": {
+        "email": "simon@rozet.name",
+        "name": "Simon Rozet"
+      },
+      "id": "c6dd001c1a95763b2ea62201b73005a6b86c048e",
+      "message": "Test SCM#dir_for instead of private #path method",
+      "modified": [
+        "test\/git_test.rb",
+        "test\/svn_test.rb"
+      ],
+      "removed": [],
+      "timestamp": "2009-09-30T06:10:44-07:00",
+      "url": "http:\/\/github.com\/sr\/bob\/commit\/c6dd001c1a95763b2ea62201b73005a6b86c048e"
+    },
+    {
+      "added": [
+        "deps.rip",
+        "hack.rip"
+      ],
+      "author": {
+        "email": "simon@rozet.name",
+        "name": "Simon Rozet"
+      },
+      "id": "b2f5af7a7cd70e69d1145a6b4ddbf87df22bd343",
+      "message": "Add rip files",
+      "modified": [],
+      "removed": [],
+      "timestamp": "2009-09-30T06:16:12-07:00",
+      "url": "http:\/\/github.com\/sr\/bob\/commit\/b2f5af7a7cd70e69d1145a6b4ddbf87df22bd343"
+    }
+  ],
+  "ref": "refs\/heads\/master",
+  "repository": {
+    "description": "Bob the Builder will build your codes",
+    "fork": true,
+    "forks": 0,
+    "homepage": "http:\/\/integrityapp.com",
+    "name": "bob",
+    "open_issues": 0,
+    "owner": {
+      "email": "simon@rozet.name",
+      "name": "sr"
+    },
+    "private": false,
+    "url": "http:\/\/github.com\/sr\/bob",
+    "watchers": 3
+  }
+}

data/test/helper.rb

@@ -9,9 +9,6 @@ begin
 rescue LoadError
 end
 
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib"),
-  File.expand_path(File.dirname(__FILE__))
-
 require "bobette"
 
 class Test::Unit::TestSuite
@@ -20,11 +17,24 @@ class Test::Unit::TestSuite
   end
 end
 
-require "helper/buildable_stub"
+require "helper/builder_stub"
 
 class Bobette::TestCase < Test::Unit::TestCase
   include Rack::Test::Methods
   include Bob::Test
   include Bobette::TestHelper
+
+  def setup
+    Bob.logger    = Logger.new("/dev/null")
+    Bob.directory = File.dirname(__FILE__) + "/../tmp"
+
+    FileUtils.mkdir(Bob.directory)
+
+    BuilderStub.no_buildable = false
+  end
+
+  def teardown
+    FileUtils.rm_rf(Bob.directory)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bobette
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,19 +10,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-02 00:00:00 +02:00
+date: 2009-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bob
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rack
   type: :runtime
@@ -33,46 +23,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: beacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: 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: []
@@ -85,13 +35,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- examples/integrity.ru
+- bobette.gemspec
 - lib/bobette.rb
 - lib/bobette/github.rb
 - test/bobette_github_test.rb
 - test/bobette_test.rb
+- test/deps.rip
 - test/helper.rb
-- test/helper/buildable_stub.rb
+- test/helper/builder_stub.rb
+- test/helper/github_payload.js
 has_rdoc: true
 homepage: http://integrityapp.com
 licenses: []

data/examples/integrity.ru

@@ -1,25 +0,0 @@
-require "integrity"
-require "bobette"
-require "bobette/github"
-
-class Integrity::Project
-  def self.new(payload)
-    # Auto-create!
-    first_or_create(:kind => payload["kind"],
-      :uri => payload["uri"],
-      :branch => payload["master"]
-    )
-  end
-end
-
-map "/github" do
-  use Bobette::GitHub
-  run Bobette.new(Integrity::Project)
-end
-
-Integrity.new(:database_uri => "sqlite3:integrity.db")
-DataMapper.auto_migrate!
-
-map "/" do
-  run Integrity::App
-end

data/test/helper/buildable_stub.rb

@@ -1,26 +0,0 @@
-module Bobette::TestHelper
-  class BuildableStub < Bob::Test::BuildableStub
-    class << self
-      attr_accessor :no_buildable
-    end
-
-    def self.call(payload)
-      return nil if no_buildable
-
-      scm          = payload["scm"]
-      uri          = payload["uri"]
-      branch       = payload["branch"]
-      build_script = "./test"
-
-      new(scm, uri, branch, build_script)
-    end
-
-    def start_building(commit_id, commit_info)
-      Beacon.fire(:start, commit_id, commit_info)
-    end
-
-    def finish_building(commit_id, status, output)
-      Beacon.fire(:finish, commit_id, status, output)
-    end
-  end
-end