testbot 0.4.6 → 0.4.7

data/lib/shared/testbot.rb

@@ -0,0 +1,141 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/simple_daemonize'))
+require File.expand_path(File.join(File.dirname(__FILE__), '/adapters/adapter'))
+require 'fileutils'
+
+module Testbot
+  require 'railtie' if defined?(Rails)
+
+  # Don't forget to update readme and changelog
+  def self.version
+    version = "0.4.7"
+    dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
+    if File.exists?(dev_version_file)
+      version += File.read(dev_version_file)
+    end
+    version
+  end
+
+  if ENV['INTEGRATION_TEST']
+    SERVER_PID = "/tmp/integration_test_testbot_server.pid"
+    RUNNER_PID = "/tmp/integration_test_testbot_runner.pid"
+  else
+    SERVER_PID = "/tmp/testbot_server.pid"
+    RUNNER_PID = "/tmp/testbot_runner.pid"
+  end
+
+  DEFAULT_WORKING_DIR = "/tmp/testbot"
+  DEFAULT_SERVER_PATH = "/tmp/testbot/#{ENV['USER']}"
+  DEFAULT_USER = "testbot"
+  DEFAULT_PROJECT = "project"
+  DEFAULT_RUNNER_USAGE = "100%"
+  SERVER_PORT = ENV['INTEGRATION_TEST'] ? 22880 : 2288
+
+  class CLI
+
+    def self.run(argv)
+      return false if argv == []
+      opts = parse_args(argv)
+
+      if opts[:help]
+        return false
+      elsif opts[:version]
+        puts "Testbot #{Testbot.version}"
+      elsif [ true, 'run', 'start' ].include?(opts[:server])
+        start_server(opts[:server])
+      elsif opts[:server] == 'stop'
+        stop('server', Testbot::SERVER_PID)
+      elsif [ true, 'run', 'start' ].include?(opts[:runner])
+        require File.expand_path(File.join(File.dirname(__FILE__), '/../runner/runner'))
+        return false unless valid_runner_opts?(opts)
+        start_runner(opts)
+      elsif opts[:runner] == 'stop'
+        stop('runner', Testbot::RUNNER_PID)
+      elsif adapter = Adapter.all.find { |adapter| opts[adapter.type.to_sym] }
+        require File.expand_path(File.join(File.dirname(__FILE__), '/../requester/requester'))
+        start_requester(opts, adapter)
+      end
+
+      true
+    end
+
+    def self.parse_args(argv)
+      last_setter = nil
+      hash = {}
+      str = ''
+      argv.each_with_index do |arg, i|
+        if arg.include?('--')
+          str = ''
+          last_setter = arg.split('--').last.to_sym
+          hash[last_setter] = true if (i == argv.size - 1) || argv[i+1].include?('--')
+        else
+          str += ' ' + arg
+          hash[last_setter] = str.strip
+        end
+      end
+      hash
+    end
+
+    def self.start_runner(opts)
+      stop('runner', Testbot::RUNNER_PID)
+
+      proc = lambda {
+        working_dir = opts[:working_dir] || Testbot::DEFAULT_WORKING_DIR
+        FileUtils.mkdir_p(working_dir)
+        Dir.chdir(working_dir)
+        runner = Runner::Runner.new(:server_host => opts[:connect],
+                                    :auto_update => opts[:auto_update], :max_instances => opts[:cpus],
+                                    :ssh_tunnel => opts[:ssh_tunnel], :server_user => opts[:user],
+                                    :max_jruby_instances => opts[:max_jruby_instances],
+                                    :dev_gem_root => opts[:dev_gem_root],
+                                    :wait_for_updated_gem => opts[:wait_for_updated_gem],
+                                    :jruby_opts => opts[:jruby_opts])
+        runner.run!
+      }
+
+      if opts[:runner] == 'run'
+        proc.call
+      else
+        puts "Testbot runner started (pid: #{Process.pid})"
+        SimpleDaemonize.start(proc, Testbot::RUNNER_PID, "testbot (runner)")
+      end
+    end
+
+    def self.start_server(type)
+      stop('server', Testbot::SERVER_PID)
+      require File.expand_path(File.join(File.dirname(__FILE__), '/../server/server'))
+
+      if type == 'run'
+        Sinatra::Application.run! :environment => "production"
+      else
+        puts "Testbot server started (pid: #{Process.pid})"
+        SimpleDaemonize.start(lambda {
+          Sinatra::Application.run! :environment => "production"
+        }, Testbot::SERVER_PID, "testbot (server)")
+      end
+    end
+
+    def self.stop(name, pid)
+      puts "Testbot #{name} stopped" if SimpleDaemonize.stop(pid)
+    end
+
+    def self.start_requester(opts, adapter)
+      requester = Requester::Requester.new(:server_host            => opts[:connect],
+                                           :rsync_path             => opts[:rsync_path],
+                                           :rsync_ignores          => opts[:rsync_ignores].to_s,
+                                           :available_runner_usage => nil,
+                                           :project                => opts[:project],
+                                           :ssh_tunnel             => opts[:ssh_tunnel], :server_user => opts[:user])
+      requester.run_tests(adapter, adapter.base_path)
+    end
+
+    def self.valid_runner_opts?(opts)
+      opts[:connect].is_a?(String)
+    end
+
+    def self.lib_path
+      File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+    end
+
+  end
+
+end

data/lib/tasks/testbot.rake

@@ -1,12 +1,12 @@
-require File.dirname(__FILE__) + '/../adapters/adapter'
+require File.dirname(__FILE__) + '/../shared/adapters/adapter'
 
 namespace :testbot do
   
   def run_and_show_results(adapter, custom_path)
     Rake::Task["testbot:before_request"].invoke
         
-    require File.join(File.dirname(__FILE__), '..', "requester.rb")
-    requester = Requester.create_by_config("#{Rails.root}/config/testbot.yml")
+    require File.expand_path(File.join(File.dirname(__FILE__), '..', 'requester', 'requester.rb'))
+    requester = Testbot::Requester::Requester.create_by_config("#{Rails.root}/config/testbot.yml")
 
     puts "Running #{adapter.pluralized}..."
     start_time = Time.now

data/lib/testbot.rb

@@ -1,146 +1,2 @@
-# Because rails 2 autoloads constrants even if they already exists?...
-unless defined?(Testbot)
-  require File.join(File.dirname(__FILE__), '/shared/simple_daemonize')
-  require File.join(File.dirname(__FILE__), '/adapters/adapter')
-  require 'fileutils'
-
-  module Testbot
-    require 'railtie' if defined?(Rails)
-
-    # Don't forget to update readme and changelog
-    def self.version
-      version = "0.4.6"
-      dev_version_file = File.join(File.dirname(__FILE__), '..', 'DEV_VERSION')
-      if File.exists?(dev_version_file)
-        version += File.read(dev_version_file)
-      end
-      version
-    end
-
-    if ENV['INTEGRATION_TEST']
-      SERVER_PID = "/tmp/integration_test_testbot_server.pid"
-      RUNNER_PID = "/tmp/integration_test_testbot_runner.pid"
-    else
-      SERVER_PID = "/tmp/testbot_server.pid"
-      RUNNER_PID = "/tmp/testbot_runner.pid"
-    end
-
-    DEFAULT_WORKING_DIR = "/tmp/testbot"
-    DEFAULT_SERVER_PATH = "/tmp/testbot/#{ENV['USER']}"
-    DEFAULT_USER = "testbot"
-    DEFAULT_PROJECT = "project"
-    DEFAULT_RUNNER_USAGE = "100%"
-    SERVER_PORT = ENV['INTEGRATION_TEST'] ? 22880 : 2288
-
-    class CLI
-
-      def self.run(argv)
-        return false if argv == []
-        opts = parse_args(argv)
-
-        if opts[:help]
-          return false
-        elsif opts[:version]
-          puts "Testbot #{Testbot.version}"
-        elsif [ true, 'run', 'start' ].include?(opts[:server])
-          start_server(opts[:server])
-        elsif opts[:server] == 'stop'
-          stop('server', Testbot::SERVER_PID)
-        elsif [ true, 'run', 'start' ].include?(opts[:runner])
-          require File.join(File.dirname(__FILE__), '/runner')
-          return false unless valid_runner_opts?(opts)
-          start_runner(opts)
-        elsif opts[:runner] == 'stop'
-          stop('runner', Testbot::RUNNER_PID)
-        elsif adapter = Adapter.all.find { |adapter| opts[adapter.type.to_sym] }
-          require File.join(File.dirname(__FILE__), '/requester')
-          start_requester(opts, adapter)
-        end
-
-        true
-      end
-
-      def self.parse_args(argv)
-        last_setter = nil
-        hash = {}
-        str = ''
-        argv.each_with_index do |arg, i|
-          if arg.include?('--')
-            str = ''
-            last_setter = arg.split('--').last.to_sym
-            hash[last_setter] = true if (i == argv.size - 1) || argv[i+1].include?('--')
-          else
-            str += ' ' + arg
-            hash[last_setter] = str.strip
-          end
-        end
-        hash
-      end
-
-      def self.start_runner(opts)
-        stop('runner', Testbot::RUNNER_PID)
-
-        proc = lambda {
-          working_dir = opts[:working_dir] || Testbot::DEFAULT_WORKING_DIR
-          FileUtils.mkdir_p(working_dir)
-          Dir.chdir(working_dir)
-          runner = Runner.new(:server_host => opts[:connect],
-                              :auto_update => opts[:auto_update], :max_instances => opts[:cpus],
-                              :ssh_tunnel => opts[:ssh_tunnel], :server_user => opts[:user],
-                              :max_jruby_instances => opts[:max_jruby_instances],
-                              :dev_gem_root => opts[:dev_gem_root],
-                              :wait_for_updated_gem => opts[:wait_for_updated_gem],
-                              :jruby_opts => opts[:jruby_opts])
-          runner.run!
-        }
-
-        if opts[:runner] == 'run'
-          proc.call
-        else
-          puts "Testbot runner started (pid: #{Process.pid})"
-          SimpleDaemonize.start(proc, Testbot::RUNNER_PID, "testbot (runner)")
-        end
-      end
-
-      def self.start_server(type)
-        stop('server', Testbot::SERVER_PID)
-
-        if type == 'run'
-          require File.join(File.dirname(__FILE__), '/server')
-          Sinatra::Application.run! :environment => "production"
-        else
-          puts "Testbot server started (pid: #{Process.pid})"
-          SimpleDaemonize.start(lambda {
-            ENV['DISABLE_LOGGING'] = "true"
-            require File.join(File.dirname(__FILE__), '/server')
-            Sinatra::Application.run! :environment => "production"
-          }, Testbot::SERVER_PID, "testbot (server)")
-        end
-      end
-
-      def self.stop(name, pid)
-        puts "Testbot #{name} stopped" if SimpleDaemonize.stop(pid)
-      end
-
-      def self.start_requester(opts, adapter)
-        requester = Requester.new(:server_host => opts[:connect],
-                                  :rsync_path => opts[:rsync_path],
-                                  :rsync_ignores => opts[:rsync_ignores].to_s,
-                                  :available_runner_usage => nil,
-                                  :project => opts[:project],
-                                  :ssh_tunnel => opts[:ssh_tunnel], :server_user => opts[:user])
-        requester.run_tests(adapter, adapter.base_path)
-      end
-
-      def self.valid_runner_opts?(opts)
-        opts[:connect].is_a?(String)
-      end
-
-      def self.lib_path
-        File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-      end
-
-    end
-
-  end
-end
+# Rails plugin hook
+require File.expand_path(File.join(File.dirname(__FILE__), '/shared/testbot'))

data/testbot.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require File.expand_path("lib/testbot")
+require File.expand_path(File.dirname(__FILE__) + '/lib/shared/testbot')
 
 Gem::Specification.new do |s|
   s.name        = "testbot"
@@ -20,13 +19,10 @@ Gem::Specification.new do |s|
   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('daemons', '=1.0.10') # Because mongrel uses this version
+  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')
-
-  # Because sinatra's "disable :logging" does not work with WEBrick.
-  # Also, using a version that builds on ruby 1.9.2.
-  s.add_dependency('mongrel', '1.2.0.pre2')  
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -120,7 +120,7 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -160,23 +160,6 @@ dependencies:
         version: 1.2.5
   type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: mongrel
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: -1876988191
-        segments: 
-        - 1
-        - 2
-        - 0
-        - pre2
-        version: 1.2.0.pre2
-  type: :runtime
-  version_requirements: *id010
 description: Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com
@@ -187,27 +170,27 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/adapters/adapter.rb
-- lib/adapters/cucumber_adapter.rb
-- lib/adapters/helpers/ruby_env.rb
-- lib/adapters/rspec_adapter.rb
-- lib/adapters/test_unit_adapter.rb
 - lib/generators/testbot/templates/testbot.rake.erb
 - lib/generators/testbot/templates/testbot.yml.erb
 - lib/generators/testbot/testbot_generator.rb
-- lib/new_runner.rb
 - lib/railtie.rb
-- lib/requester.rb
+- lib/requester/requester.rb
 - lib/runner/job.rb
-- lib/runner.rb
+- lib/runner/runner.rb
 - lib/server/build.rb
 - lib/server/db.rb
 - lib/server/group.rb
 - lib/server/job.rb
 - lib/server/runner.rb
-- lib/server.rb
+- lib/server/server.rb
+- lib/shared/adapters/adapter.rb
+- lib/shared/adapters/cucumber_adapter.rb
+- lib/shared/adapters/helpers/ruby_env.rb
+- lib/shared/adapters/rspec_adapter.rb
+- lib/shared/adapters/test_unit_adapter.rb
 - lib/shared/simple_daemonize.rb
 - lib/shared/ssh_tunnel.rb
+- lib/shared/testbot.rb
 - lib/tasks/testbot.rake
 - lib/testbot.rb
 - Gemfile

data/lib/new_runner.rb

@@ -1,30 +0,0 @@
-require 'rubygems'
-require 'httparty'
-
-class Server
-  include HTTParty
-end
-
-class NewRunner
-  
-  def self.run_jobs
-    next_job = Server.get('/jobs/next') rescue nil
-    return unless next_job
-    id, root, specs = next_job.split(',')
-    result = run_and_return_results("export RAILS_ENV=test; export RSPEC_COLOR=true; rake testbot:before_run; script/spec -O spec/spec.opts #{specs}")
-    Server.put("/jobs/#{id}", :body => { :result => result })
-  end
-  
-  def self.load_config
-    host = YAML.load_file("#{ENV['HOME']}/.testbot_runner.yml")[:server_host]
-    Server.base_uri "http://#{host}:2288"
-  end
-
-  private
-
-  # I'd really like to know how to do this better and more testable
-  def self.run_and_return_results(cmd)
-    `#{cmd} 2>&1`
-  end
-  
-end