integrity-bob 0.3.0 → 0.3.1

data/Rakefile

@@ -27,7 +27,6 @@ desc "Run unit tests"
 task :test => SCMs.map { |scm| "test:#{scm}" } do
   ruby "test/bob_test.rb"
   ruby "test/test_test.rb"
-  ruby "test/engine/threaded_test.rb"
 end
 
 SCMs.each { |scm|

data/bob.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "bob"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
   s.date    = "2009-07-02"
 
   s.description = "Bob the Builder will build your code. Simple."
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.rubygems_version  = "1.3.1"
 
   s.add_dependency "addressable"
+  s.add_dependency "ninja"
 
   if s.respond_to?(:add_development_dependency)
     s.add_development_dependency "sr-mg"
@@ -31,11 +32,8 @@ README.rdoc
 Rakefile
 bob.gemspec
 lib/bob.rb
-lib/bob/buildable.rb
 lib/bob/builder.rb
-lib/bob/engine.rb
-lib/bob/engine/foreground.rb
-lib/bob/engine/threaded.rb
+lib/bob/buildable.rb
 lib/bob/scm.rb
 lib/bob/scm/abstract.rb
 lib/bob/scm/git.rb
@@ -45,9 +43,7 @@ lib/bob/test/buildable_stub.rb
 lib/bob/test/scm/abstract.rb
 lib/bob/test/scm/git.rb
 lib/bob/test/scm/svn.rb
-lib/core_ext/object.rb
 test/bob_test.rb
-test/engine/threaded_test.rb
 test/helper.rb
 test/scm/git_test.rb
 test/scm/svn_test.rb

data/lib/bob.rb

@@ -1,14 +1,14 @@
 require "fileutils"
+require "pathname"
 require "yaml"
 require "logger"
 require "time"
+require "ninja"
 require "addressable/uri"
 
 require "bob/buildable"
 require "bob/builder"
 require "bob/scm"
-require "bob/engine"
-require "core_ext/object"
 
 module Bob
   # Builds the specified <tt>buildable</tt>. This object must understand
@@ -20,14 +20,7 @@ module Bob
   # Directory where the code for the different buildables will be checked out.
   # Make sure the user running Bob is allowed to write to this directory.
   def self.directory
-    @directory || "/tmp"
-  end
-
-  # What will you use to build in background. Must respond to <tt>call</tt> and
-  # take a block which will be run "in background". The default is to run in
-  # foreground.
-  def self.engine
-    @engine || Engine::Foreground
+    Pathname(@directory || "/tmp")
   end
 
   # What to log with (must implement ruby's Logger interface). Logs to STDOUT
@@ -37,6 +30,6 @@ module Bob
   end
 
   class << self
-    attr_writer :directory, :engine, :logger
+    attr_writer :directory, :logger
   end
 end

data/lib/bob/buildable.rb

@@ -7,7 +7,7 @@ module Bob
     end
 
     # What kind of repository this buildable represents. Must
-    # return a Symbol (:git, :svn, etc.)
+    # return a String ("git", "svn", etc.)
     #
     # <b>You must implement this in the classes where you mixin this module</b>
     def scm
@@ -48,30 +48,26 @@ module Bob
       raise NotImplementedError
     end
 
-    # Callback sent when a build starts. The first argument is a
-    # string with whatever identifier is appropriate for a repository
-    # of this kind. The second is a hash with information about the
-    # commit.
-    #
-    # <tt>:author</tt>:: A string with the name/email of the committer
-    # <tt>:message</tt>:: The commit message
-    # <tt>:committed_at</tt>:: A Time object with the timestamp of the
-    #                          commit
-    #
-    # <b>You must implement this in the classes where you mixin this module</b>
-    def start_building(commit_id, commit_info)
-      raise NotImplementedError
+    # Optional callback sent when the build starts. It can be used to calculate
+    # the build duration for example.
+    def start_building
     end
 
-    # Callback sent after a build finishes. The first argument is a
-    # string with whatever identifier is appropriate for a respository
-    # of this kind. The second is a boolean which is true if the build
-    # was successful or false if it failed. And the last one is a string
-    # with the full output returned by the build process (STDOUT and
-    # STDERR interleaved)
+    # Callback sent after a build finishes. The first argument is a hash with
+    # information about the commit.
+    #
+    # <tt>identifier</tt>:: A string with the commit identifier of the
+    # commit that was built
+    # <tt>author</tt>:: A string with the name/email of the committer
+    # <tt>message</tt>:: The commit message
+    # <tt>committed_at</tt>:: A Time object with the timestamp of the commit
+    #
+    # The second argument is a boolean indicating whether the build was
+    # successful. Finally, the last one is a string with the full output
+    # returned by the build process (STDOUT and STDERR interleaved)
     #
     # <b>You must implement this in the classes where you mixin this module</b>
-    def finish_building(commit_id, build_status, build_output)
+    def finish_building(commit_info, build_status, build_output)
       raise NotImplementedError
     end
   end

data/lib/bob/builder.rb

@@ -4,6 +4,8 @@ module Bob
   class Builder
     attr_reader :buildable
 
+    include Ninja
+
     # Instantiate the Builder, passing an object that understands
     # the <tt>Buildable</tt> interface.
     def initialize(buildable)
@@ -12,28 +14,24 @@ module Bob
 
     # This is where the magic happens:
     #
-    # 1. Check out the repo to the appropriate commit.
-    # 2. Notify the buildable that the build is starting.
-    # 3. Run the build script on it in the background.
+    # 1. Notify the buildable that the build is starting.
+    # 2. Check out the repo to the appropriate commit.
+    # 3. Run the build script on it.
     # 4. Reports the build back to the buildable.
     def build
       Bob.logger.info "Building #{buildable.commit} of the #{buildable.scm} repo at #{buildable.uri}"
 
       in_background do
-        scm.with_commit(commit) {
-          buildable.start_building(commit, scm.info(commit))
-          build_status, build_output = run_build_script
-          buildable.finish_building(commit, build_status, build_output)
+        buildable.start_building if buildable.respond_to?(:start_building)
+
+        scm.with_commit(buildable.commit) { |commit_info|
+          buildable.finish_building(commit_info, *run_build_script)
         }
       end
     end
 
     private
 
-    def commit
-      @commit ||= buildable.commit == :head ? scm.head : buildable.commit
-    end
-
     def run_build_script
       build_output = nil
 
@@ -45,15 +43,11 @@ module Bob
     end
 
     def build_script
-      "(cd #{scm.directory_for(commit)} && #{buildable.build_script} 2>&1)"
+      "(cd #{scm.dir_for(buildable.commit)} && #{buildable.build_script} 2>&1)"
     end
 
     def scm
       @scm ||= SCM.new(buildable.scm, buildable.uri, buildable.branch)
     end
-
-    def in_background(&block)
-      Bob.engine.call(block)
-    end
   end
 end

data/lib/bob/scm/abstract.rb

@@ -11,23 +11,27 @@ module Bob
       # Checkout the code at the specified <tt>commit</tt> and call the
       # passed block.
       def with_commit(commit)
-        update_code(commit)
+        commit = resolve(commit)
         checkout(commit)
-        yield
+        yield info(commit)
       end
 
       # Directory where the code will be checked out for the given
       # <tt>commit</tt>.
-      def directory_for(commit)
-        File.join(Bob.directory, "#{path}-#{commit}")
+      def dir_for(commit)
+        commit = resolve(commit)
+        Bob.directory.join(path, "-", commit)
       end
 
+      protected
+
       # Get some information about the specified <tt>commit</tt>.
       # Returns a hash with:
       #
-      # [<tt>:author</tt>]       Commit author's name and email
-      # [<tt>:message</tt>]      Commit message
-      # [<tt>:committed_at</tt>] Commit date (as a <tt>Time</tt> object)
+      # [<tt>identifier</tt>]   Commit identifier
+      # [<tt>author</tt>]       Commit author's name and email
+      # [<tt>message</tt>]      Commit message
+      # [<tt>committed_at</tt>] Commit date (as a <tt>Time</tt> object)
       def info(commit)
         raise NotImplementedError
       end
@@ -38,8 +42,6 @@ module Bob
         raise NotImplementedError
       end
 
-      protected
-
       def run(command, directory=nil)
         command = "(#{directory ? "cd #{directory} && " : ""}#{command} &>/dev/null)"
         Bob.logger.debug(command)
@@ -52,6 +54,12 @@ module Bob
           gsub(/[ \-]+/i, '-').     # No more than one of the separator in a row.
           gsub(/^\-|\-$/i, '')      # Remove leading/trailing separator.
       end
+
+      private
+
+      def resolve(commit)
+        commit == :head ? head : commit
+      end
     end
   end
 end

data/lib/bob/scm/git.rb

@@ -1,19 +1,16 @@
 module Bob
   module SCM
     class Git < Abstract
-      def initialize(uri, branch)
-        super
-
-        unless File.directory?(File.join(Bob.directory, "cache"))
-          FileUtils.mkdir(File.join(Bob.directory, "cache"))
-        end
-      end
+      protected
 
       def info(commit)
-        format = %Q(---%n:author: %an <%ae>%n:message: >-%n  %s%n:committed_at: %ci%n)
-        YAML.load(`cd #{directory_for(commit)} && git show -s --pretty=format:"#{format}" #{commit}`).tap { |info|
-          info[:committed_at] = Time.parse(info[:committed_at])
-        }
+        format = "---%nidentifier: %H%nauthor: %an \
+          <%ae>%nmessage: >-%n  %s%ncommitted_at: %ci%n"
+
+        dump = YAML.load(`cd #{dir_for(commit)} && git show -s \
+          --pretty=format:"#{format}" #{commit}`)
+
+        dump.update("committed_at" => Time.parse(dump["committed_at"]))
       end
 
       def head
@@ -22,30 +19,15 @@ module Bob
 
       private
 
-      def update_code(commit)
-        unless File.directory?("#{cache_directory}/.git")
-          run "git clone -n #{uri} #{cache_directory}"
-        end
-
-        run "git fetch origin", cache_directory
-        run "git checkout origin/#{branch}", cache_directory
-      end
-
       def checkout(commit)
-        unless File.directory?("#{directory_for(commit)}/.git")
-          run "git clone -ns #{cache_directory} #{directory_for(commit)}"
-        end
-
-        run "git fetch origin", directory_for(commit)
-
-        # First checkout the branch just in case the commit_id
-        # turns out to be HEAD or other non-sha identifier
-        run "git checkout origin/#{branch}", directory_for(commit)
-        run "git reset --hard #{commit}", directory_for(commit)
+        run "git clone #{uri} #{dir_for(commit)}" unless cloned?(commit)
+        run "git fetch origin", dir_for(commit)
+        run "git checkout origin/#{branch}", dir_for(commit)
+        run "git reset --hard #{commit}", dir_for(commit)
       end
 
-      def cache_directory
-        File.join(Bob.directory, "cache", path)
+      def cloned?(commit)
+        dir_for(commit).join(".git").directory?
       end
     end
   end

data/lib/bob/scm/svn.rb

@@ -1,38 +1,36 @@
-require "bob/scm/abstract"
-
 module Bob
   module SCM
     class Svn < Abstract
+      protected
+
       def info(revision)
         dump = `svn log --non-interactive --revision #{revision} #{uri}`.split("\n")
         meta = dump[1].split(" | ")
 
-        { :message => dump[3],
-          :author  => meta[1],
-          :committed_at => Time.parse(meta[2]) }
+        { "identifier" => revision,
+          "message" => dump[3],
+          "author"  => meta[1],
+          "committed_at" => Time.parse(meta[2]) }
       end
 
+
       def head
         `svn info #{uri}`.split("\n").detect { |l| l =~ /^Revision: (\d+)/ }
         $1.to_s
       end
 
-    private
-
-      def update_code(commit)
-        initial_checkout(commit) unless checked_out?(commit)
-      end
+      private
 
       def checkout(revision)
-        run "svn up -q -r#{revision}", directory_for(revision)
-      end
+        unless checked_out?(revision)
+          run "svn co -q #{uri} #{dir_for(revision)}"
+        end
 
-      def initial_checkout(revision=nil)
-        run "svn co -q #{uri} #{directory_for(revision)}"
+        run "svn up -q -r#{revision}", dir_for(revision)
       end
 
       def checked_out?(commit)
-        File.directory?(directory_for(commit) + "/.svn")
+        dir_for(commit).join(".svn").directory?
       end
     end
   end

data/lib/bob/test/buildable_stub.rb

@@ -1,38 +1,40 @@
 module Bob
   module Test
-    BuildableStub = Struct.new(:scm, :uri, :branch, :commit, :build_script) do
+    class BuildableStub
       include Bob::Buildable
 
       def self.for(repo, commit)
-        scm = (Bob::Test::GitRepo === repo) ? :git : :svn
+        scm = (Bob::Test::GitRepo === repo) ? "git" : "svn"
         uri =
-          if scm == :git
+          if scm == "git"
             repo.path
           else
             "file://#{SvnRepo.server_root}/#{repo.name}"
           end
-        # move to repo
-        branch = (scm == :git) ? "master" : ""
+        # TODO: move onto repo object?
+        branch = (scm == "git") ? "master" : ""
         build_script = "./test"
 
         new(scm, uri, branch, commit, build_script)
       end
 
-      attr_reader :repo, :status, :output, :commit_info
+      attr_reader :scm, :uri, :branch, :commit, :build_script,
+        :repo, :status, :output, :commit_info
 
-      def initialize(*args)
-        super
+      def initialize(scm, uri, branch, commit, build_script)
+        @scm = scm.to_s
+        @uri = uri.to_s
+        @branch = branch
+        @commit = commit
+        @build_script = build_script
 
         @status = nil
         @output = ""
         @commit_info = {}
       end
 
-      def start_building(commit_id, commit_info)
+      def finish_building(commit_info, status, output)
         @commit_info = commit_info
-      end
-
-      def finish_building(commit_id, status, output)
         @status = status ? :successful : :failed
         @output = output
       end

data/lib/bob/test/scm/abstract.rb

@@ -7,10 +7,6 @@ module Bob::Test
       @path   = File.join(base_dir, @name.to_s)
     end
 
-    def destroy
-      FileUtils.rm_r path if File.directory?(path)
-    end
-
     def add_commit(message, &action)
       Dir.chdir(path) do
         yield action
@@ -39,7 +35,7 @@ module Bob::Test
     end
 
     def head
-      commits.last[:identifier]
+      commits.last["identifier"]
     end
 
     protected

data/lib/bob/test/scm/git.rb

@@ -19,8 +19,8 @@ module Bob::Test
       Dir.chdir(path) do
         commits = `git log --pretty=oneline`.collect { |l| l.split(" ").first }
         commits.inject([]) do |commits, sha1|
-          format  = "---%n:message: >-%n  %s%n:timestamp: %ci%n" +
-            ":identifier: %H%n:author: %n :name: %an%n :email: %ae%n"
+          format  = "---%nmessage: >-%n  %s%ntimestamp: %ci%n" +
+            "identifier: %H%nauthor: %n name: %an%n email: %ae%n"
           commits << YAML.load(`git show -s --pretty=format:"#{format}" #{sha1}`)
         end.reverse
       end

data/lib/bob/test/scm/svn.rb

@@ -4,7 +4,7 @@ require "hpricot"
 module Bob::Test
   class SvnRepo < AbstractSCMRepo
     def self.server_root
-      @root ||= File.join(Bob.directory, "svn")
+      @root ||= Bob.directory.join("svn")
     end
 
     attr_reader :remote
@@ -12,8 +12,8 @@ module Bob::Test
     def initialize(name, base_dir=Bob.directory)
       super
 
-      @path   = File.join(base_dir, "svn-#{name}")
-      @remote = File.join(SvnRepo.server_root, name.to_s)
+      @path   = base_dir.join("svn-#{name}")
+      @remote = SvnRepo.server_root.join(name.to_s)
     end
 
     def create
@@ -27,19 +27,14 @@ module Bob::Test
       end
     end
 
-    def destroy
-      FileUtils.rm_r(remote) if File.directory?(remote)
-      super
-    end
-
     def commits
       Dir.chdir(path) do
         doc = Hpricot::XML(`svn log --xml`)
 
         (doc/:log/:logentry).inject([]) { |commits, commit|
-          commits << { :identifier => commit["revision"],
-            :message      => commit.at("msg").inner_html,
-            :committed_at => Time.parse(commit.at("date").inner_html) }
+          commits << { "identifier" => commit["revision"],
+            "message"      => commit.at("msg").inner_html,
+            "committed_at" => Time.parse(commit.at("date").inner_html) }
         }.reverse
       end
     end
@@ -58,7 +53,7 @@ module Bob::Test
 
     private
       def create_remote
-        FileUtils.mkdir(SvnRepo.server_root)
+        SvnRepo.server_root.mkdir
 
         run "svnadmin create #{remote}"
 

data/test/bob_test.rb

@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + "/helper"
 class BobTest < Test::Unit::TestCase
   test "directory" do
     Bob.directory = "/foo/bar"
-    assert_equal "/foo/bar", Bob.directory
+    assert_equal "/foo/bar", Bob.directory.to_s
+    assert_instance_of Pathname, Bob.directory
   end
 
   test "logger" do
@@ -12,11 +13,4 @@ class BobTest < Test::Unit::TestCase
 
     assert_same logger, Bob.logger
   end
-
-  test "engine" do
-    engine = Object.new
-    Bob.engine = engine
-
-    assert_same engine, Bob.engine
-  end
 end

data/test/helper.rb

@@ -22,10 +22,9 @@ class Test::Unit::TestCase
 
   def setup
     Bob.logger = Logger.new("/dev/null")
-    Bob.engine = Bob::Engine::Foreground
-    Bob.directory = File.expand_path(File.dirname(__FILE__) + "/../tmp")
+    Bob.directory = Pathname(__FILE__).dirname.join("..", "tmp").expand_path
 
-    FileUtils.rm_rf(Bob.directory) if File.directory?(Bob.directory)
-    FileUtils.mkdir_p(Bob.directory)
+    Bob.directory.rmtree if Bob.directory.directory?
+    Bob.directory.mkdir
   end
 end

data/test/scm/git_test.rb

@@ -24,29 +24,31 @@ class BobGitTest < Test::Unit::TestCase
   test "with a successful build" do
     repo.add_successful_commit
 
-    commit_id = repo.commits.last[:identifier]
+    commit_id = repo.commits.last["identifier"]
 
     buildable = BuildableStub.for(@repo, commit_id)
     buildable.build
 
     assert_equal :successful,          buildable.status
     assert_equal "Running tests...\n", buildable.output
-    assert_equal "This commit will work", buildable.commit_info[:message]
-    assert buildable.commit_info[:committed_at].is_a?(Time)
+    assert_equal "This commit will work", buildable.commit_info["message"]
+    assert_equal commit_id,               buildable.commit_info["identifier"]
+    assert buildable.commit_info["committed_at"].is_a?(Time)
   end
 
   test "with a failed build" do
     repo.add_failing_commit
 
-    commit_id = repo.commits.last[:identifier]
+    commit_id = repo.commits.last["identifier"]
     buildable = BuildableStub.for(@repo, commit_id)
 
     buildable.build
 
     assert_equal :failed,              buildable.status
     assert_equal "Running tests...\n", buildable.output
-    assert_equal "This commit will fail", buildable.commit_info[:message]
-    assert buildable.commit_info[:committed_at].is_a?(Time)
+    assert_equal "This commit will fail", buildable.commit_info["message"]
+    assert_equal commit_id,               buildable.commit_info["identifier"]
+    assert buildable.commit_info["committed_at"].is_a?(Time)
   end
 
   test "can build the head of a repository" do
@@ -59,5 +61,6 @@ class BobGitTest < Test::Unit::TestCase
 
     assert_equal :successful,          buildable.status
     assert_equal "Running tests...\n", buildable.output
+    assert_equal repo.head,            buildable.commit_info["identifier"]
   end
 end

data/test/scm/svn_test.rb

@@ -34,8 +34,9 @@ class BobSvnTest < Test::Unit::TestCase
 
     assert_equal :successful,          buildable.status
     assert_equal "Running tests...\n", buildable.output
-    assert_equal "This commit will work", buildable.commit_info[:message]
-    assert buildable.commit_info[:committed_at].is_a?(Time)
+    assert_equal "This commit will work", buildable.commit_info["message"]
+    assert_equal "2",                     buildable.commit_info["identifier"]
+    assert buildable.commit_info["committed_at"].is_a?(Time)
   end
 
   test "with a failed build" do
@@ -46,8 +47,9 @@ class BobSvnTest < Test::Unit::TestCase
 
     assert_equal :failed,              buildable.status
     assert_equal "Running tests...\n", buildable.output
-    assert_equal "This commit will fail", buildable.commit_info[:message]
-    assert buildable.commit_info[:committed_at].is_a?(Time)
+    assert_equal "This commit will fail", buildable.commit_info["message"]
+    assert_equal "2",                     buildable.commit_info["identifier"]
+    assert buildable.commit_info["committed_at"].is_a?(Time)
   end
 
   test "can build the head of a repository" do
@@ -59,5 +61,6 @@ class BobSvnTest < Test::Unit::TestCase
 
     assert_equal :successful,          buildable.status
     assert_equal "Running tests...\n", buildable.output
+    assert_equal repo.head,            buildable.commit_info["identifier"]
   end
 end

data/test/test_test.rb

@@ -2,28 +2,27 @@ require File.dirname(__FILE__) + "/helper"
 
 class BobTestTest < Test::Unit::TestCase
   def assert_scm_repo(repo)
-    repo.destroy
     repo.create
 
     assert_equal 1, repo.commits.size
-    assert_equal "First commit", repo.commits.first[:message]
+    assert_equal "First commit", repo.commits.first["message"]
 
     repo.add_failing_commit
     assert_equal 2, repo.commits.size
-    assert_equal "This commit will fail", repo.commits.last[:message]
-    assert_equal repo.commits.last[:identifier], repo.head
+    assert_equal "This commit will fail", repo.commits.last["message"]
+    assert_equal repo.commits.last["identifier"], repo.head
     assert repo.short_head
 
     repo.add_successful_commit
     assert_equal 3, repo.commits.size
-    assert_equal "This commit will work", repo.commits.last[:message]
-    assert_equal repo.commits.last[:identifier], repo.head
+    assert_equal "This commit will work", repo.commits.last["message"]
+    assert_equal repo.commits.last["identifier"], repo.head
   end
 
   def test_buildable_stub
     b = BuildableStub.new(:git, "git://github.com/ry/node", "master", "HEAD", "make")
 
-    assert_equal :git,                       b.scm
+    assert_equal "git",                      b.scm
     assert_equal "git://github.com/ry/node", b.uri
     assert_equal "master",                   b.branch
     assert_equal "HEAD",                     b.commit
@@ -37,12 +36,11 @@ class BobTestTest < Test::Unit::TestCase
 
   def test_buildable_git_repo
     repo = GitRepo.new(:test_repo)
-    repo.destroy
     repo.create
 
     b = BuildableStub.for(repo, repo.head)
 
-    assert_equal :git,                     b.scm
+    assert_equal "git",                    b.scm
     assert_equal "#{Bob.directory}/test_repo", b.uri
     assert_equal "master",                 b.branch
     assert_equal repo.head,                b.commit
@@ -51,12 +49,11 @@ class BobTestTest < Test::Unit::TestCase
 
   def test_buildable_svn_repo
     repo = SvnRepo.new(:test_repo)
-    repo.destroy
     repo.create
 
     b = BuildableStub.for(repo, repo.head)
 
-    assert_equal :svn,      b.scm
+    assert_equal "svn",     b.scm
     assert_equal "",        b.branch
     assert_equal repo.head, b.commit
     assert_equal "./test",  b.build_script

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: integrity-bob
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -23,6 +23,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ninja
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sr-mg
   type: :development
@@ -78,11 +88,8 @@ files:
 - Rakefile
 - bob.gemspec
 - lib/bob.rb
-- lib/bob/buildable.rb
 - lib/bob/builder.rb
-- lib/bob/engine.rb
-- lib/bob/engine/foreground.rb
-- lib/bob/engine/threaded.rb
+- lib/bob/buildable.rb
 - lib/bob/scm.rb
 - lib/bob/scm/abstract.rb
 - lib/bob/scm/git.rb
@@ -92,15 +99,14 @@ files:
 - lib/bob/test/scm/abstract.rb
 - lib/bob/test/scm/git.rb
 - lib/bob/test/scm/svn.rb
-- lib/core_ext/object.rb
 - test/bob_test.rb
-- test/engine/threaded_test.rb
 - test/helper.rb
 - test/scm/git_test.rb
 - test/scm/svn_test.rb
 - test/test_test.rb
 has_rdoc: true
 homepage: http://integrityapp.com
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -121,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: integrity
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Bob builds!

data/lib/bob/engine.rb

@@ -1,9 +0,0 @@
-module Bob
-  # Different engines to run code in background. An engine is any object
-  # that responds to #call and takes a Proc object, which should be executed
-  # "in the background". The different engines are:
-  module Engine
-    autoload :Foreground, "bob/engine/foreground"
-    autoload :Threaded,   "bob/engine/threaded"
-  end
-end

data/lib/bob/engine/foreground.rb

@@ -1,6 +0,0 @@
-module Bob
-  module Engine
-    # Dummy engine that just runs in the foreground (useful for tests).
-    Foreground = lambda {|b| b.call }
-  end
-end

data/lib/bob/engine/threaded.rb

@@ -1,145 +0,0 @@
-require "thread"
-
-module Bob
-  module Engine
-    # A thread pool based build engine. This engine simply adds jobs to an
-    # in-memory queue, and processes them as soon as possible.
-    class Threaded
-      # The optional pool size controls how many threads will be created.
-      def initialize(pool_size = 2, logger = Bob.logger)
-        @pool   = ThreadPool.new(pool_size)
-        @logger = logger
-      end
-
-      # Adds a job to the queue.
-      def call(job)
-        @pool << job
-      end
-
-      # The number of jobs currently in the queue.
-      def njobs
-        @pool.njobs
-      end
-
-      # This method will not return until #njobs returns 0.
-      def wait!
-        Thread.pass until @pool.njobs == 0
-      end
-
-      # Manage a pool of threads, allowing for spin up / spin down of the
-      # contained threads.
-      # Simply processes work added to it's queue via #push.
-      # The default size for the pool is 2 threads.
-      class ThreadPool
-        # A thread safe single value for use as a counter.
-        class Incrementor
-          # The value passed in will be the initial value.
-          def initialize(v = 0)
-            @m = Mutex.new
-            @v = v
-          end
-
-          # Add the given value to self, default 1.
-          def inc(v = 1)
-            sync { @v += v }
-          end
-
-          # Subtract the given value to self, default 1.
-          def dec(v = 1)
-            sync { @v -= v }
-          end
-
-          # Simply shows the value inspect for convenience.
-          def inspect
-            @v.inspect
-          end
-
-          # Extract the value.
-          def to_i
-            @v
-          end
-
-          private
-
-          # Wrap the given block in a mutex.
-          def sync(&b)
-            @m.synchronize &b
-          end
-        end
-
-        # The number of threads in the pool.
-        attr_reader :size
-
-        # The job queue.
-        attr_reader :jobs
-
-        # Set the size of the thread pool. Asynchronously run down threads
-        # that are no longer required, and synchronously spawn new required
-        # threads.
-        def size=(other)
-          @size = other
-
-          if @workers.size > @size
-            (@workers.size - @size).times do
-              @workers.shift[:run] = false
-            end
-          else
-            (@size - @workers.size).times do
-              @workers << spawn
-            end
-          end
-        end
-
-        # Default pool size is 2 threads.
-        def initialize(size = nil, logger = Bob.logger)
-          size ||= 2
-          @jobs    = Queue.new
-          @njobs   = Incrementor.new
-          @workers = Array.new(size) { spawn }
-          @logger  = logger
-        end
-
-        # Adds a job to the queue, the job can be any number of objects
-        # responding to call, and/or a block.
-        def add(*jobs, &blk)
-          jobs = jobs + Array(blk)
-
-          jobs.each do |job|
-            @jobs << job
-            @njobs.inc
-          end
-        end
-
-        alias_method :push, :add
-        alias_method :<<,   :add
-
-        # A peak at the number of jobs in the queue. N.B. May differ, but
-        # should be more accurate than +jobs.size+.
-        def njobs
-          @njobs.to_i
-        end
-
-        private
-
-        # Create a new thread and return it. The thread will run until the
-        # thread-local value +:run+ is changed to false or nil.
-        def spawn
-          Thread.new do
-            c = Thread.current
-            c[:run] = true
-
-            while c[:run]
-              job = @jobs.pop
-              begin
-                job.call
-              rescue Exception => e
-                @logger.error("Exception occured during build of #{job.uri} commit #{job.commit}: #{e.message}")
-              end
-              @njobs.dec
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/core_ext/object.rb

@@ -1,7 +0,0 @@
-class Object #:nodoc:
-  # Add Object#tap for backwards compatibility
-  def tap
-    yield self
-    self
-  end unless method_defined?(:tap)
-end

data/test/engine/threaded_test.rb

@@ -1,34 +0,0 @@
-require File.dirname(__FILE__) + "/../helper"
-
-class ThreadedBobTest < Test::Unit::TestCase
-  def setup
-    super
-
-    @repo = GitRepo.new(:test_repo)
-    @repo.create
-  end
-
-  test "with a successful threaded build" do
-    old_engine = Bob.engine
-
-    repo.add_successful_commit
-    commit_id = repo.commits.last[:identifier]
-    buildable = BuildableStub.for(@repo, commit_id)
-
-    begin
-      Thread.abort_on_exception = true
-      Bob.engine = Bob::Engine::Threaded.new(5)
-      buildable.build
-      Bob.engine.wait!
-
-      assert_equal :successful,          buildable.status
-      assert_equal "Running tests...\n", buildable.output
-
-      commit = buildable.commit_info
-      assert_equal "This commit will work", commit[:message]
-      assert_equal Time.now.min,            commit[:committed_at].min
-    ensure
-      Bob.engine = old_engine
-    end
-  end
-end