dtr 1.0.0 → 1.1.0

data/test/agent_helper.rb

@@ -1,35 +1,43 @@
 require 'fileutils'
 module DTR
   module AgentHelper
-    GROUP = 'dtr acceptance tests'
-    def start_agents(size = 3)
+    include Adapter::Master
+    GROUP = 'dtr_acceptance_tests'
+    def start_agents(options={})
+      options = {:size => 3, :clean_dir => true}.merge(options)
       @agents_dir = File.join(Dir.pwd, 'agents')
-      @agents = []
-      @agents << start_agent_at(File.join(@agents_dir, 'agent1'), size)
-      # @agents << start_agent_at(File.join(@agents_dir, 'agent2'), 1)
+      start_agent_at(agent1_dir, options)
     end
 
-    def start_agent_at(agent_dir, size, clean_dir=true)
-      FileUtils.rm_rf(agent_dir) if clean_dir
+    def agent1_dir
+      File.join(@agents_dir, 'agent1')
+    end
+
+    def agent1_runner1_dir
+      File.join(agent1_dir, Socket.gethostname.gsub(/[^\d\w]/, '_'), 'tance_rails_ext_test', 'runner1')
+    end
+
+    def start_agent_at(agent_dir, options={})
+      FileUtils.rm_rf(agent_dir) if options[:clean_dir]
       FileUtils.mkdir_p(agent_dir)
       runner_names = []
-      size.times {|i| runner_names << "runner#{i}"}
+      options[:size].times {|i| runner_names << "runner#{i}"}
       Process.fork do
         Dir.chdir(agent_dir) do
+          DTR.configuration.refresh
+          DTR.configuration.follower_listen_heartbeat_timeout = options[:follower_listen_heartbeat_timeout] || 3
           DTR.configuration.group = GROUP
-          DTR.launch_agent(runner_names, nil)
+          DTR.configuration.agent_runners = runner_names
+          DTR.configuration.save
+          DTR.run_script("DTR::Agent.start(:hypnotize)")
         end
       end
     end
 
     def stop_agents
-      if @agents
-        @agents.each do |agent|
-          DTR.kill_process agent
-        end
-        Process.waitall
-        sleep 1
-      end
+      group_agents_should_die(GROUP)
+      Process.waitall
+      sleep 1
     ensure
       FileUtils.rm_rf(@agents_dir) rescue nil
     end

data/test/logger_stub.rb

@@ -1,8 +1,8 @@
 class LoggerStub
   def initialize
-    @store = DTR::EnvStore.new
-    clear
+    @store = DTR::EnvStore.new('.logger_stub')
   end
+
   def debug(message=nil, &block)
     output(:debug, message, &block)
   end
@@ -29,6 +29,6 @@ class LoggerStub
   end
 
   def clear
-    @store[:logs] = []
+    @store.destroy
   end
 end

data/test/test_helper.rb

@@ -7,17 +7,22 @@ require 'rubygems'
 require 'growling_test'
 require 'dtr'
 require 'dtr/test_unit'
-DTR.configuration.master_heartbeat_interval = 2
-DTR.configuration.follower_listen_heartbeat_timeout = 3
 
 require File.dirname(__FILE__) + '/agent_helper'
 require File.dirname(__FILE__) + '/logger_stub'
 
 ENV['DTR_ENV'] = 'test'
+# ENV['JRUBY_DTR'] = 'true'
 
 module Test
   module Unit
     class TestCase
+      # For safe fork & kill sub process, should use Process.kill and Process.fork
+      # At least have problem on ruby 1.8.6 114 with Kernel#kill & fork
+      def kill_process(pid)
+        Process.kill 'TERM', pid rescue nil
+      end
+
       def assert_false(o)
         assert !o
       end
@@ -25,18 +30,19 @@ module Test
         pid = Process.fork do
           Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../testdata/")) do
             setup_test_env
-            with_agent_helper_group(&block)
+            with_agent_configuration(&block)
           end
           exit 0
         end
         Process.waitpid pid
         assert_equal 0, $?.exitstatus
       ensure
-        DTR.kill_process pid
+        kill_process pid
       end
 
-      def with_agent_helper_group(&block)
+      def with_agent_configuration(&block)
         DTR.configuration.group = DTR::AgentHelper::GROUP
+        DTR.configuration.master_heartbeat_interval = 2
         begin
           block.call
         ensure
@@ -52,16 +58,13 @@ module Test
         require 'a_file_system_test_case'
         require 'scenario_test_case'
         require 'setup_agent_env_test_case'
+        DTR.configuration.refresh
         DTR.inject
       end
 
       def runit(suite)
         Test::Unit::UI::Console::TestRunner.run(suite, Test::Unit::UI::SILENT)
       end
-      def clear_configuration
-        DTR::EnvStore.destroy
-        DTR.configuration.load
-      end
     end
   end
 end

data/test/unit/adapter_test.rb

@@ -15,7 +15,7 @@ class AdapterTest < Test::Unit::TestCase
   end
 
   def teardown
-    clear_configuration
+    DTR.configuration.refresh
   end
 
   def test_should_be_sleep_if_never_wakeup

data/test/unit/configuration_test.rb

@@ -1,14 +1,19 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ConfigurationTest < Test::Unit::TestCase
+
   def teardown
-    clear_configuration
+    DTR.configuration.refresh
   end
 
-  def test_should_not_save_rinda_server_port
+  def test_should_save_rinda_server_port
     DTR.configuration.rinda_server_port = '3456'
     assert_equal '3456', DTR.configuration.rinda_server_port
-    assert_nil DTR::EnvStore.new[:rinda_server_port]
+    DTR.configuration.save
+    assert_equal '3456', DTR::EnvStore.new[:rinda_server_port]
+    
+    DTR.configuration.load
+    assert_equal '3456', DTR.configuration.rinda_server_port
   end
 
   def test_group_defualt_is_dangerous_group
@@ -41,4 +46,31 @@ class ConfigurationTest < Test::Unit::TestCase
     DTR.configuration.load
     assert_equal 'new group', DTR.configuration.group
   end
-end
+
+  def test_agent_env_setup_cmd
+    DTR.configuration.agent_env_setup_cmd = 'rake db:test:prepare'
+    assert_equal 'rake db:test:prepare', DTR.configuration.agent_env_setup_cmd
+    DTR.configuration.save
+    assert_equal 'rake db:test:prepare', DTR::EnvStore.new[:agent_env_setup_cmd]
+  end
+
+  def test_agent_runners
+    DTR.configuration.agent_runners = ['r1', 'r2']
+    assert_equal ['r1', 'r2'], DTR.configuration.agent_runners
+    DTR.configuration.save
+    assert_equal ['r1', 'r2'], DTR::EnvStore.new[:agent_runners]
+  end
+
+  def test_working_env_should_be_saved_directly
+    env = DTR::WorkingEnv.new
+    DTR.configuration.working_env = env
+    assert_equal env, DTR.configuration.working_env
+    assert_equal env, DTR::EnvStore.new[:working_env]
+  end
+
+  def test_working_env_should_always_load_from_pstore
+    env = DTR::WorkingEnv.new
+    DTR::EnvStore.new[:working_env] = env
+    assert_equal env, DTR.configuration.working_env
+  end
+end

data/test/unit/database_initializer_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'dtr/agent/rails_ext'
+
+class DatabaseInitializerTest < Test::Unit::TestCase
+  include DTR::Agent::RailsExt::DatabaseInitializer
+
+  def test_should_be_nil_when_no_config_database_yml_and_database_yml_dtr_exist
+    assert_nil preparing_database_command
+  end
+
+  def test_should_overwrite_config_database_yml_if_config_database_yml_dtr_exists
+    FileUtils.mkdir_p('config')
+    File.open('config/database.yml', 'w+') do |io|
+      io.syswrite("database.yml")
+    end
+    File.open('config/database.yml.dtr', 'w+') do |io|
+      io.syswrite("database.yml.dtr")
+    end
+    assert_not_nil preparing_database_command
+    assert_equal 'database.yml.dtr', File.new('config/database.yml').read
+  ensure
+    FileUtils.rm_rf('config')
+  end
+
+  def test_should_include_runner_name_in_environment
+    ENV['DTR_RUNNER_NAME'] = 'runner_name'
+    FileUtils.mkdir_p('config')
+    File.open('config/database.yml', 'w+') do |io|
+      io.syswrite("database.yml")
+    end
+    assert_equal "rake db:create db:migrate db:test:prepare DTR_RUNNER_NAME=runner_name",  preparing_database_command
+  ensure
+    ENV['DTR_RUNNER_NAME'] = nil
+    FileUtils.rm_rf('config')
+  end
+end

data/test/unit/facade_test.rb

@@ -5,7 +5,7 @@ class FacadeTest < Test::Unit::TestCase
   include DTR::Facade
 
   def teardown
-    clear_configuration
+    DTR.configuration.refresh
   end
 
   def test_lib_path
@@ -28,6 +28,16 @@ class FacadeTest < Test::Unit::TestCase
     assert_equal '7890', DTR::EnvStore.new[:agent_listen_port]
   end
 
+  def test_save_agent_env_setup_cmd
+    self.agent_env_setup_cmd = 'rake db:test:prepare'
+    assert_equal 'rake db:test:prepare', DTR::EnvStore.new[:agent_env_setup_cmd]
+  end
+
+  def test_save_agent_runners
+    self.agent_runners = ['r1', 'r2']
+    assert_equal ['r1', 'r2'], DTR::EnvStore.new[:agent_runners]
+  end
+
   def fork_and_kill_process
     pid = fork_process do
       loop do

data/test/unit/thread_safe_test_result_test.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'dtr/test_unit/thread_safe_test_result'
+
+class ThreadSafeTestResultTest < Test::Unit::TestCase
+  class DRbObjectStub
+    def initialize(uri)
+      @uri = uri
+    end
+  end
+  def test_should_sort_runner_test_results
+    results = DTR::TestUnit::ThreadSafeTestResult::RunnerTestResults.new
+    runner1 = DRbObjectStub.new('runner1')
+    runner2 = DRbObjectStub.new('runner2')
+    runner3 = DRbObjectStub.new('runner3')
+    r1 = results.fetch(runner1)
+    r1.add_run
+
+    r2 = results.fetch(runner2)
+    r2.add_run
+    r2.add_run
+    r2.add_run
+
+    r3 = results.fetch(runner3)
+    r3.add_run
+    r3.add_run
+
+    assert_equal %{runner2 => 3 tests, 0 assertions, 0 failures, 0 errors
+runner3 => 2 tests, 0 assertions, 0 failures, 0 errors
+runner1 => 1 tests, 0 assertions, 0 failures, 0 errors}, results.to_s
+  end
+
+  def test_pair_should_multicast_messages
+    r1 = Test::Unit::TestResult.new
+    r2 = Test::Unit::TestResult.new
+    pair = DTR::TestUnit::ThreadSafeTestResult::Pair.new(r1, r2)
+    pair.add_run
+
+    assert_equal 1, r1.run_count
+    assert_equal 1, r2.run_count
+  end
+end

data/test/unit/working_env_test.rb

@@ -17,28 +17,22 @@ class WorkingEnvTest < Test::Unit::TestCase
     assert nil != env2
   end
 
-  def test_working_dir_within_env_should_be_based_on_host_and_pwd
+  def test_env_base_dir_should_be_based_on_host_and_pwd
     env = DTR::WorkingEnv.new
     env[:pwd] = 'pwd'
     env[:host] = 'hostname'
-    working_dir = nil
-    env.within do
-      working_dir = Dir.pwd
-    end
-    assert_equal File.expand_path('hostname/pwd'), working_dir
+    base_dir = env.base_dir
+    assert_equal File.expand_path('hostname/pwd'), base_dir
   ensure
     FileUtils.rm_rf File.expand_path('hostname')
   end
 
-  def test_should_truncate_pwd_if_it_is_too_long_for_working_dir
+  def test_should_truncate_pwd_if_it_is_too_long_for_base_dir
     env = DTR::WorkingEnv.new
     env[:pwd] = 'pwd_pwd_pwd_pwd_pwd_pwd_pwd_pwd_pwd_pwd' #40
     env[:host] = 'hostname'
-    working_dir = nil
-    env.within do
-      working_dir = Dir.pwd
-    end
-    assert_equal File.expand_path('hostname/_pwd_pwd_pwd_pwd_pwd'), working_dir
+    base_dir = env.base_dir
+    assert_equal File.expand_path('hostname/_pwd_pwd_pwd_pwd_pwd'), base_dir
   ensure
     FileUtils.rm_rf File.expand_path('hostname')
   end
@@ -47,24 +41,20 @@ class WorkingEnvTest < Test::Unit::TestCase
     env = DTR::WorkingEnv.new
     env[:pwd] = 'pwd pwd' #40
     env[:host] = 'xli.local:1234'
-    working_dir = nil
-    env.within do
-      working_dir = Dir.pwd
-    end
-    assert_equal File.expand_path('xli_local_1234/pwd_pwd'), working_dir
+    base_dir = env.base_dir
+    assert_equal File.expand_path('xli_local_1234/pwd_pwd'), base_dir
   ensure
     FileUtils.rm_rf File.expand_path('xli_local_1234')
   end
 
-  def test_working_dir_should_be_created_if_it_does_not_exist
+  def test_base_dir_should_be_created_if_it_does_not_exist
     env = DTR::WorkingEnv.new
     env[:pwd] = 'pwd'
     env[:host] = 'hostname'
 
     assert !File.exists?(File.expand_path('hostname'))
-    env.within do
-      assert File.exists?(Dir.pwd)
-    end
+    base_dir = env.base_dir
+    assert File.exists?(base_dir)
   ensure
     FileUtils.rm_rf File.expand_path('hostname')
   end

data/testdata/rails_projects/simple_project/README

@@ -0,0 +1,256 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create 
+database-backed web applications according to the Model-View-Control pattern. 
+
+This pattern splits the view (also called the presentation) into "dumb" templates
+that are primarily responsible for inserting pre-built data in between HTML tags.
+The model contains the "smart" domain objects (such as Account, Product, Person,
+Post) that holds all the business logic and knows how to persist themselves to
+a database. The controller handles the incoming requests (such as Save New Account,
+Update Product, Show Post) by manipulating the model and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails.  You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, start a new Rails application using the <tt>rails</tt> command
+   and your application name. Ex: rails myapp
+2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
+3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!"
+4. Follow the guidelines to start developing your application
+
+
+== Web Servers
+
+By default, Rails will try to use Mongrel and lighttpd if they are installed, otherwise
+Rails will use WEBrick, the webserver that ships with Ruby. When you run script/server,
+Rails will check if Mongrel exists, then lighttpd and finally fall back to WEBrick. This ensures
+that you can always get up and running quickly.
+
+Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
+suitable for development and deployment of Rails applications. If you have Ruby Gems installed,
+getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
+More info at: http://mongrel.rubyforge.org
+
+If Mongrel is not installed, Rails will look for lighttpd. It's considerably faster than
+Mongrel and WEBrick and also suited for production use, but requires additional
+installation and currently only works well on OS X/Unix (Windows users are encouraged
+to start with Mongrel). We recommend version 1.4.11 and higher. You can download it from
+http://www.lighttpd.net.
+
+And finally, if neither Mongrel or lighttpd are installed, Rails will use the built-in Ruby
+web server, WEBrick. WEBrick is a small Ruby web server suitable for development, but not
+for production.
+
+But of course its also possible to run Rails on any platform that supports FCGI.
+Apache, LiteSpeed, IIS are just a few. For more information on FCGI,
+please visit: http://wiki.rubyonrails.com/rails/pages/FastCGI
+
+
+== Apache .htaccess example
+
+# General Apache options
+AddHandler fastcgi-script .fcgi
+AddHandler cgi-script .cgi
+Options +FollowSymLinks +ExecCGI
+
+# If you don't want Rails to look in certain directories,
+# use the following rewrite rules so that Apache won't rewrite certain requests
+# 
+# Example:
+#   RewriteCond %{REQUEST_URI} ^/notrails.*
+#   RewriteRule .* - [L]
+
+# Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+# 
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+RewriteEngine On
+
+# If your Rails application is accessed via an Alias directive,
+# then you MUST also set the RewriteBase in this htaccess file.
+#
+# Example:
+#   Alias /myrailsapp /path/to/myrailsapp/public
+#   RewriteBase /myrailsapp
+
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+
+# In case Rails experiences terminal errors
+# Instead of displaying this message you can supply a file here which will be rendered instead
+# 
+# Example:
+#   ErrorDocument 500 /500.html
+
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong.  Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files.  Have "tail -f" commands running
+on the server.log and development.log. Rails will automatically display debugging
+and runtime information to these files. Debugging info will also be shown in the
+browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code using
+the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/ including:
+
+* The Learning Ruby (Pickaxe) Book: http://www.ruby-doc.org/docs/ProgrammingRuby/
+* Learn to Program: http://pine.fm/LearnToProgram/  (a beginners guide)
+
+These two online (and free) books will bring you up to speed on the Ruby language
+and also on programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your Mongrel or
+Webrick server with --debugger. This means that you can break out of execution at any point
+in the code, investigate and change the model, AND then resume execution! 
+You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'
+Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.find(:all)
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>,
+       #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better is that you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you enter "cont"
+
+
+== Console
+
+You can interact with the domain model by starting the console through <tt>script/console</tt>.
+Here you'll have all parts of the application configured, just like it is when the
+application is running. You can inspect domain models, change values, and save to the
+database. Starting the script without arguments will launch it in the development environment.
+Passing an argument will specify a different environment, like <tt>script/console production</tt>.
+
+To reload your controllers and models after launching the console run <tt>reload!</tt>
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>script/dbconsole</tt>.
+You would be connected to the database with the credentials defined in database.yml.
+Starting the script without arguments will connect you to the development database. Passing an
+argument will connect you to a different database, like <tt>script/dbconsole production</tt>.
+Currently works for mysql, postgresql and sqlite.
+
+== Description of Contents
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from ApplicationController
+  which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb.
+  Most models will descend from ActiveRecord::Base.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use eRuby
+  syntax.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the common
+  header/footer method of wrapping views. In your views, define a layout using the
+  <tt>layout :default</tt> and create a file named default.html.erb. Inside default.html.erb,
+  call <% yield %> to render the view using this layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are generated
+  for you automatically when using script/generate for controllers. Helpers can be used to
+  wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
+
+db
+  Contains the database schema in schema.rb.  db/migrate contains all
+  the sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when generated
+  using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that doesn't
+  belong under controllers, models, or helpers. This directory is in the load path.
+
+public
+  The directory available for the web server. Contains subdirectories for images, stylesheets,
+  and javascripts. Also contains the dispatchers and the default HTML files. This should be
+  set as the DOCUMENT_ROOT of your web server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the script/generate scripts, template
+  test files will be generated for you and placed in this directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins subdirectory.
+  If the app has frozen rails, those gems also go here, under vendor/rails/.
+  This directory is in the load path.