testbot 0.4.7 → 0.4.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.4.8
+
+Removed all remaining native dependencies to make testbot simpler to install.
+
 0.4.7
 
 - Refactored the code into modules with one directory for each.

data/README.markdown

@@ -69,7 +69,7 @@ Using testbot with Rails 3:
 
 Using testbot with Rails 2:
 
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.4.7'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.4.8'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :test, :features)

data/lib/runner/job.rb

@@ -33,7 +33,7 @@ module Testbot::Runner
     def measure_run_time
       start_time = Time.now
       yield
-      Time.now - start_time
+      (Time.now - start_time) * 100
     end
 
     def run_and_return_result(command)

data/lib/server/build.rb

@@ -1,6 +1,10 @@
 module Testbot::Server
 
-  class Build < Sequel::Model
+  class Build < MemoryModel
+
+    def initialize(hash)
+      super({ :success => true, :done => false, :results => '' }.merge(hash))
+    end
 
     def self.create_and_build_jobs(hash)
       hash["jruby"] = (hash["jruby"] == "true") ? 1 : 0
@@ -10,21 +14,21 @@ module Testbot::Server
     end
 
     def create_jobs!(available_runner_usage)
-      groups = Group.build(self[:files].split, self[:sizes].split.map { |size| size.to_i },
-                           Runner.total_instances.to_f * (available_runner_usage.to_i / 100.0), self[:type])
+      groups = Group.build(self.files.split, self.sizes.split.map { |size| size.to_i },
+                           Runner.total_instances.to_f * (available_runner_usage.to_i / 100.0), self.type)
       groups.each do |group|
         Job.create(:files => group.join(' '),
-                   :root => self[:root],
-                   :project => self[:project],
-                   :type => self[:type],
-                   :requester_mac => self[:requester_mac],
-                   :build_id => self[:id],
-                   :jruby => self[:jruby])
+                   :root => self.root,
+                   :project => self.project,
+                   :type => self.type,
+                   :requester_mac => self.requester_mac,
+                   :build => self,
+                   :jruby => self.jruby)
       end
     end
 
     def destroy
-      Job.filter([ 'build_id = ?', self[:id] ]).each { |job| job.destroy }
+      Job.all.find_all { |j| j.build == self }.each { |job| job.destroy }
       super
     end
 

data/lib/server/job.rb

@@ -1,17 +1,18 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'db.rb'))
-
 module Testbot::Server
 
-  class Job < Sequel::Model
+  class Job < MemoryModel
+   
+    attribute :success, :boolean
+
     def update(hash)
       super(hash)
-      if build = Build.find([ "id = ?", self[:build_id] ])
-        done = Job.filter([ "result IS NULL AND build_id = ?", self[:build_id] ]).count == 0
-        build.update(:results => build[:results].to_s + hash[:result].to_s,
-                     :done => done)
+      if self.build
+        done = !Job.all.find { |j| !j.result && j.build == self.build }
+        self.build.update(:results => build.results.to_s + self.result.to_s,
+                          :done => done)
 
-        build_broken_by_job = (hash[:success] == "false" && build[:success])
-        build.update(:success => false) if build_broken_by_job
+        build_broken_by_job = (!self.success && build.success)
+        self.build.update(:success => false) if build_broken_by_job
       end
     end
 
@@ -19,29 +20,27 @@ module Testbot::Server
       clean_params = params.reject { |k, v| [ "requester_mac", "no_jruby" ].include?(k) }
       runner = Runner.record! clean_params.merge({ :ip => remove_addr, :last_seen_at => Time.now })
       return unless Server.valid_version?(params[:version])
-      [ next_job_query(params["requester_mac"], params["no_jruby"]).first, runner ]
+      [ next_job(params["requester_mac"], params["no_jruby"]), runner ]
     end
 
     private
 
-    def self.next_job_query(requester_mac, no_jruby)
+    def self.next_job(requester_mac, no_jruby)
       release_jobs_taken_by_missing_runners!
-      query = Job.filter("taken_at IS NULL").order("Random()".lit)
-      filters = []
-      filters << "requester_mac = '#{requester_mac}'" if requester_mac
-      filters << "jruby != 1" if no_jruby
-      if filters.empty?
-        query
-      else
-        query.filter(filters.join(' AND ')) 
-      end
+      jobs = Job.all.find_all { |j|
+        !j.taken_at &&
+          (requester_mac ? j.requester_mac == requester_mac : true) &&
+          (no_jruby ? j.jruby != 1 : true)
+      }
+
+      jobs[rand(jobs.size)]
     end
 
     def self.release_jobs_taken_by_missing_runners!
-      missing_runners = Runner.filter([ "last_seen_at < ?", (Time.now - Runner.timeout) ])
-      missing_runners.each { |r|
-        Job.filter(:taken_by_id => r[:id]).update(:taken_at => nil)
-      }    
+      missing_runners = Runner.all.find_all { |r| r.last_seen_at < (Time.now - Runner.timeout) }
+      missing_runners.each { |runner|
+        Job.all.find_all { |job| job.taken_by == runner }.each { |job| job.update(:taken_at => nil) }
+      }
     end
   end
 

data/lib/server/memory_model.rb

@@ -0,0 +1,87 @@
+class MemoryModel < OpenStruct
+
+  @@db = {}
+  @@types = {}
+
+  def initialize(hash)
+    @@types[self.class] ||= {}
+    hash = resolve_types(symbolize_keys(hash))
+    super(hash)
+  end
+
+  def id
+    object_id
+  end
+
+  def type
+    @table[:type]
+  end
+
+  def update(hash)
+    @table.merge!(resolve_types(symbolize_keys(hash)))
+    self
+  end
+
+  def destroy
+    self.class.all.delete_if { |b| b.id == id }
+  end
+
+  def self.find(id)
+    all.find { |r| r.id == id.to_i }
+  end
+
+  def self.create(hash = {})
+    all << new(hash)
+    all[-1]
+  end
+
+  def self.all
+    @@db[self] ||= []
+    @@db[self]
+  end
+  
+  def self.first
+    all.first
+  end
+
+  def self.delete_all
+    all.clear
+  end
+
+  def self.count
+    all.size
+  end
+
+  def self.attribute(attribute, type)
+    @@types[self] ||= {}
+    @@types[self][attribute] = type
+  end
+
+private
+ 
+  def resolve_types(hash)
+    hash.each { |attribute, value|
+      case @@types[self.class][attribute]
+      when :integer
+        hash[attribute] = value.to_i
+      when :boolean
+        if value == "true"
+          hash[attribute] = true
+        elsif value == "false"
+          hash[attribute] = false
+        elsif value != true && value != false
+          hash[attribute] = nil
+        end
+      end
+    }
+    hash
+  end
+
+  def symbolize_keys(hash)
+    h = {}
+    hash.each { |k, v| h[k.to_sym] = v }
+    h
+  end
+
+end
+

data/lib/server/runner.rb

@@ -1,15 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'db.rb'))
-
 module Testbot::Server
 
-  class Runner < Sequel::Model
+  class Runner < MemoryModel
+
+    attribute :idle_instances, :integer
+    attribute :max_instances, :integer
 
     def self.record!(hash)
       create_or_update_by_mac!(hash)
     end
 
     def self.create_or_update_by_mac!(hash)
-      if (runner = find(:uid => hash[:uid]))
+      if runner = find_by_uid(hash[:uid])
         runner.update hash
       else
         Runner.create hash
@@ -20,21 +21,25 @@ module Testbot::Server
       10
     end
 
+    def self.find_by_uid(uid)
+      all.find { |r| r.uid == uid }
+    end
+
     def self.find_all_outdated
-      DB[:runners].filter("version != ? OR version IS NULL", Testbot.version)
+      all.find_all { |r| r.version != Testbot.version }
     end
 
     def self.find_all_available
-      DB[:runners].filter("version = ? AND last_seen_at > ?", Testbot.version, Time.now - Runner.timeout)
+      all.find_all { |r| r.version == Testbot.version && r.last_seen_at > (Time.now - Runner.timeout) }
     end  
 
     def self.available_instances
-      find_all_available.inject(0) { |sum, r| r[:idle_instances] + sum }
+      find_all_available.inject(0) { |sum, r| r.idle_instances + sum }
     end
 
     def self.total_instances
       return 1 if ENV['INTEGRATION_TEST']
-      find_all_available.inject(0) { |sum, r| r[:max_instances] + sum }
+      find_all_available.inject(0) { |sum, r| r.max_instances + sum }
     end
 
   end

data/lib/server/server.rb

@@ -3,6 +3,7 @@ require 'sinatra'
 require 'yaml'
 require 'json'
 require File.expand_path(File.join(File.dirname(__FILE__), '/../shared/testbot'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'memory_model.rb'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'job.rb'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'group.rb')) #unless defined?(Group)
 require File.expand_path(File.join(File.dirname(__FILE__), 'runner.rb'))
@@ -23,36 +24,36 @@ module Testbot::Server
   end
 
   post '/builds' do
-    build = Build.create_and_build_jobs(params)[:id].to_s
+    build = Build.create_and_build_jobs(params).id.to_s
   end
 
   get '/builds/:id' do
-    build = Build.find(:id => params[:id].to_i)
-    build.destroy if build[:done]
-    { "done" => build[:done], "results" => build[:results], "success" => build[:success] }.to_json
+    build = Build.find(params[:id])
+    build.destroy if build.done
+    { "done" => build.done, "results" => build.results, "success" => build.success }.to_json
   end
 
   get '/jobs/next' do
     next_job, runner = Job.next(params, @env['REMOTE_ADDR'])
     if next_job
-      next_job.update(:taken_at => Time.now, :taken_by_id => runner.id)
-      [ next_job[:id], next_job[:requester_mac], next_job[:project], next_job[:root], next_job[:type], (next_job[:jruby] == 1 ? 'jruby' : 'ruby'), next_job[:files] ].join(',')
+      next_job.update(:taken_at => Time.now, :taken_by => runner)
+      [ next_job.id, next_job.requester_mac, next_job.project, next_job.root, next_job.type, (next_job.jruby == 1 ? 'jruby' : 'ruby'), next_job.files ].join(',')
     end
   end
 
   put '/jobs/:id' do
-    Job.find(:id => params[:id].to_i).update(:result => params[:result], :success => params[:success]); nil
+    Job.find(params[:id]).update(:result => params[:result], :success => params[:success]); nil
   end
 
   get '/runners/ping' do
     return unless Server.valid_version?(params[:version])
-    runner = Runner.find(:uid => params[:uid])
+    runner = Runner.find_by_uid(params[:uid])
     runner.update(params.merge({ :last_seen_at => Time.now })) if runner
     nil
   end
 
   get '/runners/outdated' do
-    Runner.find_all_outdated.map { |runner| [ runner[:ip], runner[:hostname], runner[:uid] ].join(' ') }.join("\n").strip
+    Runner.find_all_outdated.map { |runner| [ runner.ip, runner.hostname, runner.uid ].join(' ') }.join("\n").strip
   end
 
   get '/runners/available_instances' do
@@ -64,7 +65,7 @@ module Testbot::Server
   end
 
   get '/runners/available' do
-    Runner.find_all_available.map { |runner| [ runner[:ip], runner[:hostname], runner[:uid], runner[:username], runner[:idle_instances] ].join(' ') }.join("\n").strip
+    Runner.find_all_available.map { |runner| [ runner.ip, runner.hostname, runner.uid, runner.username, runner.idle_instances ].join(' ') }.join("\n").strip
   end
 
   get '/version' do

data/lib/shared/testbot.rb

@@ -7,7 +7,7 @@ module Testbot
 
   # Don't forget to update readme and changelog
   def self.version
-    version = "0.4.7"
+    version = "0.4.8"
     dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
     if File.exists?(dev_version_file)
       version += File.read(dev_version_file)

data/testbot.gemspec

@@ -17,12 +17,8 @@ Gem::Specification.new do |s|
   s.add_dependency('httparty', '>= 0.6.1')
   s.add_dependency('macaddr', '>= 1.0.0')
   s.add_dependency('net-ssh', '>= 2.0.23')
-  s.add_dependency('sequel', '>= 3.16.0')
-  s.add_dependency('json', '>= 1.4.6')
+  s.add_dependency('json_pure', '>= 1.4.6')
   s.add_dependency('daemons', '>= 1.0.10')
   s.add_dependency('acts_as_rails3_generator')
-
-  # Could work with older versions, but not newer (when deploying on debian)
-  s.add_dependency('sqlite3-ruby', '= 1.2.5')
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +01:00
+date: 2010-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,25 +83,9 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sequel
+  name: json_pure
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 71
-        segments: 
-        - 3
-        - 16
-        - 0
-        version: 3.16.0
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +97,11 @@ dependencies:
         - 6
         version: 1.4.6
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: daemons
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +113,11 @@ dependencies:
         - 10
         version: 1.0.10
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: acts_as_rails3_generator
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,23 +127,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
-  type: :runtime
-  version_requirements: *id009
+  version_requirements: *id007
 description: Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com
@@ -178,9 +146,9 @@ files:
 - lib/runner/job.rb
 - lib/runner/runner.rb
 - lib/server/build.rb
-- lib/server/db.rb
 - lib/server/group.rb
 - lib/server/job.rb
+- lib/server/memory_model.rb
 - lib/server/runner.rb
 - lib/server/server.rb
 - lib/shared/adapters/adapter.rb

data/lib/server/db.rb

@@ -1,49 +0,0 @@
-require 'sequel'
-
-module Testbot::Server
-
-  DB = Sequel.sqlite
-
-  DB.create_table :builds do
-    primary_key :id
-    String :files
-    String :sizes
-    String :results, :default => ''
-    String :root
-    String :project
-    String :type
-    String :requester_mac
-    Integer :jruby
-    Boolean :success, :default => true
-    Boolean :done, :default => false
-  end
-
-
-  DB.create_table :jobs do
-    primary_key :id
-    String :files
-    String :result
-    String :root
-    String :project
-    String :type
-    String :requester_mac
-    Integer :jruby
-    Integer :build_id
-    Integer :taken_by_id
-    Boolean :success
-    Datetime :taken_at, :default => nil
-  end
-
-  DB.create_table :runners do
-    primary_key :id
-    String :ip
-    String :hostname
-    String :uid
-    String :username
-    String :version
-    Integer :idle_instances
-    Integer :max_instances
-    Datetime :last_seen_at
-  end
-
-end