tdd_deploy 0.1.9 → 0.1.10

data/Gemfile

@@ -7,3 +7,6 @@ gem 'autotest-fsevent'
 
 gem 'capistrano'
 gem 'net-ping'
+
+# gem 'rack', "~> 1.2.1"
+gem 'rack'

data/bin/tdd_deploy_context

@@ -51,7 +51,7 @@ class TddDeployEnv
   end
   
   def save
-    if self.modified?
+    if self.modified? || !File.exists?(TddDeploy::Environ::ENV_FNAME)
       self.flash = 'Updates Saved'
       self.save_env
     end
@@ -60,13 +60,13 @@ class TddDeployEnv
 
   def parse_cmd(cmd)
     puts cmd
-    unless cmd =~ /^\s*(\w+)(\s+.*?)\s*$/i
+    unless cmd =~ /^\s*(\w+)(\s+.*?)?\s*$/i
       self.flash = "unable to parse command: '#{cmd}'" unless cmd.strip.empty?
       return
     end
     
     key_prefix = $1
-    param_value = $2.strip
+    param_value = $2.nil? ? '' : $2.strip
 
     key_regx = Regexp.new('^' + key_prefix, Regexp::IGNORECASE)
     matching_keys = self.env_types.keys.select { |k| key_regx.match(k) }

data/lib/tdd_deploy/copy_methods.rb

@@ -74,6 +74,7 @@ module TddDeploy
 
     #single host methods
     
+    # options are passed to Net::SFTP process. :permissions default to 0755
     def mkdir_on_remote_as userid, host, dir, options = {}
       result = nil
       options[:permissions] = 0755 unless options.include? :permissions
@@ -96,7 +97,7 @@ module TddDeploy
           sftp.close! handle
         end
       end
-      result
+      ! result.nil?
     end
 
     def copy_string_to_remote_file_as userid, host, str, dst
@@ -106,21 +107,35 @@ module TddDeploy
           f.write str
         end
       end
-      result
+      ! result.nil?
     end
 
     def append_file_to_remote_file_as(userid, host, src, dst)
       raise ::ArgumentError.new("file name cannot be empty") if src.empty?
       raise ::RuntimeError.new("unable to copy #{src} to #{userid}@#{host}: #{src} not found") unless File.exists? src
+
+      f = File.new(src)
+      file_mode = f.stat.mode & 0777
       
-      append_string_to_remote_file_as userid, host, File.new(src).read, dst
+      if (result = append_string_to_remote_file_as(userid, host, f.read, dst))
+        stdout, stderr, cmd = run_on_a_host_as(userid, host, "chmod 0#{sprintf('%o', file_mode)} #{dst}")
+        result &= stderr.nil?
+      end
+      result
     end
 
     def copy_file_to_remote_as(userid, host, src, dst)
       raise ::ArgumentError.new("file name cannot be empty") if src.empty?
       raise ::RuntimeError.new("unable to copy #{src} to #{userid}@#{host}: #{src} not found") unless File.exists? src
       
-      copy_string_to_remote_file_as userid, host, File.new(src).read, dst
+      f = File.new(src)
+      file_mode = f.stat.mode & 0777
+
+      if (result = copy_string_to_remote_file_as(userid, host, f.read, dst))
+        stdout, stderr, cmd = run_on_a_host_as(userid, host, "chmod 0#{sprintf('%o', file_mode)} #{dst}")
+        result &= stderr.nil?
+      end
+      result
     end
   end
 end

data/lib/tdd_deploy/deploy_test_methods.rb

@@ -22,7 +22,7 @@ module TddDeploy
     def deploy_test_process_running_on_hosts_as(userid, host_list, pid_file_path, success_msg = nil)
       host_list = rationalize_host_list(host_list)
       success_msg ||= "Process associated with #{pid_file_path} should be running"
-      ret = deploy_test_file_exists_on_hosts_as(userid, host_list, pid_file_path, success_msg + " no such pid file: #{pid_file_path}") ||
+      ret = deploy_test_file_exists_on_hosts_as(userid, host_list, pid_file_path, success_msg + " based on pid file: #{pid_file_path}") ||
       ret &= deploy_test_on_hosts_as(userid, host_list, /.+\n\s*\d+.*?\d\d:\d\d:\d\d/, "Process for #{pid_file_path} is running") do
         "ps -p `cat #{pid_file_path} | awk '{ print $1 ; exit }'`"
       end

data/lib/tdd_deploy/environ.rb

@@ -31,6 +31,7 @@ module TddDeploy
     # * 'local_admin' - user name of on local hosts which can ssh into remote hosts via public key authentication
     # * 'local_admin_email' - email of local admin who should receive monitoring emails
     # * 'site' - name of site This should satisfy /[a-z][a-z0-9_]*.
+    # * 'site_app_root' - the absolute path to DocumentRoot for the site
     # * 'site_doc_root' - the absolute path to DocumentRoot for the site
     # * 'site_special_dir' - absolute path to site special directory - for system configuration fragments, commands, etc
     # * 'site_url' - the url for the site (w/o scheme - as in 'www.foo.com')
@@ -48,7 +49,7 @@ module TddDeploy
     # * 'capfile_paths' - relative paths to capistrano recipe files. Defaults to './config/deploy.rb'
     #
     # === Pseudo Variables
-    # * 'hosts' - list of all hosts - always returns balance_hosts + db_hosts + web_hosts.
+    # * 'hosts' - list of all hosts - always returns app_hosts + balance_hosts + db_hosts + web_hosts.
     #may be assigned to if all three host lists are identical, otherwise raises an exception.
     #'tdd_deploy_context' hides it from view unless it can be assigned
     # * 'app' - list of all hosts in the :app role of the Capistrano recipes
@@ -113,6 +114,7 @@ module TddDeploy
       'site' => :string,
       'site_url' => :string,
       'site_aliases' => :string,
+      'site_app_root' => :string,
       'site_doc_root' => :string,
       'site_special_dir' => :string,
       'site_user' => :string,
@@ -142,7 +144,8 @@ module TddDeploy
       'site' => 'name of site - will be the name of the deployment directory - as in /home/user/site/',
       'site_url' => 'the site url - www.foo.com',
       'site_aliases' => 'all the site aliases we need to put in nginx/apache configuration fragments',
-      'site_doc_root' => 'this is DocumentRoot for the site. probably /home/site_user/site/current',
+      'site_app_root' => 'this is the root of the current app. probably /home/site_user/site/current',
+      'site_doc_root' => 'this is DocumentRoot for the site. probably /home/site_user/site/current/public',
       'site_special_dir' => 'directory for monitrc, nginx config fragments, monit commands, etc',
       'site_user' => 'userid that the app lives in. This need not be host_admin. It\' separate so multiple sites can live on the same host',
 
@@ -171,7 +174,8 @@ module TddDeploy
       'site' => "site",
       'site_url' => 'www.site.com',                    # don't include the scheme
       'site_aliases' => '',
-      'site_doc_root' => '/home/site_user/site/current',   # default for Capistrano
+      'site_app_root' => '/home/site_user/site/current',
+      'site_doc_root' => '/home/site_user/site/current/public',   # default for Capistrano
       'site_special_dir' => '/home/site_user/site_special',
       'site_user' => "site_user",
 
@@ -179,7 +183,7 @@ module TddDeploy
 
       # 'hosts' => "bar,foo",
       'app_hosts' => 'arch',
-      'balance_hosts' => 'arch',
+      'balance_hosts' => '',
       'db_hosts' => 'arch',
       'web_hosts' => 'arch',
     }
@@ -211,12 +215,12 @@ module TddDeploy
         when :pseudo then
           if k == 'hosts'
             if (tmp = DataCache.env_hash['web_hosts']) == DataCache.env_hash['db_hosts'] \
-                &&  tmp == DataCache.env_hash['balance_hosts'] \
+                &&  [] == DataCache.env_hash['balance_hosts'] \
                 &&  tmp == DataCache.env_hash['app_hosts']
               DataCache.env_hash['web_hosts'] =
                 DataCache.env_hash['db_hosts'] =
-                  DataCache.env_hash['balance_hosts'] =
-                    DataCache.env_hash['app_hosts'] = self.str_to_list(v)
+                  DataCache.env_hash['app_hosts'] = self.str_to_list(v)
+              DataCache.env_hash['balance_hosts'] = []
             else
               raise ::RuntimeError.new("#{self}#reset_env(): Cannot assign value to 'hosts' if web_hosts &/or db_hosts already set.\n web_hosts: #{DataCache.env_hash['web_hosts']}\n db_hosts: #{DataCache.env_hash['db_hosts']}")
               # raise RuntimeError.new("Cannot change hosts key if web_hosts != db_hosts")
@@ -382,8 +386,8 @@ module TddDeploy
       if (self.web_hosts.nil? && self.db_hosts.nil?) || self.web_hosts == self.db_hosts
         self.web_hosts =
           self.db_hosts =
-            self.balance_hosts =
-              self.app_hosts = self.str_to_list(list)
+            self.app_hosts = self.str_to_list(list)
+        self.balance_hosts = []
       else
         raise ::RuntimeError.new("Cannot assign value to 'hosts' if web_hosts &/or db_hosts already set.\n web_hosts: #{self.web_hosts}\n db_hosts: #{self.db_hosts}")
       end

data/lib/tdd_deploy/host_tests/remote_ip_tables.rb

@@ -9,14 +9,19 @@ module TddDeploy
   class RemoteIpTables < TddDeploy::TestBase
     # tcp_some_blocked_ports - checks TCP ports
     def tcp_some_blocked_ports
+      @port_to_check ||= [20, 23, 25, 53, 5432, 2812]
       self.hosts.each do |host|
+        result = true
         # Linode seems to refuse to block 21 - FTP control
         #  [20, 21, 23, 25, 53, 5432, 2812].each do |port|
         if self.ping_host(host)
-          [20, 23, 25, 53, 5432, 2812].each do |port|
+          @port_to_check.each do |port|
             tcp_socket = TCPSocket.new(host, port) rescue 'failed'
-            assert_equal host, 'failed', tcp_socket, "Host: #{host}: Should not be able to connect via tcp to port #{port}"
+            unless tcp_socket == 'failed'
+              result &= fail host, "Host: #{host}: iptables test: Should not be able to connect via tcp to port #{port}"
+            end
           end
+          pass host, "tcp ports #{@port_to_check.join(',')} blocked"
         else
           fail host, "Host: #{host}: iptables cannot be tested - host does not respond to ping"
         end

data/lib/tdd_deploy/installer.rb

@@ -31,7 +31,7 @@ module TddDeploy
     
     def run_cap_deploy
       stdout, stderr, cmd = run_locally { 'cap deploy:update' }
-      return fail if stderr =~ /failed|rolling back/
+      return false if stderr =~ /failed|rolling back/
       return true
     end
   end

data/lib/tdd_deploy/server-templates/test_results.html.erb

@@ -109,10 +109,10 @@ end
         <td><a href="/?install_special">Site Specials</a></td>
         <td><a href="/?install_configs">Site Config</a></td>
       </tr>
-      <tr class="<%= even_odd %>">
+      <!-- <tr class="<%= even_odd %>">
         <th>Capistrano</th>
         <td><a href="/?run_cap_deploy">run cap deploy:update</a></td>
-      </tr>
+      </tr> -->
     </table>
   </div>  <!-- test summary -->
 

data/lib/tdd_deploy/site-erb/app_hosts/config/one_thin_server.conf.erb

@@ -1,10 +1,8 @@
 ---
-chdir: <%= site_doc_root %>
+chdir: <%= site_app_root %>
 environment: production
 address: 127.0.0.1
 timeout: 30
-log: log/thin.log
-pid: <%= site_doc_root %>/tmp/pids/thin.pid
 max_conns: 1024
 max_persistent_conns: 512
 require: []

data/lib/tdd_deploy/site-erb/app_hosts/config/thin.conf.erb

@@ -1,10 +1,10 @@
-chdir: <%= site_doc_root %>
+chdir: <%= site_app_root %>
 environment: production
 address: 127.0.0.1
 port: <%= site_base_port %>
 timeout: 30
 log: log/thin.log
-pid: <%= site_doc_root %>/tmp/pids/thin.pid
+pid: <%= site_app_root %>/tmp/pids/thin.pid
 max_conns: 1024
 max_persistent_conns: 512
 require: []

data/lib/tdd_deploy/site-erb/app_hosts/site/monitrc.erb

@@ -1,11 +1,11 @@
 <% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
-check process <%= site %>_server_<%= port %> with pidfile <%= "#{site_doc_root}/tmp/pids/thin.#{port}.pid" %>
-  start process = "<%= "#{site_doc_root}/site/thin_one_server start #{port}" %>" with timeout 60 seconds
-  stop process = "<%= "#{site_doc_root}/site/thin_one_server stop #{port}" %>"
+check process <%= site %>_server_<%= port %> with pidfile <%= "#{site_app_root}/tmp/pids/thin.#{port}.pid" %>
+  start program = "/bin/su -c '<%= "#{site_special_dir}/one_thin_server start #{port}" %>' -l <%= site_user %>" with timeout 60 seconds
+  stop program = "/bin/su -c '<%= "#{site_special_dir}/one_thin_server stop #{port}" %>' -l <%= site_user %>"
   if failed host localhost port <%= port %> protocol http
      and request "/"
      then restart
   if 3 restarts within 5 cycles then timeout
   group server
   
-<% end %>
+<% end %>

data/lib/tdd_deploy/site-erb/app_hosts/site/one_thin_server.erb

@@ -1,6 +1,30 @@
 #! /bin/sh
+# must have perms 0755
 
-PORT=$1
+USEAGE="Usage: `basename $0` <stop | start> <port>"
 
-cd <%= site_doc_root %>
-bundle exec thin --config ./config/thin_one_server.config --port $PORT start
+source "$HOME/.rvm/scripts/rvm"
+
+case $# in
+  2) CMD=$1 ; PORT=$2 ;;
+  *) echo $USEAGE ; exit 1;;
+esac
+
+cd <%= site_app_root %>
+case $CMD in
+  start)
+    bundle exec thin \
+      --config <%= site_app_root %>/config/one_thin_server.conf \
+      --environment production \
+      --log <%= site_app_root %>/log/thin.${PORT}.log \
+      --pid <%= site_app_root %>/tmp/pids/thin.${PORT}.pid \
+      --port $PORT \
+      start
+      ;;
+  stop)
+      test -s ./tmp/pids/thin.${PORT}.pid && /bin/kill `cat ./tmp/pids/thin.${PORT}.pid`
+      ;;
+  *)
+    echo $USAGE ; exit 1
+    ;;
+esac

data/lib/tdd_deploy/site-erb/balance_hosts/site/monitrc.erb

@@ -1,11 +1 @@
-<% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
-check process <%= site %>_server_<%= port %> with pidfile <%= "#{site_doc_root}/tmp/pids/thin.#{port}.pid" %>
-  start process = "<%= "#{site_doc_root}/site/thin_one_server start #{port}" %>" with timeout 60 seconds
-  stop process = "<%= "#{site_doc_root}/site/thin_one_server stop #{port}" %>"
-  if failed host localhost port <%= port %> protocol http
-     and request "/"
-     then restart
-  if 3 restarts within 5 cycles then timeout
-  group server
-  
-<% end %>
+# Empty monitrc fragment

data/lib/tdd_deploy/site-erb/balance_hosts/site/nginx.conf.erb

@@ -1,29 +1,27 @@
-host {
-  
-}
+#
+# balance_host config fragment for <%= site %>
+#
 upstream <%= site %> {
-<% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
-  server 127.0.0.1:<%= port %>;
+<% web_hosts.each do |host| %>
+  server <%= host %>;
 <% end %>
 }
 server {
    listen 80;
-   server_name <%= site_url %>;
-   root <%= site_doc_root %>/current;
+   server_name <%= site_url %> <%= site_aliases %>;
    location / {
+     # proxy configuration - customarily offloaded to an include file
      proxy_set_header X-Real-IP $remote_addr;
      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
      proxy_set_header Host $http_host;
      proxy_redirect false;
-     try_files $uri $uri/index.html $uri.html @thin;
-     location / {
-       include proxy.conf;
-       proxy_pass http://<%= site %>;
-     }
-   }
+     client_max_body_size	10m;
+     client_body_buffer_size	128k;
+     proxy_connect_timeout	90;
+     proxy_send_timeout	90;
+     proxy_read_timeout	90;
+     proxy_buffers		32 4k;
 
-   error_page 500 502 503 504 /500.html;
-   location = /500.html {
-     root html;
+     proxy_pass http://<%= site %>;
    }
 }

data/lib/tdd_deploy/site-erb/web_hosts/site/monitrc.erb

@@ -1,11 +1 @@
-<% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
-check process <%= site %>_server_<%= port %> with pidfile <%= "#{site_doc_root}/tmp/pids/thin.#{port}.pid" %>
-  start process = "<%= "#{site_doc_root}/site/thin_one_server start #{port}" %>" with timeout 60 seconds
-  stop process = "<%= "#{site_doc_root}/site/thin_one_server stop #{port}" %>"
-  if failed host localhost port <%= port %> protocol http
-     and request "/"
-     then restart
-  if 3 restarts within 5 cycles then timeout
-  group server
-  
-<% end %>
+# Empty monitrc config fragment

data/lib/tdd_deploy/site-erb/web_hosts/site/nginx.conf.erb

@@ -1,29 +1,44 @@
-host {
-  
-}
+#
+# web_host config fragment for <%= site %>
+#
 upstream <%= site %> {
+  # backend servers
 <% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
   server 127.0.0.1:<%= port %>;
 <% end %>
 }
 server {
    listen 80;
-   server_name <%= site_url %>;
-   root <%= site_doc_root %>/current;
+   server_name <%= site_url %> <%= site_aliases %>;
+
+   root <%= site_doc_root %>;
+
+   access_log <%= site_app_root %>/log/<%= site %>.access.log;
+   error_log  <%= site_app_root %>/log/<%= site %>.error.log debug;
+#   access_log /etc/nginx/logs/<%= site %>.access.log;
+#   error_log  /etc/nginx/logs/<%= site %>.error.log debug;
+
    location / {
-     proxy_set_header X-Real-IP $remote_addr;
-     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-     proxy_set_header Host $http_host;
-     proxy_redirect false;
-     try_files $uri $uri/index.html $uri.html @thin;
-     location / {
-       include proxy.conf;
-       proxy_pass http://<%= site %>;
-     }
+     # proxy configuration - customarily offloaded to an include file
+     proxy_redirect		off;
+     proxy_set_header	Host	$host;
+     proxy_set_header	X-Real-IP	$remote_addr;
+     proxy_set_header	X-Forwarded-For	$proxy_add_x_forwarded_for;
+
+     try_files $uri $uri/index.html $uri.html @thin-<%= site %>;
    }
 
-   error_page 500 502 503 504 /500.html;
-   location = /500.html {
-     root html;
+   location @thin-<%= site %> {
+     # proxy configuration - customarily offloaded to an include file
+     client_max_body_size	10m;
+     client_body_buffer_size	128k;
+     proxy_connect_timeout	90;
+     proxy_send_timeout	90;
+     proxy_read_timeout	90;
+     proxy_buffers		32 4k;
+     
+     proxy_pass http://<%= site %>;
    }
+   
+   error_page  500 502 503 504 /500.html;
 }

data/lib/tdd_deploy/site_tests/site_layout.rb

@@ -8,6 +8,7 @@ module TddDeploy
   #
   # The sub directories tested for are:
   #
+  # * 'site_app_root' - application root (current installed version)
   # * 'site_doc_root' - DocumentRoot
   # * 'site_doc_root'/../releases - a standard directory used by Capistrano
   # * 'site_doc_root'/config/thin.conf - config file for 'thin' server
@@ -16,12 +17,16 @@ module TddDeploy
   # * ~/site/monitrc - a monit configuration fragment which tells monit how to monitor the site's *thin* servers.
   # * ~/site/one_thin_server - shell script to start a single server instance
   class SiteLayout < TddDeploy::TestBase
-    def test_site_subdir
+    def test_site_app_root
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{self.site_app_root}"
+    end
+
+    def test_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.app_hosts, "#{self.site_doc_root}/../../../releases"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{self.site_app_root}/../../releases"
     end
     
     def test_special_dir
@@ -29,11 +34,11 @@ module TddDeploy
     end
 
     def test_thin_conf
-      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{site_doc_root}/../config/thin.conf"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{site_app_root}/config/thin.conf"
     end
 
     def test_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"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.app_hosts, "#{site_app_root}/config/one_thin_server.conf"
     end
 
     def test_site_dir_exists

data/lib/tdd_deploy/version.rb

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

data/tests/test_copy_methods.rb

@@ -23,10 +23,12 @@ class RunMethodsTestCase < Test::Unit::TestCase
   end
   
   def test_mkdir_on_remote_as
-    result = mkdir_on_remote_as 'site_user', 'arch', 'test-dir'
+    result = mkdir_on_remote_as 'site_user', 'arch', 'test-dir', :permissions => 0555
     assert result, "mkdir_on_remote_as site_user on arch returns true"
     stdout, stderr, cmd = run_on_a_host_as 'site_user', 'arch', 'test -d test-dir && echo "success"'
     assert_equal "success\n", stdout, "deploy_test_file_exists_on_hosts_as says 'test-dir' exists"
+    stdout, stderr, cmd = run_on_a_host_as 'site_user', 'arch', 'ls -ld test-dir'
+    assert_match /^dr-xr-xr-x/, stdout, "deploy_test_file_exists_on_hosts_as says 'test-dir' exists"
     
     stdout, stderr, cmd = run_on_a_host_as 'site_user', 'arch', 'rmdir test-dir ; test -d test-dir || echo "success"'
     assert_equal "success\n", stdout, "deploy_test_file_exists_on_hosts_as says 'test-dir' removed"
@@ -64,6 +66,7 @@ class RunMethodsTestCase < Test::Unit::TestCase
     require 'tempfile'
     tmp_file = Tempfile.new('foo')
     begin
+      tmp_file_perms = tmp_file.stat.mode
       input_text = "line one\nline two\nline 3\n"
       tmp_file.write input_text
       tmp_file.close
@@ -71,6 +74,8 @@ class RunMethodsTestCase < Test::Unit::TestCase
     
       stdout, stderr, cmd = run_on_a_host_as 'site_user', 'arch', 'cat test-file'
       assert_equal input_text, stdout, "remote file should contain input_text"
+      stdout, stderr, cmd = run_on_a_host_as 'site_user', 'arch', 'ls -ld test-file'
+      assert_match /^-rw-------/, stdout, "test-file should have correct permissions"
 
       assert result, "copy should return true"
     ensure
@@ -97,6 +102,9 @@ class RunMethodsTestCase < Test::Unit::TestCase
       assert append_file_to_remote_file_as('site_user', 'arch', tmp2_file.path, 'test-file'), 'append should return true'
       stdout, stderr, cmd = run_on_a_host_as 'site_user', 'arch', 'cat test-file'
       assert_equal input_text + input2_text, stdout, "remote file should contain input_text + input2_text"
+
+      stdout, stderr, cmd = run_on_a_host_as 'site_user', 'arch', 'ls -ld test-file'
+      assert_match /^-rw-------/, stdout, "test-file should have correct permissions"
     ensure
       tmp_file.unlink
       tmp2_file.unlink

data/tests/test_environ.rb

@@ -61,7 +61,7 @@ class TestEnvironTestCase < Test::Unit::TestCase
   def test_resonse_to_instance_assessors
     [:env_hash, :ssh_timeout, :site_base_port, :site_num_servers,
       :host_admin, :local_admin, :local_admin_email,
-      :site, :site_user, :site_doc_root, :site_special_dir, :site_url,
+      :site, :site_user, :site_app_root, :site_doc_root, :site_special_dir, :site_url,
       :capfile_paths, :app, :db, :migration_hosts, :web,
       :hosts, :app_hosts, :balance_hosts, :db_hosts, :web_hosts].each do |meth|
       assert @foo.respond_to?(meth), "@foo should respond to #{meth}"
@@ -71,13 +71,14 @@ class TestEnvironTestCase < Test::Unit::TestCase
   
   def test_env_type
     ["ssh_timeout", "site_base_port", "site_num_servers", "host_admin", "local_admin", "local_admin_email",
-    "site", "site_user", "site_doc_root", "site_special_dir",  "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |sym|
+    "site", "site_user", "site_app_root", "site_doc_root", "site_special_dir",  "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |sym|
       assert @foo.env_types.keys.include?(sym.to_s), "@foo.env_types.keys includes #{sym}"
     end
     ["ssh_timeout", "site_base_port", "site_num_servers"].each do |key|
       assert_equal :int, @foo.env_types[key], "@foo.env_types[#{key}] should be :int"
     end
-    ["host_admin", "local_admin", "local_admin_email", "site", "site_user",  "site_doc_root", "site_special_dir",  "site_special_dir",  "site_url"].each do |key|
+    ["host_admin", "local_admin", "local_admin_email", "site", "site_user",  "site_app_root",
+        "site_doc_root", "site_special_dir",  "site_special_dir",  "site_url"].each do |key|
       assert_equal :string, @foo.env_types[key], "@foo.env_types[#{key}] should be :string"
     end
     ['app_hosts', "balance_hosts", "capfile_paths", "db_hosts", "web_hosts"].each do |key|
@@ -93,21 +94,22 @@ class TestEnvironTestCase < Test::Unit::TestCase
     assert_equal [], @foo.app_hosts, "assigning '' to app_hosts should create empty list"
     @foo.set_env :hosts => 'foo,bar'
     assert_equal ['bar', 'foo'], @foo.hosts, "assigning foo,bar to hosts should create ['bar', 'foo']"
-    ['app_hosts', 'web_hosts', 'db_hosts', 'balance_hosts'].each do |hst|
+    ['app_hosts', 'web_hosts', 'db_hosts'].each do |hst|
       assert_equal @foo.send(hst.to_sym), @foo.hosts, "hosts should be same as @foo.#{hst}"
     end
+    assert_equal [], @foo.balance_hosts, "balance_hosts should still be empty"
   end
   
   def test_env_hash
     ["ssh_timeout", "site_base_port", "site_num_servers", "host_admin", "local_admin", "local_admin_email",
-    "site", "site_user", "site_doc_root", "site_special_dir",  "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |key|
+    "site", "site_user", "site_app_root", "site_doc_root", "site_special_dir",  "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |key|
       assert_not_nil @foo.env_hash[key], "@foo.env_hash[#{key}] should not be nil"
     end
   end
   
   def test_env_defaults
     ["ssh_timeout", "site_base_port", "site_num_servers", "host_admin", "local_admin", "local_admin_email",
-    "site", "site_user", "site_doc_root", "site_special_dir",  "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |key|
+    "site", "site_user", "site_app_root", "site_doc_root", "site_special_dir",  "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |key|
       assert_not_nil @foo.env_defaults[key], "@foo.env_defaults[#{key}] should not be nil"
     end
   end
@@ -122,7 +124,7 @@ class TestEnvironTestCase < Test::Unit::TestCase
       @foo.send "#{key}=", tmp
       assert_equal tmp, @foo.send(key.to_sym), "@foo.#{key} should now be #{tmp}"
     end
-    ["host_admin", "local_admin", "local_admin_email", "site", "site_user", "site_doc_root", "site_special_dir",  "site_url"].each do |key|
+    ["host_admin", "local_admin", "local_admin_email", "site", "site_user", "site_app_root", "site_doc_root", "site_special_dir",  "site_url"].each do |key|
       tmp = "#{key}-changed"
       @foo.send "#{key}=", tmp
       assert_equal tmp, @foo.send(key.to_sym), "@foo.#{key} should now be #{tmp}"

data/tests/test_site_layout.rb

@@ -20,12 +20,16 @@ class TestSiteLayoutTestCase < Test::Unit::TestCase
     @tester = nil
   end
 
-  def test_site_home
-    assert @tester.test_site_subdir, "Directory #{@tester.site_doc_root} should exist"
+  def test_site_app_root
+    assert @tester.test_site_app_root, "Directory #{@tester.site_app_root} should exist"
+  end
+
+  def test_site_doc_root
+    assert @tester.test_site_doc_root, "Directory #{@tester.site_doc_root} should exist"
   end
   
   def test_site_releases
-    assert @tester.test_releases_subdir, "Directory #{@tester.site_doc_root}/../../releases should exist"
+    assert @tester.test_releases_subdir, "Directory #{@tester.site_app_root}/../releases should exist"
   end
   
   def test_site_configuration_dir_exists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdd_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2164802500 !ruby/object:Gem::Requirement
+  requirement: &2164627560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164802500
+  version_requirements: *2164627560
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &2164801880 !ruby/object:Gem::Requirement
+  requirement: &2164609200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164801880
+  version_requirements: *2164609200
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2164801380 !ruby/object:Gem::Requirement
+  requirement: &2164599580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164801380
+  version_requirements: *2164599580
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2164800800 !ruby/object:Gem::Requirement
+  requirement: &2164595860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164800800
+  version_requirements: *2164595860
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2164800220 !ruby/object:Gem::Requirement
+  requirement: &2164578920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *2164800220
+  version_requirements: *2164578920
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2164799700 !ruby/object:Gem::Requirement
+  requirement: &2164558440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164799700
+  version_requirements: *2164558440
 description: Test driven support for host provisioning & Capistrano deployment - for
   those who don't want to bother learning too much
 email: ! ' mike@clove.com '
@@ -146,11 +146,8 @@ files:
 - lib/tdd_deploy/site-erb/app_hosts/config/thin.conf.erb
 - lib/tdd_deploy/site-erb/app_hosts/site/monitrc.erb
 - lib/tdd_deploy/site-erb/app_hosts/site/one_thin_server.erb
-- lib/tdd_deploy/site-erb/balance_hosts/config/one_thin_server.conf.erb
-- lib/tdd_deploy/site-erb/balance_hosts/config/thin.conf.erb
 - lib/tdd_deploy/site-erb/balance_hosts/site/monitrc.erb
 - lib/tdd_deploy/site-erb/balance_hosts/site/nginx.conf.erb
-- lib/tdd_deploy/site-erb/balance_hosts/site/one_thin_server.erb
 - lib/tdd_deploy/site-erb/web_hosts/site/monitrc.erb
 - lib/tdd_deploy/site-erb/web_hosts/site/nginx.conf.erb
 homepage: https://github.com/mikehoward/tdd_deploy

data/lib/tdd_deploy/site-erb/balance_hosts/config/one_thin_server.conf.erb

@@ -1,14 +0,0 @@
----
-chdir: <%= site_doc_root %>
-environment: production
-address: 127.0.0.1
-timeout: 30
-log: log/thin.log
-pid: <%= site_doc_root %>/tmp/pids/thin.pid
-max_conns: 1024
-max_persistent_conns: 512
-require: []
-
-wait: 30
-server: 1
-daemonize: true

data/lib/tdd_deploy/site-erb/balance_hosts/config/thin.conf.erb

@@ -1,14 +0,0 @@
-chdir: <%= site_doc_root %>
-environment: production
-address: 127.0.0.1
-port: <%= site_base_port %>
-timeout: 30
-log: log/thin.log
-pid: <%= site_doc_root %>/tmp/pids/thin.pid
-max_conns: 1024
-max_persistent_conns: 512
-require: []
-
-wait: 30
-servers: <%= site_num_servers %>
-daemonize: true

data/lib/tdd_deploy/site-erb/balance_hosts/site/one_thin_server.erb

@@ -1,6 +0,0 @@
-#! /bin/sh
-
-PORT=$1
-
-cd <%= site_doc_root %>
-bundle exec thin --config ./config/thin_one_server.config --port $PORT start