assert 0.4.0 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assert (0.4.0)
+    assert (0.5.0)
       ansi (~> 1.3)
       assert-view
 
@@ -9,8 +9,10 @@ GEM
   remote: http://rubygems.org/
   specs:
     ansi (1.3.0)
-    assert-view (0.1.0)
+    assert-view (0.2.0)
+      undies (~> 1.1)
     rake (0.9.2)
+    undies (1.1.0)
 
 PLATFORMS
   ruby

data/lib/assert.rb

@@ -1,11 +1,4 @@
-require 'assert/options'
-
-module Assert
-  include Assert::Options
-  options {}
-end
-
-require 'assert/setup'
+require 'assert/setup/all'
 require 'assert/autorun'
 
 Assert::Helpers.load(caller)

data/lib/assert/context.rb

@@ -33,24 +33,32 @@ module Assert
       alias_method :after_once, :teardown_once
 
       # Add a setup block to run before each test or run the list of teardown blocks in given scope
-      def setup(scope=nil, &block)
-        if block_given?
-          self.setups << block
-        elsif scope
+      def setup(scope_or_method_name = nil, &block)
+        is_method = scope_or_method_name.kind_of?(String) || scope_or_method_name.kind_of?(Symbol)
+        if block_given? || is_method
+          self.setups << (block || scope_or_method_name)
+        elsif !is_method
+          scope = scope_or_method_name
           # setup parent before child
           self.superclass.setup(scope) if self.superclass.respond_to?(:setup)
-          self.setups.each{|setup| scope.instance_eval(&setup)}
+          self.setups.each do |setup|
+            setup.kind_of?(::Proc) ? scope.instance_eval(&setup) : scope.send(setup)
+          end
         end
       end
       alias_method :before, :setup
 
       # Add a teardown block to run after each test or run the list of teardown blocks in given scope
-      def teardown(scope=nil, &block)
-        if block_given?
-          self.teardowns << block
-        elsif scope
+      def teardown(scope_or_method_name = nil, &block)
+        is_method = scope_or_method_name.kind_of?(String) || scope_or_method_name.kind_of?(Symbol)
+        if block_given? || is_method
+          self.teardowns << (block || scope_or_method_name)
+        elsif !is_method
+          scope = scope_or_method_name
           # teardown child before parent
-          self.teardowns.each{|teardown| scope.instance_eval(&teardown)}
+          self.teardowns.each do |teardown|
+            teardown.kind_of?(::Proc) ? scope.instance_eval(&teardown) : scope.send(teardown)
+          end
           self.superclass.teardown(scope) if self.superclass.respond_to?(:teardown)
         end
       end

data/lib/assert/runner.rb

@@ -9,11 +9,18 @@ module Assert
       @view = view
     end
 
-    def run(*args)
+    def run(render=true)
       @suite.setup
-      @view.render do
+
+      if render
+        # render the view, passing it a callback block to run the test suite
+        @view.render do
+          benchmark { run_suite }
+        end
+      else
         benchmark { run_suite }
       end
+
       @suite.teardown
       count(:failed) + count(:errored)
     end

data/lib/assert/setup.rb

@@ -1,6 +1,3 @@
-require 'assert/setup/suite'
-require 'assert/setup/view'
-require 'assert/setup/runner'
-require 'assert/setup/helpers'
+require 'assert/setup/all'
 
 Assert::Helpers.load(caller)

data/lib/assert/setup/all.rb

@@ -0,0 +1,5 @@
+require 'assert/setup/options'
+require 'assert/setup/suite'
+require 'assert/setup/view'
+require 'assert/setup/runner'
+require 'assert/setup/helpers'

data/lib/assert/setup/helpers.rb

@@ -10,12 +10,18 @@ module Assert
 
     class << self
 
-      # assume the test dir path is ./test and look for helpers in ./test/helper.rb
-      PACKAGE_TEST_DIR = "test"
-      PACKAGE_HELPER_FILE = "helper"
-      TEST_REGEX = /^#{PACKAGE_TEST_DIR}$|^#{PACKAGE_TEST_DIR}\/|\/#{PACKAGE_TEST_DIR}\/|\/#{PACKAGE_TEST_DIR}$/
-
       USER_TEST_HELPER = "~/.assert/options"
+      
+      # assume the test dir path is ./test and look for helpers in ./test/helper.rb
+      def package_test_dir
+        "test"
+      end
+      def package_helper_name
+        "helper"
+      end
+      def package_test_helper_regex
+        /^#{package_test_dir}$|^#{package_test_dir}\/|\/#{package_test_dir}\/|\/#{package_test_dir}$/
+      end
 
       def load(caller_info)
         if (crp = caller_root_path(caller_info))
@@ -44,7 +50,7 @@ module Assert
       end
 
       def package_helper_file(root_path)
-        File.join(root_path, PACKAGE_TEST_DIR, PACKAGE_HELPER_FILE+'.rb')
+        File.join(root_path, package_test_dir, package_helper_name + '.rb')
       end
 
       # this method inspects the caller info and finds the caller's root path
@@ -52,7 +58,7 @@ module Assert
       # parent dir of caller named TEST_DIR
       def caller_root_path(caller_info)
         caller_dirname = File.expand_path(File.dirname(caller_info[0]))
-        test_dir_pos = caller_dirname.index(TEST_REGEX)
+        test_dir_pos = caller_dirname.index(package_test_helper_regex)
         if test_dir_pos && (test_dir_pos > 0)
           caller_dirname[0..(test_dir_pos-1)]
         end

data/lib/assert/setup/options.rb

@@ -0,0 +1,6 @@
+require 'assert/options'
+
+module Assert
+  include Assert::Options
+  options {}
+end

data/lib/assert/setup/view.rb

@@ -1,11 +1,32 @@
 require 'assert/view/terminal'
+require 'assert/view/helpers/ansi'
 
 module Assert
-  # Setup the default view to render test results (override in user or package helpers)
+
+  # define an Assert::View:Terminal view that renders ansi output using the
+  # 'assert.ansi' template and setting up some styling defaults
+  class AnsiTerminal < View::Terminal
+
+    helper View::Helpers::AnsiStyles
+    options do
+      default_template        'assert.ansi'
+      default_styled          false
+      default_passed_styles   :green
+      default_failed_styles   :red, :bold
+      default_errored_styles  :yellow, :bold
+      default_skipped_styles  :cyan
+      default_ignored_styles  :magenta
+    end
+
+  end
+
+  # Setup the above view, rendering on $stdout, as the default view for assert
+  # (override in user or package helpers)
   options do
-    default_view View::Terminal.new($stdout)
+    default_view AnsiTerminal.new($stdout)
   end
 
+  # setup the global Assert.view method
   class << self
     def view; self.options.view; end
   end

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/context/class_methods_test.rb

@@ -85,10 +85,36 @@ class Assert::Context
 
 
 
+  class SetupWithMethodNameTest < ClassMethodsTest
+    desc "setup with method name"
+    setup do
+      method_name = @method_name = :setup_something_amazing
+      @context_class = Factory.context_class do
+        setup(method_name)
+      end
+      @setups = @context_class.send(:setups)
+    end
+    subject{ @setups }
+
+    should "add the method name to the context setups" do
+      assert_includes @method_name, subject
+    end
+  end
+
+
+
   class MultipleSetupsTest < ClassMethodsTest
     desc "a context class with multiple setups"
     setup do
-      @object = (Class.new{ attr_accessor :status }).new
+      method_name = :setup_something_amazing
+      klass = Class.new do
+        attr_accessor :status
+
+        define_method(method_name) do
+          self.status += " with something amazing"
+        end
+      end
+      @object = klass.new
       setup_block = @setup_block = ::Proc.new{ self.status = "the setup" }
       @parent_class = Factory.context_class do
         setup(&setup_block)
@@ -96,9 +122,10 @@ class Assert::Context
       setup_block = @setup_block = ::Proc.new{ self.status += " has been run" }
       @context_class = Factory.context_class(@parent_class) do
         setup(&setup_block)
+        setup(method_name)
       end
       @context_class.setup(@object)
-      @expected = "the setup has been run"
+      @expected = "the setup has been run with something amazing"
     end
     subject{ @object }
 
@@ -129,20 +156,47 @@ class Assert::Context
 
 
 
+  class TeardownWithMethodNameTest < ClassMethodsTest
+    desc "teardown with method name"
+    setup do
+      method_name = @method_name = "teardown_something_amazing"
+      @context_class = Factory.context_class do
+        teardown(method_name)
+      end
+      @teardowns = @context_class.send(:teardowns)
+    end
+    subject{ @teardowns }
+
+    should "add the method name to the context teardowns" do
+      assert_includes @method_name, subject
+    end
+  end
+
+
+
   class MultipleTeardownsTest < ClassMethodsTest
     desc "a context class with multiple teardowns"
     setup do
-      @object = (Class.new{ attr_accessor :status }).new
+      method_name = :teardown_something_amazing
+      klass = Class.new do
+        attr_accessor :status
+
+        define_method(method_name) do
+          self.status += " with something amazing"
+        end
+      end
+      @object = klass.new
       teardown_block = @teardown_block = ::Proc.new{ self.status += " has been run" }
       @parent_class = Factory.context_class do
         teardown(&teardown_block)
+        teardown(method_name)
       end
       teardown_block = @teardown_block = ::Proc.new{ self.status = "the teardown" }
       @context_class = Factory.context_class(@parent_class) do
         teardown(&teardown_block)
       end
       @context_class.teardown(@object)
-      @expected = "the teardown has been run"
+      @expected = "the teardown has been run with something amazing"
     end
     subject{ @object }
 

data/test/default_view_test.rb

@@ -0,0 +1,44 @@
+require 'assert'
+require 'assert/setup/view'
+
+module Assert
+
+  class DefaultViewTests < Assert::Context
+    desc "assert's default view"
+    subject { Assert.options.default_view }
+
+    should "be the AnsiTerminal" do
+      assert_kind_of AnsiTerminal, subject
+    end
+
+  end
+
+  class OptionsTests < DefaultViewTests
+    desc "options"
+    subject do
+      Assert.options.default_view.options
+    end
+
+    should "be an Options::Base object" do
+      assert_kind_of Assert::Options::Base, subject
+    end
+
+    should "default the template" do
+      assert_equal 'assert.ansi', subject.default_template
+    end
+
+    should "default the styled option" do
+      assert_equal false, subject.default_styled
+    end
+
+    should "default its result styles" do
+      assert_equal :green, subject.default_passed_styles
+      assert_equal [:red, :bold], subject.default_failed_styles
+      assert_equal :magenta, subject.default_ignored_styles
+      assert_equal :cyan, subject.default_skipped_styles
+      assert_equal [:yellow, :bold], subject.default_errored_styles
+    end
+
+  end
+
+end

data/test/runner_test.rb

@@ -17,7 +17,7 @@ class Assert::Runner
     should have_instance_methods :run, :count
 
     should "return an integer exit code" do
-      assert_equal 0, subject.run
+      assert_equal 0, subject.run(false)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -90,7 +90,9 @@ files:
 - lib/assert/result_set.rb
 - lib/assert/runner.rb
 - lib/assert/setup.rb
+- lib/assert/setup/all.rb
 - lib/assert/setup/helpers.rb
+- lib/assert/setup/options.rb
 - lib/assert/setup/runner.rb
 - lib/assert/setup/suite.rb
 - lib/assert/setup/view.rb
@@ -123,6 +125,7 @@ files:
 - test/assertions_test.rb
 - test/context/class_methods_test.rb
 - test/context_test.rb
+- test/default_view_test.rb
 - test/fixtures/inherited_stuff.rb
 - test/fixtures/sample_context.rb
 - test/helper.rb
@@ -195,6 +198,7 @@ test_files:
 - test/assertions_test.rb
 - test/context/class_methods_test.rb
 - test/context_test.rb
+- test/default_view_test.rb
 - test/fixtures/inherited_stuff.rb
 - test/fixtures/sample_context.rb
 - test/helper.rb