tdd_deploy 0.0.1 → 0.0.3

data/lib/tdd_deploy/deploy_test_methods.rb

@@ -11,8 +11,8 @@ module TddDeploy
     # For each host, an error is declared if EITHER STDOUT does not match 'match_expr_or_str'
     # OR if the command returns anything on STDERR.
     # 'match_expr_or_str' can be a Regexp or a string (which will be converted to a Regexp)
-    def deploy_test_on_all_hosts(match_expr_or_str, err_msg, &block)
-      deploy_test_on_all_hosts_as self.host_admin, match_expr_or_str, err_msg, &block
+    def deploy_test_on_all_hosts(match_expr_or_str, success_msg, &block)
+      deploy_test_on_all_hosts_as self.host_admin, match_expr_or_str, success_msg, &block
     end
 
     # deploy_test_on_all_hosts_as runs the command(s) return by '&block' on all hosts in self.hosts
@@ -20,27 +20,27 @@ module TddDeploy
     # For each host, an error is declared if EITHER STDOUT does not match 'match_expr_or_str'
     # OR if the command returns anything on STDERR.
     # 'match_expr_or_str' can be a Regexp or a string (which will be converted to a Regexp)
-    def deploy_test_on_all_hosts_as(userid, match_expr_or_str, err_msg, &block)
+    def deploy_test_on_all_hosts_as(userid, match_expr_or_str, success_msg, &block)
       ret = true
       self.hosts.each do |host|
-        ret &= deploy_test_in_ssh_session_as userid, host, match_expr_or_str, err_msg, &block
+        ret &= deploy_test_in_ssh_session_as userid, host, match_expr_or_str, success_msg, &block
       end
       ret
     end
 
-    # deploy_test_in_ssh_session host, match_exp_or_string, err_msg, &block runs the command
+    # deploy_test_in_ssh_session host, match_exp_or_string, success_msg, &block runs the command
     # returned by 'block.call' on the specified host as user 'self.host_admin'.
     # declares an error if EITHER STDOUT does not match 'match' OR STDERR returns anything
     # 'match' can be a Regexp or a string (which will be converted to a Regexp)
-    def deploy_test_in_ssh_session(host, match, err_msg, &block)
-      deploy_test_in_ssh_session_as(self.host_admin, host, match, err_msg, &block)
+    def deploy_test_in_ssh_session(host, match, success_msg, &block)
+      deploy_test_in_ssh_session_as(self.host_admin, host, match, success_msg, &block)
     end
 
     # deploy_test_in_ssh_session_as runs the command(s) return by '&block' on the specified host
     # as user 'userid'
     # declares an error if EITHER STDOUT does not match 'match' OR STDERR returns anything
     # 'match' can be a Regexp or a string (which will be converted to a Regexp)
-    def deploy_test_in_ssh_session_as(userid, host, match, err_msg, &block)
+    def deploy_test_in_ssh_session_as(userid, host, match, success_msg, &block)
       match = Regexp.new(match) if match.is_a? String
       raise ArgumentError, 'match expression cannot be empty' if match =~ ''
 
@@ -48,14 +48,15 @@ module TddDeploy
 
       result = err_rsp.nil?
       
-      prefix = "user@host: #{userid}@#{host}"
+      prefix = "user@host: #{userid}@#{host}: #{success_msg}"
 
-      fail "<pre>\n#{prefix}: command generated error data:\n" +
-        "  command: #{cmd}\n stdout: '#{rsp}'\n stderr: '#{err_rsp}'\n</pre>" if err_rsp
+      fail "#{prefix}: command generated error data:\n" +
+        "  command: #{cmd}\n stdout: '#{rsp}'\n stderr: '#{err_rsp}'" if err_rsp
 
-      if !assert_not_nil rsp, "#{prefix}: stdout is empty for command '#{cmd}'"
+      if rsp.nil?
+        fail "#{prefix}: stdout is empty for command '#{cmd}'"
         result &= false
-      elsif !assert_match match, rsp, "#{prefix}: #{err_msg}\n rsp: #{rsp}"
+      elsif !assert_match match, rsp, prefix
         result &= false
       end
 

data/lib/tdd_deploy/host_tests/host_connection.rb

@@ -14,14 +14,14 @@ module TddDeploy
 
     # ssh_login - attempts to log in as *host_admin* on all hosts from current user
     def ssh_login
-      deploy_test_on_all_hosts "/home/#{self.host_admin}\n", "unable to connect via ssh" do
+      deploy_test_on_all_hosts "/home/#{self.host_admin}\n", "should be able to connect via ssh" do
         'pwd'
       end
     end
     
     # ssh_login_as_root - attempts to log in as *root* on all hosts from current user
     def ssh_login_as_root
-      deploy_test_on_all_hosts_as 'root', '/root', "unable to connect as root via ssh" do
+      deploy_test_on_all_hosts_as 'root', '/root', "Should be able to connect as root via ssh" do
         'pwd'
       end
     end

data/lib/tdd_deploy/host_tests/remote_monit.rb

@@ -3,13 +3,13 @@ require 'tdd_deploy/base'
 module TddDeploy
   class RemoteMonit < TddDeploy::Base
     def test_monit_installed
-      deploy_test_on_all_hosts '/usr/bin/monit', "monit is not installed" do
+      deploy_test_on_all_hosts '/usr/bin/monit', "monit should be installed" do
        'ls /usr/bin/monit'
       end
     end
 
     def test_monit_running
-      deploy_test_on_all_hosts /\smonit\s/, "monit is not running" do
+      deploy_test_on_all_hosts /\smonit\s/, "monit should be running" do
        'ps -p `cat /var/run/monit.pid`'
       end
     end

data/lib/tdd_deploy/host_tests/remote_nginx.rb

@@ -3,13 +3,13 @@ require 'tdd_deploy/base'
 module TddDeploy
   class RemoteNginx < TddDeploy::Base
     def test_nginx_installed
-      deploy_test_on_all_hosts '/usr/sbin/nginx', "nginx is not installed" do
+      deploy_test_on_all_hosts '/usr/sbin/nginx', "nginx should be installed" do
         'ls /usr/sbin/nginx'
       end
     end
 
     def test_nginx_running
-      deploy_test_on_all_hosts /\snginx\s/, "nginx is not running" do
+      deploy_test_on_all_hosts /\snginx\s/, "nginx shold be running" do
         'ps -p `cat /var/run/nginx.pid`'
       end
     end

data/lib/tdd_deploy/host_tests/remote_postfix.rb

@@ -3,21 +3,21 @@ require 'tdd_deploy/base'
 module TddDeploy
   class RemotePostfix < TddDeploy::Base
     def test_postfix_installed
-      deploy_test_on_all_hosts '/usr/sbin/postfix', "postfix is not installed" do
+      deploy_test_on_all_hosts '/usr/sbin/postfix', "postfix should be installed" do
         'ls /usr/sbin/postfix'
       end
     end
 
     def test_postfix_running
-      deploy_test_on_all_hosts_as 'root', /\smaster\s/, "postfix is not running" do
+      deploy_test_on_all_hosts_as 'root', /\smaster\s/, "postfix should be running" do
         'ps -p `cat /var/spool/postfix/pid/master.pid`'
       end
     end
 
-    # def test_postfix_accepts_mail
-    #   deploy_test_on_all_hosts "mail works\n", 'postfix accepts mail' do |host, login, userid|
-    #     "echo \"test mail\" | mail -s 'test mail' -r #{userid}@#{host} #{self.local_admin_email} && echo 'mail works'"
-    #   end
-    # end
+    def test_postfix_accepts_mail
+      deploy_test_on_all_hosts "mail works\n", 'postfix accepts mail' do |host, login, userid|
+        "echo \"test mail\" | mail -s 'test mail' -r #{userid}@#{host} #{self.local_admin_email} && echo 'mail works'"
+      end
+    end
   end
 end

data/lib/tdd_deploy/host_tests/remote_postgresql.rb

@@ -3,13 +3,13 @@ require 'tdd_deploy/base'
 module TddDeploy
   class RemotePostgresql < TddDeploy::Base
     def test_postgresql_installed
-      deploy_test_on_all_hosts "/usr/bin/postgres\n", 'postgres not installed' do |host, login, admin|
+      deploy_test_on_all_hosts "/usr/bin/postgres\n", 'postgres should be installed' do |host, login, admin|
         "ls /usr/bin/postgres"
       end
     end
 
     def test_postgresql_running
-      deploy_test_on_all_hosts /postgres\s*\|\s*postgres/, "postgresql server not running" do
+      deploy_test_on_all_hosts /postgres\s*\|\s*postgres/, "postgresql server should be running" do
         "psql --command='\\l' postgres postgres"
       end
     end

data/lib/tdd_deploy/server.rb

@@ -36,6 +36,8 @@ module TddDeploy
     
     def run_all_tests
       load_all_tests
+      
+      reset_tests
 
       ret = true
       self.test_classes.each do |klass|

data/lib/tdd_deploy/site_tests/site_database.rb

@@ -0,0 +1,15 @@
+require 'tdd_deploy/base'
+
+module TddDeploy
+  # == TddDeploy::SiteDatabase
+  #
+  #  tests to make sure a database named 'site' is defined in postgresql databases
+  class SiteDatabase < TddDeploy::Base
+
+    def test_site_db_defined
+      deploy_test_on_all_hosts "#{self.site}\s*\|\s*#{self.site}", "database for #{self.site} should exist" do
+        "psql --command='\\l' postgres postgres"
+      end
+    end
+  end
+end

data/lib/tdd_deploy/site_tests/site_user.rb

@@ -6,7 +6,7 @@ module TddDeploy
   # tests all hosts to make sure that the local user can log on as *site_user*
   class SiteUser < TddDeploy::Base
     def test_login_as_site_user
-      deploy_test_on_all_hosts_as self.site_user, "/home/#{self.site_user}", "unable to log into host as #{self.site_user}" do
+      deploy_test_on_all_hosts_as self.site_user, "/home/#{self.site_user}", "should be able to log into host as #{self.site_user}" do
         'pwd'
       end
     end

data/lib/tdd_deploy/version.rb

@@ -1,3 +1,3 @@
 module TddDeploy
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdd_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2165185440 !ruby/object:Gem::Requirement
+  requirement: &2165241880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165185440
+  version_requirements: *2165241880
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &2165184940 !ruby/object:Gem::Requirement
+  requirement: &2165241380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165184940
+  version_requirements: *2165241380
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2165184400 !ruby/object:Gem::Requirement
+  requirement: &2165240900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165184400
+  version_requirements: *2165240900
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2165183760 !ruby/object:Gem::Requirement
+  requirement: &2165240340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *2165183760
+  version_requirements: *2165240340
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2165183240 !ruby/object:Gem::Requirement
+  requirement: &2165239920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,13 +65,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165183240
+  version_requirements: *2165239920
 description: Test driven support for host provisioning & Capistrano deployment - for
   those who don't want to bother learning too much
 email: ! ' mike@clove.com '
 executables:
 - tdd_deploy_context
-- tdd_deploy_server.rb
+- tdd_deploy_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -79,7 +79,7 @@ files:
 - Gemfile
 - config.ru
 - bin/tdd_deploy_context
-- bin/tdd_deploy_server.rb
+- bin/tdd_deploy_server
 - lib/tdd_deploy/assertions.rb
 - lib/tdd_deploy/base.rb
 - lib/tdd_deploy/deploy_test_methods.rb
@@ -93,6 +93,7 @@ files:
 - lib/tdd_deploy/railengine.rb
 - lib/tdd_deploy/run_methods.rb
 - 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_user.rb
 - lib/tdd_deploy/version.rb