tdd_deploy 0.1.12 → 0.1.13

data/Gemfile

@@ -10,3 +10,5 @@ gem 'net-ping'
 
 # gem 'rack', "~> 1.2.1"
 gem 'rack'
+
+gem 'pry'

data/bin/tdd_deploy_context

@@ -19,10 +19,23 @@ class TddDeployEnv
 
   def show_env
     puts "============================================="
-    self.env_types.keys.sort.each do |k|
+    self.env_types.keys.select { |k| ![:pseudo, :capfile].include? env_types[k] }.sort.each do |k|
       v = self.send(k.to_sym)
       printf "%-20s: %s\n", k, v
     end
+    
+    puts "\nPseudo Keys: (assignable ONLY if all hosts are the same)"
+    self.env_types.keys.sort.select { |k| env_types[k] == :pseudo }.each do |k|
+      v = self.send(k.to_sym)
+      printf "%-20s: %s\n", k, v
+    end
+    
+    puts "\nCap File Keys: (read only)"
+    self.env_types.keys.sort.select { |k| env_types[k] == :capfile }.each do |k|
+      v = self.send(k.to_sym)
+      printf "%-20s: %s\n", k, v
+    end
+
     if (self.web_hosts.nil? && self.db_hosts.nil?) || self.web_hosts == self.db_hosts
       printf "\n\nSpecial Key\n%-20s: %s\n", 'hosts', self.hosts, "set 'hosts' to set both web & db hosts"
     end

data/lib/tdd_deploy/deploy_test_methods.rb

@@ -58,13 +58,13 @@ module TddDeploy
       raise ArgumentError, 'match expression cannot be empty' if match =~ ''
 
       rsp, err_rsp, cmd = run_on_a_host_as(userid, host, &block)
-      prefix = "user@host: #{userid}@#{host}: #{success_msg}"
+      prefix = "user@host: #{userid}@#{host}:\n --- #{success_msg}"
 
       if err_rsp
-        return fail host, "#{prefix}: command generated error data:\n" +
+        return fail host, "#{prefix}:\n --- command generated error data:\n" +
           "  command: #{cmd}\n stdout: '#{rsp}'\n stderr: '#{err_rsp}'"
       elsif rsp.nil?
-        return fail host, "#{prefix}: stdout is empty for command '#{cmd}'"
+        return fail host, "#{prefix}:\n --- stdout is empty for command '#{cmd}'"
       else
         return assert_match host, match, rsp, prefix
       end

data/lib/tdd_deploy/environ.rb

@@ -50,8 +50,10 @@ module TddDeploy
     #
     # === Pseudo Variables
     # * '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.
+    # 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
+    #
+    # === Capfile Variables - Read Only
     # * 'app' - list of all hosts in the :app role of the Capistrano recipes
     # * 'db' - list of all hosts in the :db role of the Capistrano recipes
     # * 'migration_hosts' - list of all hosts in the :db role with option :primary => true
@@ -126,10 +128,11 @@ module TddDeploy
       'web_hosts' => :list,
       
       'hosts' => :pseudo,
-      'app' => :pseudo,
-      'db' => :pseudo,
-      'migration_hosts'  => :pseudo,
-      'web' => :pseudo,
+      
+      'app' => :capfile,
+      'db' => :capfile,
+      'migration_hosts'  => :capfile,
+      'web' => :capfile,
     }
 
     DataCache.env_desc = {
@@ -155,10 +158,11 @@ module TddDeploy
       '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',
+      'hosts' => 'unqualified 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',
+      'migration_hosts'  => 'list of servers in the Capistrano :db role with :primary => true',
       'web' => 'list of servers in the Capistrano :web role',
     }
     
@@ -212,6 +216,7 @@ module TddDeploy
         when :int then DataCache.env_hash[k] = v.to_i
         when :string then DataCache.env_hash[k] = v.to_s
         when :list then DataCache.env_hash[k] = self.str_to_list(v)
+        when :capfile then next
         when :pseudo then
           if k == 'hosts'
             if (tmp = DataCache.env_hash['web_hosts']) == DataCache.env_hash['db_hosts'] \
@@ -277,6 +282,7 @@ module TddDeploy
             (self.env_types.keys - self.env_hash.keys).each do |key|
               case self.env_types[key]
               when :pseudo then next
+              when :capfile then next
               when :list
                 self.env_hash[key] = str_to_list(self.env_defaults[key])
               else
@@ -327,6 +333,7 @@ module TddDeploy
         when :list then
           f.write "#{k}=#{self.list_to_str(k)}\n" unless k == 'hosts'
         when :pseudo then next
+        when :capfile then next
         else
           raise ::RuntimeError.new("unknown key: #{k}")
         end
@@ -341,7 +348,12 @@ module TddDeploy
       
       tmp +=<<-EOF
       def #{k}
-        self.env_hash['#{k}']
+        if '#{k}' == 'capfile_paths' && (self.env_hash['capfile_paths'].nil? || self.env_hash['capfile_paths'] == [])
+          DataCache.capfile = nil
+          self.env_hash['capfile_paths'] = self.str_to_list self.env_defaults['capfile_paths']
+        else
+          self.env_hash['#{k}']
+        end
       end
       EOF
       case DataCache.env_types[k]
@@ -361,20 +373,23 @@ module TddDeploy
         tmp +=<<-EOF
         def #{k}=(v)
          self.env_hash['#{k}'] = self.str_to_list(v)
-         DataCache.capfile = nil if '#{k}' == 'capfile_paths'
+         if '#{k}' == 'capfile_paths'
+           DataCache.capfile = nil
+           self.env_hash['capfile_paths'] = self.env_defaults['capfile_paths'] if v.nil?
+         end
+        end
+        EOF
+      when :capfile
+        tmp +=<<-EOF
+        def #{k}
+          self.capfile.role_to_host_list :#{k}
         end
         EOF
+      else
+        raise Exception.new("Internal Error: key #{k} has invalid type: #{t}")
       end
     end
     
-    ['app', 'db', 'web'].each do |k|
-      tmp +=<<-EOF
-      def #{k}
-        self.capfile.role_to_host_list :#{k}
-      end
-      EOF
-    end
-
     class_eval tmp
 
     # accessors for all defined env variables

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

@@ -211,7 +211,9 @@ end
       <% result, success_msg = msg %>
       <% test_result_index += 1 %>
       <li id="test-result-detail-<%= test_result_index %>" class="<%= even_odd %> <%= result ? 'test-result-detail-success' : 'test-result-detail-failure' %>">
+<pre>
         <%= success_msg %>
+</pre>
       </li>
       <% end %>
     </ul>

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

@@ -1,7 +1,7 @@
 #
 # balance_host config fragment for <%= site %>
 #
-upstream <%= site %> {
+upstream <%= site_url %> {
 <% web_hosts.each do |host| %>
   server <%= host %>;
 <% end %>
@@ -22,6 +22,6 @@ server {
      proxy_read_timeout	90;
      proxy_buffers		32 4k;
 
-     proxy_pass http://<%= site %>;
+     proxy_pass http://<%= site_url %>;
    }
 }

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

@@ -1,7 +1,7 @@
 #
 # web_host config fragment for <%= site %>
 #
-upstream <%= site %> {
+upstream <%= site_url %> {
   # backend servers
 <% ((site_base_port)...(site_base_port+site_num_servers)).each do |port| %>
   server 127.0.0.1:<%= port %>;
@@ -37,7 +37,7 @@ server {
      proxy_read_timeout	90;
      proxy_buffers		32 4k;
      
-     proxy_pass http://<%= site %>;
+     proxy_pass http://<%= site_url %>;
    }
    
    error_page  500 502 503 504 /500.html;

data/lib/tdd_deploy/version.rb

@@ -1,3 +1,3 @@
 module TddDeploy
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

data/tests/test_environ.rb

@@ -40,8 +40,8 @@ class TestEnvironTestCase < Test::Unit::TestCase
     @foo.clear_env
     system('TMP=/tmp/t-$$; trap "rm $TMP; exit" 0 1 2 3 15 ;cp site_host_setup.env $TMP ; sed -e 1d $TMP >site_host_setup.env')
     @foo.read_env
-    non_pseudo_keys = @foo.env_types.reject {|k,t| t == :pseudo }.keys.sort
-    assert_equal non_pseudo_keys, @foo.env_hash.keys.sort, "read_env should set all keys"
+    non_pseudo_or_capfile_keys = @foo.env_types.reject {|k,t| t == :pseudo || t == :capfile}.keys.sort
+    assert_equal non_pseudo_or_capfile_keys, @foo.env_hash.keys.sort, "read_env should set all non-pseudo and non-capfile keys"
   end
   
   def test_response_to_accessors
@@ -161,11 +161,13 @@ class TestEnvironTestCase < Test::Unit::TestCase
       case @foo.env_types[k]
       when :int then expect = 0
       when :string then expect = ''
-      when :list then expect = []
+      when :list then expect = (k == 'capfile_paths' ? [@foo.env_defaults['capfile_paths']] : [])
+      when :capfile then next
       when :pseudo then next
       end
-      assert_equal expect, @foo.env_hash[k], "After Zapping, env_hash['#{k}'] should be #{expect}"
-      assert_equal expect, @foo.send(k.to_sym), "After Zapping, @foo.#{k} should be #{expect}"
+      # order is important here - the accessors 'do things' which manipulate the hash
+      assert_equal expect, @foo.send(k.to_sym), "After Zapping, @foo.#{k} should be #{expect.inspect}"
+      assert_equal expect, @foo.env_hash[k], "After Zapping, env_hash['#{k}'] should be #{expect.inspect}"
     end
   end
 

data/tests/test_helpers.rb

@@ -3,6 +3,7 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 # Add bundler setup to load path
 require 'rubygems'
 require 'bundler/setup'
+require 'pry'
 # $:.each { |x| puts x }
 
 require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdd_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2157389080 !ruby/object:Gem::Requirement
+  requirement: &2174254660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157389080
+  version_requirements: *2174254660
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &2157388620 !ruby/object:Gem::Requirement
+  requirement: &2174254200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157388620
+  version_requirements: *2174254200
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2157388200 !ruby/object:Gem::Requirement
+  requirement: &2174253780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157388200
+  version_requirements: *2174253780
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2157387780 !ruby/object:Gem::Requirement
+  requirement: &2174253360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157387780
+  version_requirements: *2174253360
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2157387280 !ruby/object:Gem::Requirement
+  requirement: &2174252860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *2157387280
+  version_requirements: *2174252860
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2157386860 !ruby/object:Gem::Requirement
+  requirement: &2174252440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157386860
+  version_requirements: *2174252440
 description: Test driven support for host provisioning & Capistrano deployment - for
   those who don't want to bother learning too much
 email: ! ' mike@clove.com '