tdd_deploy 0.1.8 → 0.1.9

data/lib/tdd_deploy/deploy_test_methods.rb

@@ -29,6 +29,7 @@ module TddDeploy
     end
 
     def deploy_test_file_exists_on_hosts_as(userid, host_list, path, success_msg = nil)
+      host_list = rationalize_host_list(host_list)
       deploy_test_on_hosts_as(userid, host_list, /^\s*success\s*$/, success_msg || "path #{path} should exist") do
         "test -s #{path} && echo success || echo fail"
       end

data/lib/tdd_deploy/environ.rb

@@ -393,7 +393,8 @@ module TddDeploy
       self.capfile.migration_host_list
     end
     
-    # takes the name of a list (as a string or symbol), a single string, or an array of host names
+    # takes the name of a list (as a string or symbol), a single string, or an array of host names.
+    # If it's an array, then returns uniq-ified array of strings [to handle the uniion of lists]
     def rationalize_host_list(host_list_or_list_name)
       if host_list_or_list_name.is_a? String
         return self.respond_to?(host_list_or_list_name.to_sym) ? self.send(host_list_or_list_name.to_sym) :
@@ -402,7 +403,7 @@ module TddDeploy
         return self.respond_to?(host_list_or_list_name) ? self.send(host_list_or_list_name) :
               [host_list_or_list_name.to_s]
       elsif host_list_or_list_name.is_a? Array
-        return host_list_or_list_name.map { |host| host.to_s }
+        return host_list_or_list_name.map { |host| host.to_s }.uniq
       else
         raise ArgumentError.new("rationalize_host_list(#{host_list_or_list_name.inspect}) is invalid")
       end

data/lib/tdd_deploy/server.rb

@@ -71,7 +71,7 @@ module TddDeploy
         [:app_hosts, :balance_hosts, :db_hosts, :web_hosts].each do |host_list|
           installer.install_special_files_on_host_list_as self.site_user, host_list
         end
-        query_hash['failed-tests'] = true
+        query_hash['failed-tests'] = failed_tests.join(',')
       end
       
       if self.query_hash['install_configs']
@@ -80,7 +80,7 @@ module TddDeploy
         [:app_hosts, :balance_hosts, :db_hosts, :web_hosts].each do |host_list|
           installer.install_config_files_on_host_list_as self.site_user, host_list
         end
-        query_hash['failed-tests'] = true
+        query_hash['failed-tests'] = failed_tests.join(',')
       end
       
       if self.query_hash['run_cap_deploy']

data/lib/tdd_deploy/site_tests/site_layout.rb

@@ -17,23 +17,27 @@ module TddDeploy
   # * ~/site/one_thin_server - shell script to start a single server instance
   class SiteLayout < TddDeploy::TestBase
     def test_site_subdir
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{self.site_doc_root}"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{self.site_doc_root}"
     end
 
     def test_releases_subdir
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{self.site_doc_root}/../../../releases"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{self.site_doc_root}/../../../releases"
+    end
+    
+    def test_special_dir
+      deploy_test_file_exists_on_hosts_as self.site_user, self.hosts, self.site_special_dir
     end
 
     def test_thin_conf
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_doc_root}/../config/thin.conf"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{site_doc_root}/../config/thin.conf"
     end
 
     def test_one_thin_server_conf
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_doc_root}/../config/one_thin_server.conf"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{site_doc_root}/../config/one_thin_server.conf"
     end
 
     def test_site_dir_exists
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_special_dir}"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{site_special_dir}"
     end
 
     def test_monitrc
@@ -45,7 +49,7 @@ module TddDeploy
     end
 
     def test_one_thin_server
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_special_dir}/one_thin_server"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{site_special_dir}/one_thin_server"
     end
   end
 end

data/lib/tdd_deploy/version.rb

@@ -1,3 +1,3 @@
 module TddDeploy
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/tests/test_helpers.rb

@@ -8,3 +8,6 @@ require 'bundler/setup'
 require 'test/unit'
 require 'net/ssh'
 require 'capistrano'
+
+# make sure there is an env file
+system 'touch site_host_setup.env'

data/tests/test_server.rb

@@ -10,7 +10,7 @@ class TestServerTestCase < Test::Unit::TestCase
   BIN_DIR = File.join(GEM_ROOT, 'bin')
 
   include TddDeploy::Environ
-  
+
   def setup
     # we can't create a server w/o an environment, but we flush it between tests.
     # so we have to create the enviornment file here
@@ -20,14 +20,20 @@ class TestServerTestCase < Test::Unit::TestCase
     @tester = TddDeploy::Server.new
     @tester.set_env(:web_hosts => 'arch', :db_hosts => 'arch', 
       :host_admin => 'mike', :local_admin => 'mike', :ssh_timeout => 2,
-      :site => 'site', :site_user => 'site_user')
+      :site => 'site', :site_user => 'site_user', :site_special_dir => 'non-special-special-dir')
     @tester.save_env
+    @tester.run_on_a_host_as 'site_user', 'arch', "mkdir #{@tester.site_special_dir}"
+    ['monitrc', 'one_thin_server', 'nginx.conf'].each do |fname|
+      @tester.run_on_a_host_as 'site_user', 'arch', "echo '# #{fname}' >#{@tester.site_special_dir}/#{fname}"
+    end
   end
   
   def teardown
     system('rm -f site_host_setup.env')
     TddDeploy::TestBase.flush_children_methods
     @tester.load_all_tests
+    @tester.run_on_a_host_as 'site_user', 'arch', "rm #{@tester.site_special_dir}/*"
+    @tester.run_on_a_host_as 'site_user', 'arch', "rmdir #{@tester.site_special_dir}"
     @tester = nil
   end
   

data/tests/test_site_layout.rb

@@ -6,20 +6,26 @@ class TestSiteLayoutTestCase < Test::Unit::TestCase
   def setup
     @tester = TddDeploy::SiteLayout.new
     @tester.reset_env
-    @tester.set_env :hosts => 'arch'
+    @tester.set_env :hosts => 'arch', :site_special_dir => 'non-special-special-dir'
     @tester.reset_tests
+    @tester.run_on_a_host_as 'site_user', 'arch', "mkdir #{@tester.site_special_dir}"
+    ['monitrc', 'one_thin_server', 'nginx.conf'].each do |fname|
+      @tester.run_on_a_host_as 'site_user', 'arch', "echo '# #{fname}' >#{@tester.site_special_dir}/#{fname}"
+    end
   end
 
   def teardown
+    @tester.run_on_a_host_as 'site_user', 'arch', "rm #{@tester.site_special_dir}/*"
+    @tester.run_on_a_host_as 'site_user', 'arch', "rmdir #{@tester.site_special_dir}"
     @tester = nil
   end
 
   def test_site_home
-    assert @tester.test_site_subdir, "Directory /home/#{@tester.site_user}/#{@tester.site}.d should exist"
+    assert @tester.test_site_subdir, "Directory #{@tester.site_doc_root} should exist"
   end
   
   def test_site_releases
-    assert @tester.test_releases_subdir, "Directory /home/#{@tester.site_user}/#{@tester.site}.d/releases should exist"
+    assert @tester.test_releases_subdir, "Directory #{@tester.site_doc_root}/../../releases should exist"
   end
   
   def test_site_configuration_dir_exists
@@ -27,11 +33,11 @@ class TestSiteLayoutTestCase < Test::Unit::TestCase
   end
 
   def test_site_nginx_conf
-    assert @tester.test_nginx_conf, "Directory /home/#{@tester.site_user}/site/nginx_conf should exist"
+    assert @tester.test_nginx_conf, "Directory #{@tester.site_special_dir}/nginx.conf should exist"
   end
   
   def test_site_monitrc
-    assert @tester.test_monitrc, "Directory /home/#{@tester.site_user}/site/monitrc should exist"
+    assert @tester.test_monitrc, "Directory #{@tester.site_special_dir}/monitrc should exist"
   end
   
   def test_test_thin_conf

data/tests/test_test_base.rb

@@ -5,7 +5,7 @@ require 'test_helpers'
 require 'tdd_deploy/test_base'
 require 'tdd_deploy/server'
 
-class TestBaseTestCase < Test::Unit::TestCase
+class TestTestBaseCase < Test::Unit::TestCase
   def setup
     TddDeploy::Server.new.load_all_tests
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdd_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153638900 !ruby/object:Gem::Requirement
+  requirement: &2164802500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153638900
+  version_requirements: *2164802500
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &2153638200 !ruby/object:Gem::Requirement
+  requirement: &2164801880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153638200
+  version_requirements: *2164801880
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2153637600 !ruby/object:Gem::Requirement
+  requirement: &2164801380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153637600
+  version_requirements: *2164801380
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153637000 !ruby/object:Gem::Requirement
+  requirement: &2164800800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153637000
+  version_requirements: *2164800800
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2153636080 !ruby/object:Gem::Requirement
+  requirement: &2164800220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153636080
+  version_requirements: *2164800220
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2153623700 !ruby/object:Gem::Requirement
+  requirement: &2164799700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153623700
+  version_requirements: *2164799700
 description: Test driven support for host provisioning & Capistrano deployment - for
   those who don't want to bother learning too much
 email: ! ' mike@clove.com '