tdd_deploy 0.1.6 → 0.1.7

data/lib/tasks/tdd_deploy.rake

@@ -14,7 +14,7 @@ namespace :tdd_deploy do
   desc "deletes tdd_deploy_configs/ & all it's files"
   task :rm_configs do
     tdd_deploy_configs = './tdd_deploy_configs'
-    Dir.rm_r tdd_deploy_configs if File.exists? tdd_deploy_configs
+    FileUtils.rm_r tdd_deploy_configs if File.exists? tdd_deploy_configs
   end
   
   desc "copies tests & config templates to lib/tdd_deploy/"

data/lib/tdd_deploy/assertions.rb

@@ -131,7 +131,7 @@ module TddDeploy
     def remove_failed_tests
       tmp = {}
       Stats.test_results.each do |host, results|
-        tmp[host] = results.select { |tmp| tmp[0] }
+        tmp[host] = results.select { |tmp| tmp[0] }.uniq.sort
       end
       Stats.test_results = tmp
     end

data/lib/tdd_deploy/configurator.rb

@@ -39,7 +39,7 @@ module TddDeploy
       tdd_deploy_configs = File.join Dir.pwd, 'tdd_deploy_configs'
       Dir.mkdir(tdd_deploy_configs) unless File.exists? tdd_deploy_configs
 
-      ['balance_hosts', 'db_hosts', 'web_hosts'].each do |host_dir|
+      ['app_hosts', 'balance_hosts', 'db_hosts', 'web_hosts'].each do |host_dir|
         host_path = File.join(tdd_deploy_configs, host_dir)
         Dir.mkdir(host_path) unless File.exists? host_path
 

data/lib/tdd_deploy/copy_methods.rb

@@ -1,5 +1,6 @@
 require 'net/ssh'
 require 'net/sftp'
+require 'fileutils'
 
 module TddDeploy
   module CopyMethods
@@ -21,13 +22,79 @@ module TddDeploy
       result
     end
 
+    def copy_dir_to_remote_on_hosts_as(userid, host_list, src_dir, dest_dir)
+      raise ::ArgumentError.new("copy_dir_to_remote_on_hosts_as: src_dir does not exist: #{src_dir}") \
+          unless File.directory? src_dir
+      host_list = [host_list] if host_list.is_a? String
+      result = true
+      host_list.uniq.each do |host|
+        result &= mkdir_on_remote_as userid, host, dest_dir
+      end
+      Dir.open(src_dir).each do |fname|
+        next if fname[0] == '.'
+        path = File.join(src_dir, fname)
+        result &= copy_file_to_remote_on_hosts_as userid, host_list, path, File.join(dest_dir, fname)
+      end
+      result
+    end
+    
+    def append_string_to_remote_file_on_hosts_as userid, host_list, str, dst
+      result = true
+      host_list = [host_list] if host_list.is_a? String
+      host_list.uniq.each do |host|
+        result &= append_string_to_remote_file_as userid, host, str, dst
+      end
+      result
+    end
+
+    def append_file_to_remote_on_hosts_as userid, host_list, src, dst
+      result = true
+      host_list = [host_list] if host_list.is_a? String
+      host_list.uniq.each do |host|
+        result &= append_file_to_remote_file_as userid, host, src, dst
+      end
+      result
+    end
+
+    def append_dir_to_remote_on_hosts_as(userid, host_list, src_dir, dest_dir)
+      raise ::ArgumentError.new("append_dir_to_remote_on_hosts_as: src_dir does not exist: #{src_dir}") \
+          unless File.directory? src_dir
+      host_list = [host_list] if host_list.is_a? String
+      result = true
+      host_list.uniq.each do |host|
+        result &= mkdir_on_remote_as userid, host, dest_dir
+      end
+      Dir.open(src_dir).each do |fname|
+        next if fname[0] == '.'
+        path = File.join(src_dir, fname)
+        result &= append_file_to_remote_on_hosts_as userid, host_list, path, File.join(dest_dir, fname)
+      end
+      result
+    end
+
     #single host methods
     
     def mkdir_on_remote_as userid, host, dir, options = {}
       result = nil
       options[:permissions] = 0755 unless options.include? :permissions
       Net::SFTP.start(host, userid) do |sftp|
-        result = sftp.mkdir dir, options
+        begin
+          result = sftp.opendir! dir
+        rescue ::Net::SFTP::StatusException
+          result = sftp.mkdir dir, options
+        end
+      end
+      result
+    end
+
+    def append_string_to_remote_file_as userid, host, str, dst
+      result = nil
+      Net::SFTP.start(host, userid) do |sftp|
+        if handle = sftp.open!(dst, 'a+')
+          stat_buf = sftp.fstat! handle
+          result = sftp.write handle, stat_buf.size, str
+          sftp.close! handle
+        end
       end
       result
     end
@@ -35,17 +102,23 @@ module TddDeploy
     def copy_string_to_remote_file_as userid, host, str, dst
       result = nil
       Net::SFTP.start(host, userid) do |sftp|
-        result = sftp.file.open(dst, "w")  do |f|
+        result = sftp.file.open(dst, 'w')  do |f|
           f.write str
         end
       end
       result
     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
+      
+      append_string_to_remote_file_as userid, host, File.new(src).read, dst
+    end
+
     def copy_file_to_remote_as(userid, host, src, dst)
-      require 'net/sftp'
-      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
+      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
     end

data/lib/tdd_deploy/environ.rb

@@ -31,7 +31,8 @@ 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_path' - 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')
     # * 'site_aliases' - aliases for the site. The delimiters will depend on your web server
     # * 'site_user' - name of site user. TddDeploy assumes that each site will have a unique user on the remote host.
@@ -65,7 +66,7 @@ module TddDeploy
     # include TddDeploy::Environ
     class DataCache
       class << self
-        attr_accessor :env_hash, :env_types, :env_defaults, :capfile
+        attr_accessor :env_hash, :env_types, :env_desc, :env_defaults, :capfile
       end
     end
     
@@ -79,18 +80,18 @@ module TddDeploy
     end
     
     def env_hash=(hash)
-      raise ArgumentError.new("env_hash=(): arg must be a hash") unless hash.is_a? Hash
+      raise ::ArgumentError.new("env_hash=(): arg must be a hash") unless hash.is_a? Hash
       if !(tmp = hash.keys - DataCache.env_types.keys).empty?
-        raise ArgumentError.new("env_hash=(): Illegal Keys in value: #{tmp.join(',')}")
+        raise ::ArgumentError.new("env_hash=(): Illegal Keys in value: #{tmp.join(',')}")
       elsif !(tmp = DataCache.env_types.keys - hash.keys).empty?
-        raise ArgumentError.new("env_hash=(): Missing Keys in value: #{tmp.join(',')}")
+        raise ::ArgumentError.new("env_hash=(): Missing Keys in value: #{tmp.join(',')}")
       else
         DataCache.env_hash = hash
       end
     end
 
     def capfile
-      raise RuntimeError.new('Attempt to access capfile data w/o capfile_paths defined') unless DataCache.env_hash['capfile_paths']
+      raise ::RuntimeError.new('Attempt to access capfile data w/o capfile_paths defined') unless DataCache.env_hash['capfile_paths']
       unless DataCache.capfile
         DataCache.capfile = TddDeploy::Capfile.new
         DataCache.env_hash['capfile_paths'].each do |path|
@@ -112,7 +113,8 @@ module TddDeploy
       'site' => :string,
       'site_url' => :string,
       'site_aliases' => :string,
-      'site_path' => :string,
+      'site_doc_root' => :string,
+      'site_special_dir' => :string,
       'site_user' => :string,
 
       'app_hosts' => :list,
@@ -127,6 +129,35 @@ module TddDeploy
       'migration_hosts'  => :pseudo,
       'web' => :pseudo,
     }
+
+    DataCache.env_desc = {
+      'ssh_timeout' => "ssh activity timeout in seconds",
+      'site_base_port' => "the lowest port number used by your mongrel or thin cluster",
+      'site_num_servers' => "number of mongrel or thin servers in your cluster",
+
+      'host_admin' => "userid of the non-root administrator on all your remote hosts",
+      'local_admin' => "userid on your local host which can ssh into all hosts as host_admin, root, and site_user",
+      'local_admin_email' => "email address of the recipient of montoring email - currently put in monitrc fragments",
+
+      '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_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',
+
+      'app_hosts' => 'list of hosts the app will be installed on. Must have app stuff, like rvm, ruby, bundler, etc',
+      'balance_hosts' => 'list of hosts running load balancers',
+      'capfile_paths' => 'list of paths to Capistrano Capfile or ./config/deploy.rb or wherever you recipes are. Only used to get definitions of Capistrano roles.',
+      'db_hosts' => 'list of hosts running database servers',
+      'web_hosts' => 'list of hosts running real web servers - Apache or Nginx or ...',
+      
+      'hosts' => 'uniquified sum of app_hosts, balance_hosts, db_hosts, and web_hosts',
+      'app' => 'list of servers in the Capistrano :app role',
+      'db' => 'list of servers in the Capistrano :db role',
+      'migration_hosts'  => 'list of servers in the Capistrano :db role with :primary => truen',
+      'web' => 'list of servers in the Capistrano :web role',
+    }
     
     DataCache.env_defaults ||= {
       'ssh_timeout' => 5,
@@ -140,7 +171,8 @@ module TddDeploy
       'site' => "site",
       'site_url' => 'www.site.com',                    # don't include the scheme
       'site_aliases' => '',
-      'site_path' => '/home/site_user/site.d/current',   # default for Capistrano
+      'site_doc_root' => '/home/site_user/site/current',   # default for Capistrano
+      'site_special_dir' => '/home/site_user/site_special',
       'site_user' => "site_user",
 
       'capfile_paths' => './config/deploy.rb',
@@ -161,6 +193,10 @@ module TddDeploy
     def env_defaults
       DataCache.env_defaults
     end
+    
+    def env_desc
+      DataCache.env_desc
+    end
 
     # set_env(value_hash {}) - convenience method which sets values of the environment
     # hash using a hash rather than one-at-a-time
@@ -182,14 +218,14 @@ module TddDeploy
                   DataCache.env_hash['balance_hosts'] =
                     DataCache.env_hash['app_hosts'] = self.str_to_list(v)
             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("#{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")
             end
           else
             next
           end
         else
-          raise ArgumentError.new("#{self}#reset_env(): Illegal environment key: #{k}")
+          raise ::ArgumentError.new("#{self}#reset_env(): Illegal environment key: #{k}")
         end
       end
     end
@@ -224,10 +260,10 @@ module TddDeploy
                     self.send "#{key}=".to_sym, $2
                     # self.env_hash[key] = self.env_types[key] == :list ? self.str_to_list($2) : $2.to_s
                   else
-                    raise ArugmentError.new("TddDeploy::Environ#read_env: Error in #{TddDeploy::Error::ENV_FNAME}: #{line_no}: Illegal Key: #{key}")
+                    raise ::ArugmentError.new("TddDeploy::Environ#read_env: Error in #{TddDeploy::Error::ENV_FNAME}: #{line_no}: Illegal Key: #{key}")
                   end
                 else
-                  raise ArugmentError.new("TddDeploy::Environ#read_env: Error in #{TddDeploy::Error::ENV_FNAME}: #{line_no}: Unmatched Line: #{line}}")
+                  raise ::ArugmentError.new("TddDeploy::Environ#read_env: Error in #{TddDeploy::Error::ENV_FNAME}: #{line_no}: Unmatched Line: #{line}}")
                 end
               end
             ensure
@@ -245,7 +281,7 @@ module TddDeploy
             end
             return self.env_hash
           else
-            raise RuntimeError.new("Unable to open #{path} for reading")
+            raise ::RuntimeError.new("Unable to open #{path} for reading")
           end
         elsif dir_path.length <= 1
           # reached root level, so initialize to defaults and exit
@@ -264,7 +300,7 @@ module TddDeploy
       when str.is_a?(String) then str.split(/[\s,]+/).uniq.sort
       when str.is_a?(Array) then str.uniq.sort
       else
-        raise ArgumentError.new("str_to_list: #{str}")
+        raise ::ArgumentError.new("str_to_list: #{str}")
       end
     end
     
@@ -279,7 +315,7 @@ module TddDeploy
     # 'site_host_setup.env' [aka TddDeploy::Environ::ENV_FNAME]
     def save_env
       f = File.new(TddDeploy::Environ::ENV_FNAME, "w")
-      self.env_types.keys.each do |k|
+      self.env_types.keys.sort.each do |k|
         v = self.env_hash[k] || ''
         case self.env_types[k]
         when :int then f.write "#{k}=#{v}\n"
@@ -288,7 +324,7 @@ module TddDeploy
           f.write "#{k}=#{self.list_to_str(k)}\n" unless k == 'hosts'
         when :pseudo then next
         else
-          raise RuntimeError("unknown key: #{k}")
+          raise ::RuntimeError.new("unknown key: #{k}")
         end
       end
       f.close
@@ -349,7 +385,7 @@ module TddDeploy
             self.balance_hosts =
               self.app_hosts = self.str_to_list(list)
       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}")
+        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
     end
     

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

@@ -20,6 +20,7 @@ end
 	  }
 	  h1 { font-size: 1.4em;}
 	  h2 { font-size: 1.2em;}
+    th, td { text-align: left;}
 	  
     #test-summary {
       padding: 10px;
@@ -69,6 +70,9 @@ end
 	 }
 	 .odd { background: #eee;}
 	 .even { background: #ccc;}
+	 .red { color: #800;}
+	 .green { color: #080;}
+	 .warn { color: #f80;}
 	</style>
 	<!-- Date: 2011-08-20 -->
 </head>
@@ -81,17 +85,51 @@ end
     <% else %>
     <p id="test-summary-failed"><%= failures %> of <%= total_tests %> Tests Failed</p>
     <% end %>
-    <p><a href="/">Re-Run All Tests</a></p>
-    <p><a href="/?failed-tests=<%= failed_tests.join(',') %>">Re-Run Failed Tests</a></p>
+    <h3>Actions:</h3>
+    <table>
+      <% reset_even_odd %>
+      <tr class="<%= even_odd %>">
+        <th>Tests</th>
+        <td><a href="/">All Tests</a></td>
+        <td><a href="/?failed-tests=<%= failed_tests.join(',') %>">Failed Tests</a></td>
+      </tr>
+      <tr class="<%= even_odd %>">
+        <th>Configurator</th>
+        <td><a href="/?run_configurator">Run Configurator</a></td>
+        <td></td>
+      </tr>
+      <!-- <tr class="<%= even_odd %>">
+        <th>Installation</th>
+        <td>Site Specials</td>
+        <td>Site Config</td>
+      </tr> -->
+    </table>
   </div>  <!-- test summary -->
 
   
   <div class="env-summary">
     <h2>Host / Site environment</h2>
+    <h3>TddDeploy Variables</h3>
     <table>
+      <tr><th>Env Var (hover for info)</th><th>Current Value</th></tr>
       <% reset_even_odd %>
       <% env_hash.keys.sort.each do |k| %>
-        <tr class="<%= even_odd %>"><th class="env-key"><%= k %></th> <td class="env-value"><%= env_hash[k] %></td></tr>
+        <tr class="<%= even_odd %>"><th class="env-key" title="<%= server_obj.env_desc[k] %>"><%= k %></th> <td class="env-value"><%= env_hash[k] %></td></tr>
+      <% end %>
+    </table>
+
+    <h3>Capistrano Variables</h3>
+    <% if server_obj.app_hosts.sort != (server_obj.app + server_obj.migration_hosts).uniq.sort %>
+    <p class="warn">'app_hosts' does not match Capistrano 'app' and 'migration_hosts'</p>
+    <% end %>
+    <% if server_obj.db_hosts.uniq.sort != server_obj.db.uniq.sort %>
+    <p class="warn">'db_hosts' does not match Capistrano 'db'</p>
+    <% end %>
+    <table>
+      <% reset_even_odd %>
+      <tr><th>Cap Var (hover for info)</th><th>Current Value</th></tr>
+      <% ['app', 'db', 'migration_hosts', 'web'].each do |k| %>
+      <tr class="<%= even_odd %>"><th class="env-key" title="<%= server_obj.env_desc[k] %>"><%= k %></th><td class="env-value"><%= server_obj.send(k.to_sym) %></td></tr>
       <% end %>
     </table>
   </div>
@@ -104,7 +142,7 @@ end
     <% if File.exists? tdd_deploy_configs %>
     <table>
       <tr class="<%= even_odd %>"><td><%= tdd_deploy_configs %></td></tr>
-      <% ['balance_hosts', 'db_hosts', 'web_hosts'].each do |host_dir| %>
+      <% ['app_hosts', 'balance_hosts', 'db_hosts', 'web_hosts'].each do |host_dir| %>
       <% host_path = File.join(tdd_deploy_configs, host_dir) %>
       <% unless File.exists? host_path %>
       <tr class="<%= even_odd %>"><td></td><td><%= host_dir %> does not exist</td></tr>

data/lib/tdd_deploy/server.rb

@@ -9,6 +9,9 @@ module TddDeploy
   #
   # implements a simple 'rack' server. Methods are either used internally or called
   # from the web page during page reloads.
+  #
+  # It only displays one page - which is defined in the gem in
+  # lib/tdd_deploy/server-templates/test_results.html.erb.
   class Server < TddDeploy::Base
     LIB_DIR = File.expand_path('../..', __FILE__)
     HOST_TESTS_DIR = File.join(Dir.pwd, 'lib', 'tdd_deploy', 'host_tests')
@@ -52,7 +55,7 @@ module TddDeploy
     def call(env)
       self.query_hash = parse_query_string(env['QUERY_STRING'])
 
-      if query_hash['run_configurator']
+      if self.query_hash['run_configurator']
         require 'tdd_deploy/configurator'
         configurator = TddDeploy::Configurator.new
         configurator.make_configuration_files
@@ -162,7 +165,9 @@ module TddDeploy
       f = File.new(TEMPLATE_PATH)
       template = ERB.new f.read, nil, '<>'
       f.close
-      
+
+      # add 'server_obj' so accessors are accessible from erb template
+      server_obj = self
       template.result(binding)
     end
         

data/lib/tdd_deploy/site-erb/{db_hosts → app_hosts}/config/one_thin_server.conf.erb

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

data/lib/tdd_deploy/site-erb/{db_hosts → app_hosts}/config/thin.conf.erb

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

data/lib/tdd_deploy/site-erb/{db_hosts → app_hosts}/site/monitrc.erb

@@ -1,7 +1,7 @@
 <% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
-check process <%= site %>_server_<%= port %> with pidfile <%= "#{site_path}/tmp/pids/thin.#{port}.pid" %>
-  start process = "<%= "#{site_path}/site/thin_one_server start #{port}" %>" with timeout 60 seconds
-  stop process = "<%= "#{site_path}/site/thin_one_server stop #{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

data/lib/tdd_deploy/site-erb/{db_hosts → app_hosts}/site/one_thin_server.erb

@@ -2,5 +2,5 @@
 
 PORT=$1
 
-cd <%= site_path %>
+cd <%= site_doc_root %>
 bundle exec thin --config ./config/thin_one_server.config --port $PORT start

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

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

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

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

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

@@ -1,7 +1,7 @@
 <% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
-check process <%= site %>_server_<%= port %> with pidfile <%= "#{site_path}/tmp/pids/thin.#{port}.pid" %>
-  start process = "<%= "#{site_path}/site/thin_one_server start #{port}" %>" with timeout 60 seconds
-  stop process = "<%= "#{site_path}/site/thin_one_server stop #{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

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

@@ -9,7 +9,7 @@ upstream <%= site %> {
 server {
    listen 80;
    server_name <%= site_url %>;
-   root <%= site_path %>/current;
+   root <%= site_doc_root %>/current;
    location / {
      proxy_set_header X-Real-IP $remote_addr;
      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

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

@@ -2,5 +2,5 @@
 
 PORT=$1
 
-cd <%= site_path %>
+cd <%= site_doc_root %>
 bundle exec thin --config ./config/thin_one_server.config --port $PORT start

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

@@ -1,7 +1,7 @@
 <% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
-check process <%= site %>_server_<%= port %> with pidfile <%= "#{site_path}/tmp/pids/thin.#{port}.pid" %>
-  start process = "<%= "#{site_path}/site/thin_one_server start #{port}" %>" with timeout 60 seconds
-  stop process = "<%= "#{site_path}/site/thin_one_server stop #{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

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

@@ -9,7 +9,7 @@ upstream <%= site %> {
 server {
    listen 80;
    server_name <%= site_url %>;
-   root <%= site_path %>/current;
+   root <%= site_doc_root %>/current;
    location / {
      proxy_set_header X-Real-IP $remote_addr;
      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

data/lib/tdd_deploy/site_tests/site_layout.rb

@@ -8,44 +8,44 @@ module TddDeploy
   #
   # The sub directories tested for are:
   #
-  # * 'site_path' - DocumentRoot
-  # * 'site_path'/../releases - a standard directory used by Capistrano
-  # * 'site_path'/site/nginx.conf - an nginx configuratino fragment which tells nginx to proxy the site's *thin* servers
-  # * 'site_path'/site/monitrc - a monit configuration fragment which tells monit how to monitor the site's *thin* servers.
-  # * 'site_path'/config/thin.conf - config file for 'thin' server
-  # * 'site_path'/config/one_thin_server.conf - config file for monit to use to restart a single server instance
-  # * 'site_path'/site/one_thin_server - shell script to start a single server instance
+  # * '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
+  # * 'site_doc_root'/config/one_thin_server.conf - config file for monit to use to restart a single server instance
+  # * '~/site/nginx.conf - an nginx configuratino fragment which tells nginx to proxy the site's *thin* servers
+  # * ~/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::Base
     def test_site_subdir
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{self.site_path}"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.web_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_path}/../releases"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{self.site_doc_root}/../releases"
     end
 
-    def test_site_dir_exists
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{self.site_path}/site"
+    def test_thin_conf
+      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_doc_root}/config/thin.conf"
     end
 
-    def test_monitrc
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{self.site_path}/site/monitrc"
+    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"
     end
 
-    def test_nginx_conf
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{self.site_path}/site/nginx.conf"
+    def test_site_dir_exists
+      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_special_dir}"
     end
 
-    def test_thin_conf
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_path}/config/thin.conf"
+    def test_monitrc
+      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_special_dir}/monitrc"
     end
 
-    def test_one_thin_server_conf
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_path}/config/one_thin_server.conf"
+    def test_nginx_conf
+      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_special_dir}/nginx.conf"
     end
 
     def test_one_thin_server
-      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_path}/site/one_thin_server"
+      deploy_test_file_exists_on_hosts_as self.site_user, self.web_hosts, "#{site_special_dir}/one_thin_server"
     end
   end
 end

data/lib/tdd_deploy/site_tests/site_rvm.rb

@@ -0,0 +1,26 @@
+require 'tdd_deploy/base'
+
+module TddDeploy
+  # = TddDeploy::SiteUser
+  #
+  # tests all hosts to make sure that the local user can log on as *site_user*
+  class SiteRvm < TddDeploy::Base
+    def test_rvm
+      deploy_test_on_hosts_as self.site_user, self.app_hosts, /RVM is the Ruby/, "rvm should be installed" do
+        'source ~/.rvm/scripts/rvm ;  rvm'
+      end
+    end
+
+    def test_rvm_current
+      deploy_test_on_hosts_as self.site_user, self.app_hosts, /(ruby|jruby|rbx|ree)-\d\.\d\.\d/, "rvm current should display a ruby" do
+        'source ~/.rvm/scripts/rvm ; rvm current'
+      end
+    end
+    
+    def test_bundle_prescence
+      deploy_test_on_hosts_as self.site_user, self.app_hosts, /Bundler version/, "bundler should run" do
+        'source ~/.rvm/scripts/rvm ; bundle --version'
+      end
+    end
+  end
+end

data/lib/tdd_deploy/version.rb

@@ -1,3 +1,3 @@
 module TddDeploy
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/tests/test_configurator.rb

@@ -21,13 +21,13 @@ class TestTddDeployConfiguratorTestCase < Test::Unit::TestCase
     FileUtils.rm_rf 'tdd_deploy_configs'
     @configurator.make_configuration_files
     assert File.exists?('tdd_deploy_configs'), "tdd_deploy_configs/ exists"
-    [ 'balance_hosts', 'db_hosts', 'web_hosts'].each do |host_dir|
+    ['app_hosts', 'balance_hosts', 'db_hosts', 'web_hosts'].each do |host_dir|
       host_path = File.join('tdd_deploy_configs', host_dir)
       assert File.exists?(host_path), "#{host_path} exists"
       ['config', 'site'].each do |subdir|
         subdir_path = File.join(host_path, subdir)
         assert File.exists?(subdir_path), "#{subdir_path} exists"
-        assert Dir.new(subdir_path).entries.length > 2, "#{subdir_path} has 3 or more entries"
+        assert Dir.new(subdir_path).entries.length >= 2, "#{subdir_path} has 3 or more entries"
       end
     end
   end

data/tests/test_copy_methods.rb

@@ -18,7 +18,8 @@ class RunMethodsTestCase < Test::Unit::TestCase
 
   def teardown
     run_on_hosts_as 'site_user', 'arch', 'rm -f test-file'
-    run_on_hosts_as 'site_user', 'arch', 'rmdir test-dir'
+    run_on_hosts_as 'site_user', 'arch', 'rm -r test-dir'
+    FileUtils.rm_r 'test-dir' if File.exists? 'test-dir'
   end
   
   def test_mkdir_on_remote_as
@@ -31,6 +32,24 @@ class RunMethodsTestCase < Test::Unit::TestCase
     assert_equal "success\n", stdout, "deploy_test_file_exists_on_hosts_as says 'test-dir' removed"
   end
 
+  def test_append_string_to_remote_file_as
+    str = "line 1\nline 2\nline 3\n"
+    result = append_string_to_remote_file_as 'site_user', 'arch', str, 'test-file'
+    assert result, "append_string_to_remote_file_as returns true on success"
+    
+    stdout, stderr, cmd = run_in_ssh_session_on_host_as('site_user', 'arch', 'cat test-file')
+    assert_equal str, stdout, "test-file should exist on arch"
+    assert_nil stderr, "stderr should be nil"
+
+    result = append_string_to_remote_file_as 'site_user', 'arch', "another line\n", 'test-file'
+    assert result, "append_string_to_remote_file_as returns true on success"
+
+    stdout, stderr, cmd = run_in_ssh_session_on_host_as('site_user', 'arch', 'cat test-file')
+    assert_match /line 1/, stdout, "output should contain 'line 1'"
+    assert_match /another line/, stdout, "output should contain 'another line'"
+    assert_equal 4, stdout.split("\n").length, "output should contain 4 lines"
+  end
+
   def test_copy_string_to_remote_file_as
     str = "line 1\nline 2\nline 3\n"
     result = copy_string_to_remote_file_as 'site_user', 'arch', str, 'test-file'
@@ -58,6 +77,31 @@ class RunMethodsTestCase < Test::Unit::TestCase
       tmp_file.unlink
     end
   end
+
+  def test_append_file_to_remote_file_as
+    require 'tempfile'
+    tmp_file = Tempfile.new('foo')
+    tmp2_file = Tempfile.new('bar')
+    begin
+      input_text = "line one\nline two\nline 3\n"
+      tmp_file.write input_text
+      tmp_file.close
+      
+      input2_text = "line from file 2\n"
+      tmp2_file.write input2_text
+      tmp2_file.close
+      assert append_file_to_remote_file_as('site_user', 'arch', tmp_file.path, 'test-file'), 'copy file should work'
+      stdout, stderr, cmd = run_in_ssh_session_on_host_as 'site_user', 'arch', 'cat test-file'
+      assert_equal input_text, stdout, "remote file should contain input_text"
+
+      assert append_file_to_remote_file_as('site_user', 'arch', tmp2_file.path, 'test-file'), 'append should return true'
+      stdout, stderr, cmd = run_in_ssh_session_on_host_as 'site_user', 'arch', 'cat test-file'
+      assert_equal input_text + input2_text, stdout, "remote file should contain input_text + input2_text"
+    ensure
+      tmp_file.unlink
+      tmp2_file.unlink
+    end
+  end
   
   def test_copy_string_to_remote_on_hosts_as
     host_list = ['arch']
@@ -104,4 +148,98 @@ class RunMethodsTestCase < Test::Unit::TestCase
     end
   end
 
+  def test_copy_dir_to_remote_on_hosts_as
+    host_list = ['arch']
+    dir_name = 'test-dir'
+    Dir.mkdir dir_name unless File.exists? dir_name
+    ['foo', 'bar', 'baz'].each do |fname|
+      path = File.join(dir_name, fname)
+      f = File.new(path, 'w')
+      f.write "This is a file named #{fname}\n"
+      f.close
+    end
+    
+    assert copy_dir_to_remote_on_hosts_as('site_user', host_list, dir_name, dir_name), 'copy directory should work'
+
+    result_hash = run_on_hosts_as 'site_user', host_list, "ls"
+    assert_match Regexp.new(dir_name), result_hash['arch'][0], "ls of home should contain directory name"
+
+    result_hash = run_on_hosts_as 'site_user', host_list, "ls #{dir_name}"
+    listing = result_hash['arch'][0].split(/\n/)
+    ['foo', 'bar', 'baz'].each do |fname|
+      assert listing.include?(fname), "listing of remote directory contains '#{fname}'"
+    end
+    ['foo', 'bar', 'baz'].each do |fname|
+      path = File.join dir_name, fname
+      stdout, stderr, cmd = run_in_ssh_session_on_host_as 'site_user', 'arch', "cat #{path}"
+      assert_equal "This is a file named #{fname}\n", stdout, "copy_dir... should copy file contents of #{fname}"
+    end
+  end
+  
+  def test_append_string_to_remote_on_hosts_as_with_host_list_as_str
+    host_list = 'arch'
+    str = "line 1\nline 2\nline 3\n"
+    result = append_string_to_remote_file_on_hosts_as 'site_user', host_list, str, 'test-file'
+    assert result, "append_string_to_remote_file_as returns true on success"
+    
+    result = run_on_hosts_as('site_user', host_list, 'cat test-file')
+    refute_nil result, "run_on_hosts_as ran on #{host_list.inspect}"
+    assert_equal str, result['arch'][0], "test-file should exist on arch"
+    assert_nil result['arch'][1], "stderr should be nil"
+    
+    str2 = "another string\n"
+    assert append_string_to_remote_file_on_hosts_as 'site_user', host_list, str2, 'test-file'
+
+    result = run_on_hosts_as('site_user', host_list, 'cat test-file')
+    assert_equal str + str2, result['arch'][0], "test-file should exist on arch"
+  end
+  
+  
+  def test_append_file_to_remote_on_hosts_as
+    host_list = ['arch']
+    require 'tempfile'
+    tmp_file = Tempfile.new('foo')
+    begin
+      input_text = "line one\nline two\nline 3\n"
+      tmp_file.write input_text
+      tmp_file.close
+      assert append_file_to_remote_on_hosts_as('site_user', host_list, tmp_file.path, 'test-file'), 'should work'
+      assert append_file_to_remote_on_hosts_as('site_user', host_list, tmp_file.path, 'test-file'), 'should work'
+    
+      results = run_on_hosts_as 'site_user', host_list, 'cat test-file'
+      assert_equal input_text * 2, results['arch'][0], "remote file should contain input_text"
+    ensure
+      tmp_file.unlink
+    end
+  end
+
+  def test_append_dir_to_remote_on_hosts_as
+    host_list = ['arch']
+    dir_name = 'test-dir'
+    Dir.mkdir dir_name unless File.exists? dir_name
+    ['foo', 'bar', 'baz'].each do |fname|
+      path = File.join(dir_name, fname)
+      f = File.new(path, 'w')
+      f.write "This is a file named #{fname}\n"
+      f.close
+    end
+    
+    assert append_dir_to_remote_on_hosts_as('site_user', host_list, dir_name, dir_name), 'append directory should work'
+    assert append_dir_to_remote_on_hosts_as('site_user', host_list, dir_name, dir_name), 'append directory should work'
+
+    result_hash = run_on_hosts_as 'site_user', host_list, "ls"
+    assert_match Regexp.new(dir_name), result_hash['arch'][0], "ls of home should contain directory name"
+
+    result_hash = run_on_hosts_as 'site_user', host_list, "ls #{dir_name}"
+    listing = result_hash['arch'][0].split(/\n/)
+    ['foo', 'bar', 'baz'].each do |fname|
+      assert listing.include?(fname), "listing of remote directory contains '#{fname}'"
+    end
+    ['foo', 'bar', 'baz'].each do |fname|
+      path = File.join dir_name, fname
+      stdout, stderr, cmd = run_in_ssh_session_on_host_as 'site_user', 'arch', "cat #{path}"
+      assert_equal "This is a file named #{fname}\nThis is a file named #{fname}\n", stdout, "append_dir... should append file contents of #{fname}"
+    end
+  end
+
 end

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_path, :site_url,
+      :site, :site_user, :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,13 @@ 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_path", "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |sym|
+    "site", "site_user", "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_path", "site_url"].each do |key|
+    ["host_admin", "local_admin", "local_admin_email", "site", "site_user",  "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|
@@ -100,14 +100,14 @@ class TestEnvironTestCase < Test::Unit::TestCase
   
   def test_env_hash
     ["ssh_timeout", "site_base_port", "site_num_servers", "host_admin", "local_admin", "local_admin_email",
-    "site", "site_user", "site_path", "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |key|
+    "site", "site_user", "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_path", "site_url", 'app_hosts', "balance_hosts", "db_hosts", "web_hosts"].each do |key|
+    "site", "site_user", "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 +122,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_path", "site_url"].each do |key|
+    ["host_admin", "local_admin", "local_admin_email", "site", "site_user", "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}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdd_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2165394200 !ruby/object:Gem::Requirement
+  requirement: &2160122860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165394200
+  version_requirements: *2160122860
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &2165393520 !ruby/object:Gem::Requirement
+  requirement: &2160122180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165393520
+  version_requirements: *2160122180
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2165392800 !ruby/object:Gem::Requirement
+  requirement: &2160121720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165392800
+  version_requirements: *2160121720
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2160121060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160121060
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2165392020 !ruby/object:Gem::Requirement
+  requirement: &2160120340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *2165392020
+  version_requirements: *2160120340
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2165391360 !ruby/object:Gem::Requirement
+  requirement: &2160119700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165391360
+  version_requirements: *2160119700
 description: Test driven support for host provisioning & Capistrano deployment - for
   those who don't want to bother learning too much
 email: ! ' mike@clove.com '
@@ -99,6 +110,7 @@ files:
 - lib/tdd_deploy/server.rb
 - lib/tdd_deploy/site_tests/site_database.rb
 - lib/tdd_deploy/site_tests/site_layout.rb
+- lib/tdd_deploy/site_tests/site_rvm.rb
 - lib/tdd_deploy/site_tests/site_user.rb
 - lib/tdd_deploy/version.rb
 - lib/tdd_deploy.rb
@@ -126,21 +138,17 @@ files:
 - tests/test_tdd_deploy_server.rb
 - lib/tasks/tdd_deploy.rake
 - lib/tdd_deploy/server-templates/test_results.html.erb
+- lib/tdd_deploy/site-erb/app_hosts/config/one_thin_server.conf.erb
+- 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/db_hosts/config/one_thin_server.conf.erb
-- lib/tdd_deploy/site-erb/db_hosts/config/thin.conf.erb
-- lib/tdd_deploy/site-erb/db_hosts/site/monitrc.erb
-- lib/tdd_deploy/site-erb/db_hosts/site/nginx.conf.erb
-- lib/tdd_deploy/site-erb/db_hosts/site/one_thin_server.erb
-- lib/tdd_deploy/site-erb/web_hosts/config/one_thin_server.conf.erb
-- lib/tdd_deploy/site-erb/web_hosts/config/thin.conf.erb
 - lib/tdd_deploy/site-erb/web_hosts/site/monitrc.erb
 - lib/tdd_deploy/site-erb/web_hosts/site/nginx.conf.erb
-- lib/tdd_deploy/site-erb/web_hosts/site/one_thin_server.erb
 homepage: https://github.com/mikehoward/tdd_deploy
 licenses:
 - GPL3

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

@@ -1,29 +0,0 @@
-host {
-  
-}
-upstream <%= site %> {
-<% ((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_path %>/current;
-   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 %>;
-     }
-   }
-
-   error_page 500 502 503 504 /500.html;
-   location = /500.html {
-     root html;
-   }
-}

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

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

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

@@ -1,14 +0,0 @@
-chdir: <%= site_path %>
-environment: production
-address: 127.0.0.1
-port: <%= site_base_port %>
-timeout: 30
-log: log/thin.log
-pid: <%= site_path %>/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/web_hosts/site/one_thin_server.erb

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