tdd_deploy 0.1.3 → 0.1.4

data/lib/tdd_deploy/local_tests/smoke_test.rb

@@ -0,0 +1,24 @@
+require 'tdd_deploy/base'
+
+module TddDeploy
+  # == TddDeploy::SmokeTest
+  #
+  # TddDeploy::SmokeTest is a local test for TddDeploy.
+  #
+  # it's used to test the testing framework and contains two trivial tests:
+  #
+  # * return_true
+  # * smoke
+  class SmokeTest < TddDeploy::Base
+    
+    # returns true
+    def return_true
+      true
+    end
+    
+    # returns true
+    def smoke
+      true
+    end
+  end
+end

data/lib/tdd_deploy/server.rb

@@ -16,18 +16,35 @@ module TddDeploy
     LOCAL_TESTS_DIR = File.join(Dir.pwd, 'lib', 'tdd_deploy', 'local_tests')
     TEMPLATE_PATH = File.join(LIB_DIR, 'tdd_deploy', 'server-templates', 'test_results.html.erb')
 
-    attr_accessor :test_classes, :query_hash, :failed_tests
+    attr_accessor :test_classes, :query_hash
   
-    # accepts env_hash arguments. It's just as easy to instantiate and then change
-    # the variables using self.set_env
     def initialize *args
-      @already_defined = TddDeploy.constants
+      raise RuntimeError.new("No Environment File") unless File.exists? TddDeploy::Environ::ENV_FNAME
+      super
       load_all_tests
-      if args.last.is_a? Hash
-        self.set_env args.last
-        self.save_env
+    end
+    
+    # failed_tests returns a unique, sorted list of strings. It just seemed easier to
+    # do it in the accessors than take the chance of using push, pop, etc and mucking it
+    # up - like I did before.
+    def failed_tests
+      @failed_tests ||= []
+      raise RuntimeError.new("@failed_tests is not an Array: #{@failed_tests.inspect}") unless @failed_tests.is_a? Array
+      @failed_tests = @failed_tests.map { |x| x.to_s }.uniq.sort
+    end
+    
+    # failed_tests= does the right thing for all kinds of input variations.
+    def failed_tests=(value)
+      begin
+        value = value.split(/[\s,]+/) if value.is_a? String
+        value = [value] unless value.is_a? Array
+      
+        @failed_tests = @failed_tests.to_a unless @failed_tests.is_a? Array
+
+        @failed_tests = (@failed_tests + value.map { |x| x.to_s }).uniq
+      rescue
+        @failed_tests = (@failed_tests.to_a.map { |x| x.to_s } + value.to_a.map { |x| x.to_s }).uniq.sort
       end
-      super
     end
 
     # rack interface. takes an env Hash and returns [code, headers, body]
@@ -39,6 +56,8 @@ module TddDeploy
         configurator = TddDeploy::Configurator.new
         configurator.make_configuration_files
       end
+
+      load_all_tests
       
       if query_hash['failed-tests']
         remove_failed_tests
@@ -62,7 +81,7 @@ module TddDeploy
       [TddDeploy::Server::HOST_TESTS_DIR, TddDeploy::Server::SITE_TESTS_DIR,
           TddDeploy::Server::LOCAL_TESTS_DIR].each do |dir|
         if File.exists?(dir)
-          puts "gathering tests from #{dir}"
+          # puts "gathering tests from #{dir}"
           Dir.new(dir).each do |fname|
             next if fname[0] == '.'
 
@@ -89,7 +108,7 @@ module TddDeploy
       reset_tests
 
       ret = true
-      @failed_tests = []
+      self.failed_tests = []
       self.test_classes.each do |klass|
         ret &= run_all_tests_in_class(klass)
       end
@@ -101,6 +120,7 @@ module TddDeploy
       read_env
       ret = true
       test_list = test_list.split(/[\s,]+/) if test_list.is_a? String
+      self.failed_tests -= test_list
       test_list.each do |test|
         ret &= run_a_test test
       end
@@ -109,7 +129,7 @@ module TddDeploy
 
     private
 
-    # not presently used
+    # used by 
     def run_all_tests_in_class klass
       read_env
       obj = klass.new
@@ -117,17 +137,17 @@ module TddDeploy
       # puts "#{klass}.instance_methods: #{klass.instance_methods(false)}"
       klass.instance_methods(false).each do |func|
         test_result = obj.send func.to_sym
-        @failed_tests.push(func) unless test_result
+        self.failed_tests.push(func) unless test_result
         ret &= test_result
       end
       ret
     end
     
     def run_a_test test
-      read_env
-      obj = @test_to_class_map[test].new
+      return false unless (klass = @test_to_class_map[test])
+      obj = klass.new
       test_result = obj.send test.to_sym
-      @failed_tests.push(test) unless test_result
+      self.failed_tests.push(test) unless test_result
       test_result
     end
     
@@ -145,7 +165,7 @@ module TddDeploy
     end
         
     def new_query_string
-      str = "failed-tests=" + URI.escape(@failed_tests.join(',')) unless @failed_tests.nil? || @failed_tests.empty?
+      "failed-tests=" + URI.escape(self.failed_tests.join(',')) unless @failed_tests.empty?
     end
 
   end

data/lib/tdd_deploy/version.rb

@@ -1,3 +1,3 @@
 module TddDeploy
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/tests/test_server.rb

@@ -1,16 +1,21 @@
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'test/unit'
-require 'tdd_deploy/run_methods'
+require 'tdd_deploy/environ'
+require 'tdd_deploy/server'
 
 class TestServerTestCase < Test::Unit::TestCase
   GEM_ROOT = File.expand_path('../..', __FILE__)
   BIN_DIR = File.join(GEM_ROOT, 'bin')
 
-  include TddDeploy::RunMethods
+  include TddDeploy::Environ
   
   def setup
-    require 'tdd_deploy/server'
+    # we can't create a server w/o an environment, but we flush it between tests.
+    # so we have to create the enviornment file here
+    self.reset_env
+    self.save_env
+
     @tester = TddDeploy::Server.new
     @tester.set_env(:web_hosts => 'arch', :db_hosts => 'arch', 
       :host_admin => 'mike', :local_admin => 'mike', :ssh_timeout => 2,
@@ -20,7 +25,14 @@ class TestServerTestCase < Test::Unit::TestCase
   
   def teardown
     @tester = nil
-    system('rm site_host_setup.env')
+    system('rm -f site_host_setup.env')
+  end
+  
+  def test_env_file_detection
+    File.unlink TddDeploy::Environ::ENV_FNAME
+    assert_raises RuntimeError do
+      TddDeploy::Server.new
+    end
   end
   
   def test_classes_array
@@ -35,7 +47,50 @@ class TestServerTestCase < Test::Unit::TestCase
     assert ret, "@tester should run all tests and return true: returned: #{ret.inspect}: #{failures}"
     # puts @tester.formatted_test_results
   end
+
+  def test_run_a_test
+    assert @tester.send(:run_a_test, 'return_true'), "return_true should pass"
+  end
+  
+  def test_run_some_tests
+    assert @tester.send(:run_selected_tests, 'return_true,smoke'), 'run_selected_tests should work with a string'
+    assert @tester.send(:run_selected_tests, ['return_true', 'smoke']), 'run_selected_tests can run two tests'
+  end
   
+  def test_parse_query_string
+    qs = @tester.send :parse_query_string, "foo=bar&bar=some%20stuff"
+    assert_equal 2, qs.length, "query string should have to entries"
+    assert_equal 'bar', qs['foo'], "qs['foo'] should be 'bar'"
+    assert_equal 'some stuff', qs['bar'], "qs['bar'] should be 'some stuff'"
+  end
+  
+  def test_failed_tests
+    assert @tester.failed_tests.is_a?(Array), "failed_tests is an Array"
+    @tester.failed_tests = :foo
+    assert_equal ['foo'], @tester.failed_tests, "can assign symbol to failed_tests"
+    @tester.failed_tests = 'foo'
+    assert_equal ['foo'], @tester.failed_tests, "can assign String to failed_tests"
+    @tester.failed_tests = ['foo', 'bar']
+    assert_equal ['bar','foo'], @tester.failed_tests, "can assign Array of Strings to failed_tests"
+    @tester.failed_tests = ['foo', :bar]
+    assert_equal ['bar', 'foo'], @tester.failed_tests, "can assign Array of Strings and symbols to failed_tests"
+    @tester.failed_tests.push('baz')
+    assert_equal ['bar', 'baz', 'foo'], @tester.failed_tests, "pushing string should work"
+    @tester.failed_tests.push(:snort)
+    assert_equal ['bar', 'baz', 'foo', 'snort'], @tester.failed_tests, "pushing symbol should work"
+    @tester.failed_tests.push('foo')
+    assert_equal ['bar', 'baz', 'foo', 'snort'], @tester.failed_tests, "pushing duplicate should not add entry"
+  end
+
+  def test_new_query_string
+    @tester.failed_tests = [:foo, :bar, :baz]
+    assert_equal 'failed-tests=bar,baz,foo', @tester.send(:new_query_string), "new query string should be correct"
+  end
+  
+  def test_render_results
+    assert_match /Test Results/, @tester.send(:render_results), "render results should return a page"
+  end
+
   def test_rack_interface
     code, headers, body = @tester.call({})
     assert_equal 200, code, "@tester always responds with 200"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdd_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153409860 !ruby/object:Gem::Requirement
+  requirement: &2153409660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153409860
+  version_requirements: *2153409660
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &2153409060 !ruby/object:Gem::Requirement
+  requirement: &2153409040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153409060
+  version_requirements: *2153409040
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2153397720 !ruby/object:Gem::Requirement
+  requirement: &2153397700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153397720
+  version_requirements: *2153397700
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2153397080 !ruby/object:Gem::Requirement
+  requirement: &2153397060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153397080
+  version_requirements: *2153397060
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2153396520 !ruby/object:Gem::Requirement
+  requirement: &2153396500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153396520
+  version_requirements: *2153396500
 description: Test driven support for host provisioning & Capistrano deployment - for
   those who don't want to bother learning too much
 email: ! ' mike@clove.com '
@@ -92,6 +92,7 @@ files:
 - lib/tdd_deploy/host_tests/remote_nginx.rb
 - lib/tdd_deploy/host_tests/remote_postfix.rb
 - lib/tdd_deploy/host_tests/remote_postgresql.rb
+- lib/tdd_deploy/local_tests/smoke_test.rb
 - lib/tdd_deploy/railengine.rb
 - lib/tdd_deploy/run_methods.rb
 - lib/tdd_deploy/server.rb