testbot 0.3.5 → 0.3.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.3.6
+
+Added Rails 2 generator support.
+
 0.3.5
 
 Fixed ssh_tunnel bug when using a custom user.

data/README.markdown

@@ -68,11 +68,8 @@ Using testbot with Rails 3:
 
 Using testbot with Rails 2:
 
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.3.5'
-
-The rails 2 config generator isn't done yet so you can look at the following examples instead:
-  [lib/tasks/testbot.rake](https://gist.github.com/715836) and
-  [config/testbot.yml](https://gist.github.com/715839).
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.3.6'
+    script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :test, :features)
 

data/lib/adapters/cucumber_adapter.rb

@@ -3,11 +3,15 @@ class CucumberAdapter
   def self.command(ruby_interpreter, files)
     "export AUTOTEST=1; #{ruby_interpreter} script/cucumber -f progress --backtrace -r features/support -r features/step_definitions #{files} -t ~@disabled_in_cruise"
   end
-  
-  def self.file_pattern
-    '**/**/*.feature'
+ 
+  def self.test_files(dir)
+    Dir["#{dir}/#{file_pattern}"]
   end
   
+  def self.get_sizes(files)
+    files.map { |file| File.stat(file).size }
+  end
+
   def self.requester_port
     2230
   end
@@ -27,5 +31,10 @@ class CucumberAdapter
   def self.type
     pluralized
   end
-  
+
+private
+
+  def self.file_pattern
+    '**/**/*.feature'
+  end
 end

data/lib/adapters/rspec_adapter.rb

@@ -4,8 +4,12 @@ class RSpecAdapter
     "export RSPEC_COLOR=true; #{ruby_interpreter} script/spec -O spec/spec.opts #{files}"
   end
   
-  def self.file_pattern
-    '**/**/*_spec.rb'
+  def self.test_files(dir)
+    Dir["#{dir}/#{file_pattern}"]
+  end
+
+  def self.get_sizes(files)
+    files.map { |file| File.stat(file).size }
   end
   
   def self.requester_port
@@ -27,5 +31,11 @@ class RSpecAdapter
   def self.type
     'spec'
   end
-  
+
+private
+
+  def self.file_pattern
+    '**/**/*_spec.rb'
+  end
+    
 end

data/lib/adapters/test_unit_adapter.rb

@@ -4,8 +4,12 @@ class TestUnitAdapter
     "#{ruby_interpreter} -Itest -e '%w(#{files}).each { |file| require(file) }'"
   end
   
-  def self.file_pattern
-    '**/**/*_test.rb'
+  def self.test_files(dir)
+    Dir["#{dir}/#{file_pattern}"]
+  end
+
+  def self.get_sizes(files)
+    files.map { |file| File.stat(file).size }
   end
   
   def self.requester_port
@@ -28,4 +32,10 @@ class TestUnitAdapter
     'test'
   end  
   
+private
+
+  def self.file_pattern
+    '**/**/*_test.rb'
+  end
+  
 end

data/lib/generators/testbot/templates/testbot.rake.erb

@@ -11,7 +11,7 @@ namespace :testbot do
 test:
   adapter: mysql
   encoding: utf8
-  database: <%= options.project %>_testbot_test<%%= ENV['TEST_ENV_NUMBER'] %>
+  database: <%= options[:project] %>_testbot_test<%%= ENV['TEST_ENV_NUMBER'] %>
   username: root
   password:
   host: localhost
@@ -23,8 +23,8 @@ DB_CONFIG
     # # Setup databases for all instances
     # 0.upto(ENV['TEST_INSTANCES'].to_i - 1) do |instance|
     #   test_env_number = (instance == 0) ? '' : instance + 1
-    #   system "mysqladmin -u root -f drop <%= options.project %>_testbot_test#{test_env_number}  > /dev/null 2>&1"
-    #   system "mysqladmin -u root -f create <%= options.project %>_testbot_test#{test_env_number} > /dev/null 2>&1"
+    #   system "mysqladmin -u root -f drop <%= options[:project] %>_testbot_test#{test_env_number}  > /dev/null 2>&1"
+    #   system "mysqladmin -u root -f create <%= options[:project] %>_testbot_test#{test_env_number} > /dev/null 2>&1"
     #   system "export RAILS_ENV=test; export TEST_ENV_NUMBER=#{test_env_number}; rake db:test:load"
     # end
 

data/lib/generators/testbot/templates/testbot.yml.erb

@@ -1,34 +1,34 @@
 # Which server to use.
-server_host: <%= options.connect %>
-<%- if options.user -%>
-server_user: <%= options.user %>
+server_host: <%= options[:connect] %>
+<%- if options[:user] -%>
+server_user: <%= options[:user] %>
 <%- else -%>
 # server_user: <%= Testbot::DEFAULT_USER %>
 <%- end -%>
 
 # Project prefix. Used for prefixing project files
 # so that you can run multiple projects in the same testbot network.
-<%- if options.project %>
-project: <%= options.project %>
+<%- if options[:project] %>
+project: <%= options[:project] %>
 <%- else -%>
 # project: <%= Testbot::DEFAULT_PROJECT %>
 <%- end -%>
 
 # RSync settings. The folder where your files are synced to
 # and then fetched from before running the tests.
-<%- if options.rsync_path -%>
-rsync_path: <%= options.rsync_path %>
+<%- if options[:rsync_path] -%>
+rsync_path: <%= options[:rsync_path] %>
 <%- else -%>
 # rsync_path: <%= Testbot::DEFAULT_SERVER_PATH %>
 <%- end -%>
-<%- if options.rsync_ignores -%>
-rsync_ignores: <%= options.rsync_ignores %>
+<%- if options[:rsync_ignores] -%>
+rsync_ignores: <%= options[:rsync_ignores] %>
 <%- else -%>
 # rsync_ignores:
 <%- end -%>
 
 # To tunnel traffic through SSH
-<%- if options.ssh_tunnel -%>
+<%- if options[:ssh_tunnel] -%>
 ssh_tunnel: true
 <%- else -%>
 # ssh_tunnel: true

data/lib/generators/testbot/testbot_generator.rb

@@ -1,9 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../testbot") 
+require "acts_as_rails3_generator"
+
 class TestbotGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
-  
-  class_option :connect, :type => :string, :required => true, :desc => "Which server to use (required)"
-  class_option :project, :type => :string, :default => nil, :desc => "The name of your project (default: #{Testbot::DEFAULT_PROJECT})"
-  class_option :rsync_path, :type => :string, :default => nil, :desc => "Sync path on the server (default: #{Testbot::DEFAULT_SERVER_PATH})"  
+
+  class_option :connect, :type => :string, :required => true, :desc => "Which server to use (required)" 
+  class_option :project, :type => :string, :default => nil, :desc => "The name of your project (default: #{Testbot::DEFAULT_PROJECT})" 
+  class_option :rsync_path, :type => :string, :default => nil, :desc => "Sync path on the server (default: #{Testbot::DEFAULT_SERVER_PATH})"
   class_option :rsync_ignores, :type => :string, :default => nil, :desc => "Files to rsync_ignores when syncing (default: include all)"
   class_option :ssh_tunnel, :type => :boolean, :default => nil, :desc => "Use a ssh tunnel"
   class_option :user, :type => :string, :default => nil, :desc => "Use a custom rsync / ssh tunnel user (default: #{Testbot::DEFAULT_USER})"
@@ -13,3 +16,4 @@ class TestbotGenerator < Rails::Generators::Base
     template "testbot.rake.erb", "lib/tasks/testbot.rake"
   end
 end
+

data/lib/requester.rb

@@ -41,8 +41,8 @@ class Requester
     rsync_ignores = config.rsync_ignores.to_s.split.map { |pattern| "--exclude='#{pattern}'" }.join(' ')
     system "rsync -az --delete -e ssh #{rsync_ignores} . #{rsync_uri}"
    
-    files = find_tests(adapter, dir)
-    sizes = find_sizes(files)
+    files = adapter.test_files(dir) 
+    sizes = adapter.get_sizes(files)
 
     build_id = HTTParty.post("#{server_uri}/builds", :body => { :root => root,
                                                      :type => adapter.type.to_s,
@@ -132,14 +132,6 @@ class Requester
     line =~ /(\d{2,}|[1-9]) (fail|error)/
   end
 
-  def find_tests(adapter, dir)
-    Dir["#{dir}/#{adapter.file_pattern}"]
-  end
-
-  def find_sizes(files)
-    files.map { |file| File.stat(file).size }
-  end
-
   def jruby?
     RUBY_PLATFORM =~ /java/ || !!ENV['USE_JRUBY']
   end

data/lib/testbot.rb

@@ -1,128 +1,131 @@
-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
-  VERSION = "0.3.5"
-
-  SERVER_PID = "/tmp/testbot_server.pid"
-  RUNNER_PID = "/tmp/testbot_runner.pid"
-  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)
+# 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
+    VERSION = "0.3.6"
+
+    SERVER_PID = "/tmp/testbot_server.pid"
+    RUNNER_PID = "/tmp/testbot_runner.pid"
+    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
-    
-      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
+
+      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
-      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],
-                            :jruby_opts => opts[:jruby_opts])
-        runner.run!
-      }
-    
-      if opts[:runner] == 'run'
-        proc.call
-      else
-        pid = SimpleDaemonize.start(proc, Testbot::RUNNER_PID)
-        puts "Testbot runner started (pid: #{pid})"
+
+      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],
+                              :jruby_opts => opts[:jruby_opts])
+          runner.run!
+        }
+
+        if opts[:runner] == 'run'
+          proc.call
+        else
+          pid = SimpleDaemonize.start(proc, Testbot::RUNNER_PID)
+          puts "Testbot runner started (pid: #{pid})"
+        end
       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
-        pid = SimpleDaemonize.start(lambda {
-          ENV['DISABLE_LOGGING'] = "true"
+
+      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"
-        }, Testbot::SERVER_PID)
-        puts "Testbot server started (pid: #{pid})"
+        else
+          pid = SimpleDaemonize.start(lambda {
+            ENV['DISABLE_LOGGING'] = "true"
+            require File.join(File.dirname(__FILE__), '/server')
+            Sinatra::Application.run! :environment => "production"
+          }, Testbot::SERVER_PID)
+          puts "Testbot server started (pid: #{pid})"
+        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
-  
-    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

data/testbot.gemspec

@@ -19,6 +19,7 @@ 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('acts_as_rails3_generator')
 
   # Could work with older versions, but not newer (when deploying on debian)
   s.add_dependency('sqlite3-ruby', '= 1.2.5')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +01:00
+date: 2010-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,9 +115,23 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: acts_as_rails3_generator
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -129,11 +143,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mongrel
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -146,7 +160,7 @@ dependencies:
         - pre2
         version: 1.2.0.pre2
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: Testbot is a test distribution tool that works with Rails, RSpec, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com