tdd_deploy 0.0.3 → 0.1.1

data/tests/test_server.rb

@@ -6,24 +6,20 @@ require 'tdd_deploy/run_methods'
 class TestServerTestCase < Test::Unit::TestCase
   GEM_ROOT = File.expand_path('../..', __FILE__)
   BIN_DIR = File.join(GEM_ROOT, 'bin')
-  PORT = 8809
 
   include TddDeploy::RunMethods
   
   def setup
     require 'tdd_deploy/server'
-    @tester = TddDeploy::Server.new(PORT, :web_hosts => 'arch', :db_hosts => 'arch', 
-      :host_admin => 'mike', :local_admin => 'mike', :ssh_timeout => 2)
+    @tester = TddDeploy::Server.new(:web_hosts => 'arch', :db_hosts => 'arch', 
+      :host_admin => 'mike', :local_admin => 'mike', :ssh_timeout => 2,
+      :site => 'site', :site_user => 'site_user')
   end
   
   def teardown
     @tester = nil
   end
   
-  def test_tester_accessors
-    assert_equal PORT, @tester.port, "@tester.port should be #{PORT}"
-  end
-  
   def test_classes_array
     @tester.load_all_tests
     assert_not_nil @tester.test_classes, "@tester.test_classes should not be nil"
@@ -32,8 +28,9 @@ class TestServerTestCase < Test::Unit::TestCase
   
   def test_run_all_tests
     ret = @tester.run_all_tests
-    assert ret, "@tester should run all tests and return true: #{@tester.test_failures}"
-    # puts @tester.test_results
+    failures = "\n" + (@tester.failure_messages('arch') || []).join("\n") + "\n"
+    assert ret, "@tester should run all tests and return true: returned: #{ret.inspect}: #{failures}"
+    # puts @tester.formatted_test_results
   end
   
   def test_rack_interface

data/tests/test_site_database.rb

@@ -0,0 +1,21 @@
+$:.unshift File.expand_path('..', __FILE__)
+require 'test_helpers'
+require 'tdd_deploy/site_tests/site_database'
+
+class TestSiteDatabaseTestCase < Test::Unit::TestCase
+  def setup
+    @tester = TddDeploy::SiteDatabase.new
+    @tester.reset_env
+    @tester.set_env :hosts => 'arch', :host_admin => 'mike', :local_admin => 'mike'
+  end
+
+  def teardown
+    @tester = nil
+  end
+
+  def test_site_database_test
+    assert @tester.test_site_db_defined, "Site database #{@tester.site} defined"
+  end
+end
+
+

data/tests/test_site_layout.rb

@@ -15,20 +15,35 @@ class TestSiteLayoutTestCase < Test::Unit::TestCase
   end
 
   def test_site_home
-    assert @tester.test_site_subdir, "Directory /home/#{@tester.site_user}/#{@tester.site} should exist"
+    assert @tester.test_site_subdir, "Directory /home/#{@tester.site_user}/#{@tester.site}.d should exist"
   end
   
   def test_site_releases
-    assert @tester.test_releases_subdir, "Directory /home/#{@tester.site_user}/#{@tester.site}/releases should exist"
+    assert @tester.test_releases_subdir, "Directory /home/#{@tester.site_user}/#{@tester.site}.d/releases should exist"
   end
   
+  def test_site_configuration_dir_exists
+    assert @tester.test_site_dir_exists, @tester.formatted_test_results
+  end
+
   def test_site_nginx_conf
-    assert @tester.test_nginx_conf, "Directory /home/#{@tester.site_user}/nginx_conf should exist"
+    assert @tester.test_nginx_conf, "Directory /home/#{@tester.site_user}/site/nginx_conf should exist"
   end
   
   def test_site_monitrc
-    assert @tester.test_monitrc, "Directory /home/#{@tester.site_user}/monitrc should exist"
+    assert @tester.test_monitrc, "Directory /home/#{@tester.site_user}/site/monitrc should exist"
+  end
+  
+  def test_test_thin_conf
+    assert @tester.test_thin_conf, @tester.formatted_test_results
   end
-end
 
+  def test_test_one_thin_server_conf
+    assert @tester.test_one_thin_server_conf, @tester.formatted_test_results
+  end
 
+  def test_test_one_thin_server
+    assert @tester.test_one_thin_server, @tester.formatted_test_results
+  end
+  
+end

data/tests/test_tdd_deploy_context.rb

@@ -4,12 +4,28 @@ require 'test/unit'
 require 'tdd_deploy/environ'
 require 'tdd_deploy/run_methods'
 
+class TddDeployContextHelper
+  include TddDeploy::Environ
+end
+
 class TestTddDeployContextTestCase < Test::Unit::TestCase
   GEM_ROOT = File.expand_path('../..', __FILE__)
   BIN_DIR = File.join(GEM_ROOT, 'bin')
 
   include TddDeploy::RunMethods
 
+  def setup
+    @helper = TddDeployContextHelper.new
+    @helper.reset_env
+    @helper.save_env
+  end
+
+  def teardown
+    @helper.reset_env
+    @helper.save_env
+    @helper = nil
+  end
+
   def test_set_env_rb_exists
     assert File.exists?(File.join(BIN_DIR, 'tdd_deploy_context')), "tdd_deploy_context exists"
   end

data/tests/test_tdd_deploy_server.rb

@@ -21,7 +21,7 @@ class TestTddDeployServerTestCase < Test::Unit::TestCase
   # end
 
   def test_set_env_rb_exists
-    assert File.exists?(File.join(BIN_DIR, 'tdd_deploy_server.rb')), "tdd_deploy_server exists"
+    assert File.exists?(File.join(BIN_DIR, 'tdd_deploy_server')), "tdd_deploy_server exists"
   end
   # 
   # def test_tester_accessors
@@ -36,8 +36,8 @@ class TestTddDeployServerTestCase < Test::Unit::TestCase
   # 
   # def test_run_all_tests
   #   ret = @tester.run_all_tests
-  #   assert ret, "@tester should run all tests and return true: #{@tester.test_failures}"
-  #   # puts @tester.test_results
+  #   assert ret, "@tester should run all tests and return true: #{@tester.failure_messages}"
+  #   # puts @tester.formatted_test_results
   # end
   # 
   # def test_rack_interface

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdd_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2165241880 !ruby/object:Gem::Requirement
+  requirement: &2153541160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165241880
+  version_requirements: *2153541160
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &2165241380 !ruby/object:Gem::Requirement
+  requirement: &2153540580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165241380
+  version_requirements: *2153540580
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2165240900 !ruby/object:Gem::Requirement
+  requirement: &2153540040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165240900
+  version_requirements: *2153540040
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2165240340 !ruby/object:Gem::Requirement
+  requirement: &2153539420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *2165240340
+  version_requirements: *2153539420
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2165239920 !ruby/object:Gem::Requirement
+  requirement: &2153538880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,13 +65,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165239920
+  version_requirements: *2153538880
 description: Test driven support for host provisioning & Capistrano deployment - for
   those who don't want to bother learning too much
 email: ! ' mike@clove.com '
 executables:
 - tdd_deploy_context
 - tdd_deploy_server
+- tdd_deploy_site_installer
 extensions: []
 extra_rdoc_files: []
 files:
@@ -80,8 +81,11 @@ files:
 - config.ru
 - bin/tdd_deploy_context
 - bin/tdd_deploy_server
+- bin/tdd_deploy_site_installer
 - lib/tdd_deploy/assertions.rb
 - lib/tdd_deploy/base.rb
+- lib/tdd_deploy/configurator.rb
+- lib/tdd_deploy/copy_methods.rb
 - lib/tdd_deploy/deploy_test_methods.rb
 - lib/tdd_deploy/environ.rb
 - lib/tdd_deploy/host_tests/host_connection.rb
@@ -100,7 +104,9 @@ files:
 - lib/tdd_deploy.rb
 - tests/test_assertions.rb
 - tests/test_base.rb
-- tests/test_colored_tests.rb
+- tests/test_configurator.rb
+- tests/test_copy_methods.rb
+- tests/test_deploy_test_methods.rb
 - tests/test_environ.rb
 - tests/test_helpers.rb
 - tests/test_host_tests.rb
@@ -111,13 +117,14 @@ files:
 - tests/test_remote_postgresql.rb
 - tests/test_run_methods.rb
 - tests/test_server.rb
+- tests/test_site_database.rb
 - tests/test_site_layout.rb
 - tests/test_site_user.rb
 - tests/test_tdd_deploy.rb
 - tests/test_tdd_deploy_context.rb
 - tests/test_tdd_deploy_server.rb
-- tests/test_test_deploy_methods.rb
 - lib/tasks/tdd_deploy.rake
+- lib/tasks/tdd_deploy_site_install.rake
 homepage: https://github.com/mikehoward/tdd_deploy
 licenses:
 - GPL3

data/tests/test_colored_tests.rb

@@ -1,47 +0,0 @@
-$:.unshift File.expand_path('..', __FILE__)
-require 'test_helpers'
-require 'tdd_deploy/base'
-
-# NOTES: These tests require a host to talk to. I run an Arch Linux server on my local
-# machine as a virtual host. Set up your own with appropriate accounts if you need to run
-# these tests.
-
-class ColoredResult < TddDeploy::Base
-  def passing_test
-    deploy_test_on_all_hosts 'true', 'true always passes' do
-      'echo "true"'
-    end
-  end
-  
-  def failing_test
-    deploy_test_on_all_hosts 'false', 'false always fails' do
-      'echo "true"'
-    end
-  end
-end
-
-class  ColoredResultTestCase < Test::Unit::TestCase
-  def setup
-    @tester = ColoredResult.new( { :host_admin => 'mike', :local_admin => 'mike', :db_hosts => 'arch', 
-        :web_hosts => 'arch', :ssh_timeout => 2 } )
-    @tester.reset_tests
-  end
-  
-  def teardown
-    @tester = nil
-    # we need to delete this guy so it doesn't mess up the testing of server.rb
-    TddDeploy::Base.children.delete ColoredResult
-  end
-
-  def test_passing_result
-    @tester.passing_test
-    test_results = @tester.test_results
-    assert_match 'style="color:#0c0"', test_results, "Passing Test result should be colored Green: color:#0c0"
-  end
-
-  def test_failing_result
-    @tester.failing_test
-    test_results = @tester.test_results
-    assert_match 'style="color:#c00"', test_results, "Passing Test result should be colored Red: color:#c00"
-  end
-end