xli-dtr 0.0.4 → 0.0.5

data/test/unit/working_env_test.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'dtr/agent/working_env_ext'
+DTR::WorkingEnv.send(:include, DTR::Agent::WorkingEnvExt)
+
+class WorkingEnvTest < Test::Unit::TestCase
+  def test_identifier_of_working_env
+    assert_not_equal DTR::WorkingEnv.new[:identifier], DTR::WorkingEnv.new[:identifier]
+  end
+  
+  def test_working_env_equal
+    env1 = DTR::WorkingEnv.new
+    env2 = DTR::WorkingEnv.new
+    assert_not_equal env1, env2
+    env2[:identifier] = env1[:identifier]
+    assert env1 == env2
+    assert env2 != nil
+    assert nil != env2
+  end
+
+  def test_working_dir_within_env_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
+  ensure
+    FileUtils.rm_rf File.expand_path('hostname')
+  end
+
+  def test_should_truncate_pwd_if_it_is_too_long_for_working_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
+  ensure
+    FileUtils.rm_rf File.expand_path('hostname')
+  end
+
+  def test_should_convert_non_word_and_number_in_dir_string_to_underscore
+    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
+  ensure
+    FileUtils.rm_rf File.expand_path('xli_local_1234')
+  end
+
+  def test_working_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
+  ensure
+    FileUtils.rm_rf File.expand_path('hostname')
+  end
+end

data/testdata/Rakefile

@@ -0,0 +1,15 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'dtr/raketasks'
+require 'rake/testtask'
+
+desc "Default Task"
+task :default => :dtr
+
+DTR::TestTask.new :dtr do |t|
+  t.test_files = FileList['*test_case.rb']
+  t.processes = 2
+end
+
+DTR::PackageTask.new do |p|
+  p.package_files.include("**/*")
+end

data/testdata/a_failed_test_case.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+class AFailedTestCase < Test::Unit::TestCase
+  def test_failed
+    assert false
+  end
+end
+
+

data/testdata/a_file_system_test_case.rb

@@ -0,0 +1,8 @@
+
+require 'test/unit'
+class AFileSystemTestCase < Test::Unit::TestCase
+  def test_file_exist
+    assert File.exist?(File.dirname(__FILE__) + '/a_file_system_test_case.rb')
+  end
+end
+

data/testdata/a_test_case.rb

@@ -0,0 +1,13 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/is_required_by_a_test.rb'
+class ATestCase < Test::Unit::TestCase
+
+  def test_succeeded
+    require 'pp'
+    assert eval('true')
+    assert IsRequiredByATest.ok?
+    assert_equal 'test', ENV["RAILS_ENV"]
+  end
+
+end
+

data/testdata/a_test_case2.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+class ATestCase2 < Test::Unit::TestCase
+  def test_succeeded
+    assert true
+  end
+end

data/testdata/an_error_test_case.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+class AnErrorTestCase < Test::Unit::TestCase
+  class MyError < StandardError
+  end
+  def test_error
+    raise MyError.new('error')
+  end
+end
+

data/testdata/another_project/Rakefile

@@ -0,0 +1,6 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
+require 'dtr/raketasks'
+
+DTR::PackageTask.new do |p|
+  p.package_files.include("**/*")
+end

data/testdata/another_project/passed_test_case.rb

@@ -0,0 +1,7 @@
+require 'test/unit'
+class PassedTestCase < Test::Unit::TestCase
+  def test_succeeded
+    assert_equal 'test', 'test'
+  end
+end
+

data/testdata/is_required_by_a_test.rb

@@ -0,0 +1,9 @@
+ENV["RAILS_ENV"] = "test"
+
+class IsRequiredByATest
+
+  def self.ok?
+    true
+  end
+
+end

data/testdata/lib/lib_test_case.rb

@@ -0,0 +1,7 @@
+require 'test/unit'
+class LibTestCase < Test::Unit::TestCase
+  def test_lib
+    assert_equal 2, 2
+  end
+end
+

data/testdata/package_task_test_rakefile

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'dtr/raketasks'
+
+DTR::PackageTask.new do |p|
+  p.package_files.include("lib/**/*")
+  p.package_files.include("*.rb")
+  p.package_files.exclude("*test_case.rb")
+end

data/testdata/scenario_test_case.rb

@@ -0,0 +1,34 @@
+require 'test/unit'
+class ScenarioTestCase < Test::Unit::TestCase
+  
+  def test_run_test_failed
+    assert_equal '1', '2'
+  end
+  
+  def test_run_test_passed
+    assert_eqaul '1', '1'
+  end
+  
+  def test_run_test_error
+    assert false
+  end
+
+  def test_runner_should_setup_env
+    'should'.raise.error
+  end
+
+  def test_runner_should_not_setup_env_twice
+  end
+  
+  def test_runner_should_update_code
+    assert_equal ['1'], '1' + nil
+  end
+  
+  def test_execution
+    assert nil.empty?
+  end
+  
+  def test_runner_should_rollback_popped_test
+    assert_equal ['1'], '1'
+  end
+end

data/testdata/setup_agent_env_test_case.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+class SetupAgentEnvTestCase < Test::Unit::TestCase
+
+  def test_setup_agent_env_test_case
+    assert File.exists?('/tmp/test_setup_agent_env_from_master_process')
+  end
+
+end
+

data/testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/Rakefile

@@ -0,0 +1,6 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
+require 'dtr/raketasks'
+
+DTR::PackageTask.new do |p|
+  p.package_files.include("**/*")
+end

data/testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/verify_dir_pwd_test_case.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+
+class VerifyDirPwdTestCase < Test::Unit::TestCase
+
+  def test_should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process
+    assert_equal 'should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process', Dir.pwd.split('/').last
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xli-dtr
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Li Xiao
@@ -11,16 +11,8 @@ cert_chain: []
 
 date: 2008-08-13 00:00:00 -07:00
 default_executable: dtr
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 1.0.7
-    version: 
+dependencies: []
+
 description: 
 email: iam@li-xiao.com
 executables: 
@@ -30,17 +22,51 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/dtr/base.rb
+- lib/dtr/agent/brain.rb
+- lib/dtr/agent/herald.rb
+- lib/dtr/agent/runner.rb
+- lib/dtr/agent/sync_codebase.rb
+- lib/dtr/agent/sync_logger.rb
+- lib/dtr/agent/test_unit.rb
+- lib/dtr/agent/worker.rb
+- lib/dtr/agent/working_env_ext.rb
+- lib/dtr/agent.rb
+- lib/dtr/master.rb
+- lib/dtr/monitor.rb
 - lib/dtr/raketasks.rb
-- lib/dtr/runner.rb
-- lib/dtr/service_provider.rb
+- lib/dtr/shared/adapter.rb
+- lib/dtr/shared/configuration.rb
+- lib/dtr/shared/message_decorator.rb
+- lib/dtr/shared/ruby_ext.rb
+- lib/dtr/shared/service/agent.rb
+- lib/dtr/shared/service/file.rb
+- lib/dtr/shared/service/rinda.rb
+- lib/dtr/shared/service/runner.rb
+- lib/dtr/shared/service/working_env.rb
+- lib/dtr/shared/service.rb
+- lib/dtr/shared/sync_codebase/codebase.rb
+- lib/dtr/shared/sync_codebase/master_ext.rb
+- lib/dtr/shared/sync_codebase/package.rb
+- lib/dtr/shared/sync_codebase/sync_service.rb
+- lib/dtr/shared/sync_codebase.rb
+- lib/dtr/shared/sync_logger.rb
+- lib/dtr/shared/utils/cmd.rb
+- lib/dtr/shared/utils/env_store.rb
+- lib/dtr/shared/utils/logger.rb
+- lib/dtr/shared/utils.rb
+- lib/dtr/shared/working_env.rb
+- lib/dtr/shared.rb
+- lib/dtr/test_unit/drb_test_runner.rb
+- lib/dtr/test_unit/injection.rb
+- lib/dtr/test_unit/test_case_injection.rb
+- lib/dtr/test_unit/testrunnermediator_injection.rb
+- lib/dtr/test_unit/thread_safe_test_result.rb
+- lib/dtr/test_unit/worker_club.rb
 - lib/dtr/test_unit.rb
 - lib/dtr/test_unit_injection.rb
 - lib/dtr.rb
 - bin/dtr
-- bin
 - CHANGES
-- doc
 - dtr.gemspec
 - install.rb
 - lib
@@ -74,5 +100,33 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: DTR is a distributed test runner to run tests on distributed computers for decreasing build time.
-test_files: []
-
+test_files: 
+- test/acceptance/agent_working_env_test.rb
+- test/acceptance/dtr_package_task_test.rb
+- test/acceptance/general_test.rb
+- test/acceptance/sync_codebase_test.rb
+- test/acceptance/sync_logger_test.rb
+- test/agent_helper.rb
+- test/logger_stub.rb
+- test/test_helper.rb
+- test/unit/adapter_test.rb
+- test/unit/test_unit_test.rb
+- test/unit/working_env_test.rb
+- testdata/a_failed_test_case.rb
+- testdata/a_file_system_test_case.rb
+- testdata/a_test_case.rb
+- testdata/a_test_case2.rb
+- testdata/an_error_test_case.rb
+- testdata/another_project
+- testdata/another_project/passed_test_case.rb
+- testdata/another_project/Rakefile
+- testdata/is_required_by_a_test.rb
+- testdata/lib
+- testdata/lib/lib_test_case.rb
+- testdata/package_task_test_rakefile
+- testdata/Rakefile
+- testdata/scenario_test_case.rb
+- testdata/setup_agent_env_test_case.rb
+- testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process
+- testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/Rakefile
+- testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/verify_dir_pwd_test_case.rb

data/lib/dtr/base.rb

@@ -1,172 +0,0 @@
-# Copyright (c) 2007-2008 Li Xiao
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'pstore'
-
-require 'logger'
-
-class Array
-  def blank?
-    empty?
-  end
-end
-
-class NilClass
-  def blank?
-    true
-  end
-end
-
-module DTR
-  
-  MESSAGE_KEY = :message
-  
-  def logger
-    return DTROPTIONS[:logger] if DTROPTIONS[:logger]
-    DTROPTIONS[:logger] = if DTROPTIONS[:log_level] == Logger::DEBUG
-      Logger.new(STDOUT)
-    else
-      log_file = if File.exist?('log')
-        File.join("log", DTROPTIONS[:log_file] || 'dtr.log')
-      else
-        DTROPTIONS[:log_file] || 'dtr.log'
-      end
-      Logger.new("./#{log_file}", 1, 5*1024*1024)
-    end
-    DTROPTIONS[:logger].datetime_format = "%m-%d %H:%M:%S"
-    DTROPTIONS[:logger].level = DTROPTIONS[:log_level] || Logger::INFO
-    DTROPTIONS[:logger]
-  end
-
-  def debug(message=nil, &block)
-    output(:debug, message, &block)
-  end
-  
-  def info(message=nil, &block)
-    output(:info, message, &block)
-  end
-  
-  def error(message=nil, &block)
-    output(:error, message, &block)
-  end
-  
-  def output(level, msg=nil, &block)
-    logger.send(level) do
-      message = block_given? ? block.call : msg.to_s
-      EnvStore.new << [MESSAGE_KEY, "[#{Process.pid}-#{level.to_s.upcase}] #{message}"] if DTROPTIONS[:run_with_monitor]
-      message
-    end
-  end
-  
-  def silent?
-    logger.level == Logger::ERROR
-  end
-  
-  def with_monitor
-    DTROPTIONS[:run_with_monitor] = true
-    EnvStore.new[MESSAGE_KEY] = []
-    yield
-  rescue Exception => e
-    info {"stopping by Exception => #{e.class.name}, message => #{e.message}"}
-    wait_times = 0
-    until EnvStore.new[MESSAGE_KEY].empty? || wait_times > 14
-      wait_times += 1
-      sleep(1)
-    end
-    raise e
-  end
-  
-  module_function :debug, :info, :error, :output, :with_monitor, :logger, :silent?
-  
-  class CmdInterrupt < StandardError; end
-
-  class Cmd
-    def self.execute(cmd)
-      return true if cmd.nil? || cmd.empty?
-      DTR.info {"Executing: #{cmd.inspect}"}
-      output = %x[#{cmd} 2>&1]
-      DTR.info {"Execution is done, status: #{$?.exitstatus}"}
-      DTR.error {"#{cmd.inspect} output:\n#{output}"} if $?.exitstatus != 0
-      $?.exitstatus == 0
-    end
-  end
-  
-  class EnvStore
-
-    FILE_NAME = '.dtr_env_pstore'
-
-    def self.destroy
-      File.delete(FILE_NAME) if File.exist?(FILE_NAME)
-    end
-
-    def [](key)
-      return nil unless File.exist?(FILE_NAME)
-      
-      repository = PStore.new(FILE_NAME)
-      repository.transaction(true) do
-        repository[key]
-      end
-    end
-
-    def []=(key, value)
-      repository = PStore.new(FILE_NAME)
-      repository.transaction do
-        repository[key] = value
-      end
-    end
-    
-    def <<(key_value)
-      key, value = key_value
-      repository = PStore.new(FILE_NAME)
-      repository.transaction do
-        repository[key] = (repository[key] || []) << value
-      end
-    end
-    
-    def shift(key)
-      repository = PStore.new(FILE_NAME)
-      repository.transaction do
-        if array = repository[key]
-          array.shift
-          repository[key] = array
-        end
-      end
-    end
-  end
-
-  class WorkingEnv
-  
-    @@current = nil
-    def self.refresh
-      @@current = self.new
-    end
-    
-    def self.current
-      @@current
-    end
-    
-    def initialize
-      files = (defined?($argv_dup) ? $argv_dup : []).dup
-      @env = {:libs => $LOAD_PATH.dup, :files => files, :created_at => Time.now.to_s, :dtr_master_env => ENV['DTR_MASTER_ENV'], :identifier => "#{Time.now.to_s}:#{rand}:#{object_id}"}
-    end
-    
-    def [](key)
-      @env[key]
-    end
-    
-    def to_s
-      @env.inspect
-    end
-  end
-end