baretest 0.4.0.pre2 → 0.4.0.pre3

data/MANIFEST.txt

@@ -46,6 +46,7 @@ lib/baretest/uid.rb
 lib/baretest/use/mocha.rb
 lib/baretest/use/rack_test.rb
 lib/baretest/use/rr.rb
+lib/baretest/use/support.rb
 lib/baretest/version.rb
 lib/command.rb
 lib/command/argument.rb

data/README.rdoc

@@ -104,10 +104,7 @@ Usage:
 
 == Planned Features
 
-* Passing on flags/options for formatters
-* Tagging tests to allow focusing (only run tests with/without specific tags)
 * Word-wrapping for CLI runner
-* Flags for color and verbose (\[no-]color and \[no-]verbose) for the executable
 * baretest --init \[LAYOUT], to create the necessary directory structure
 * Detect whether baretest is run from an interactive terminal or not and adjust
   defaults (no-color e.g.)
@@ -124,8 +121,6 @@ Usage:
       touched file
     end
 
-* Inline tests via Module#describe (basically the same as Test::Suite#suite)
-* YARD code to extract the specifications without running the code
 * A redmine plugin
 * --fail-all flag, to test/review diagnostics of tests (no idea how to do that yet)
 
@@ -138,7 +133,7 @@ Usage:
 
 == A Bit of Background
 
-Originally, bare-test started out as a project for shits & giggles on the flight
+Originally, baretest started out as a project for shits & giggles on the flight
 back from vegas (railsconf09), to prove that it is possible to have a fully
 fledged test-framework in under 100 lines of source-code.
 Later I realized that this project could become more. For one it was (still is)

data/lib/baretest/assertion.rb

@@ -111,7 +111,7 @@ module BareTest
     # containing suite.
     def execute(with_setup=nil, and_teardown=nil)
       if @skipped then
-        status = Status.new(self, :manually_skipped)
+        status = Status.new(self, :manually_skipped, nil, @skipped)
       elsif !@block
         status = Status.new(self, :pending)
       else

data/lib/baretest/run/cli.rb

@@ -100,13 +100,17 @@ module BareTest
 
       def run_suite(suite)
         return super unless suite.description
+
+        indent      = "           #{'  '*@depth}"
+        skip_reason = suite.reason(:indent => indent+'  ', :first_indent => indent+'  Reason: ')
+
         case size = suite.assertions.size
           when 0
-            defer "\n           \e[1m#{'  '*@depth+suite.description}\e[0m"
+            defer "\n#{indent}\e[1m#{suite.description}\e[0m", skip_reason
           when 1
-            defer "\n           \e[1m#{'  '*@depth+suite.description}\e[0m (1 test)"
+            defer "\n#{indent}\e[1m#{suite.description}\e[0m (1 test)", skip_reason
           else
-            defer "\n           \e[1m#{'  '*@depth+suite.description}\e[0m (#{size} tests)"
+            defer "\n#{indent}\e[1m#{suite.description}\e[0m (#{size} tests)", skip_reason
         end
         @depth += 1
         rv = super(suite) # run the suite
@@ -121,7 +125,7 @@ module BareTest
         rv        = super # run the assertion
         indent    = '           '+'  '*@depth
         backtrace = []
-        reason    = rv.reason(:indent => indent)
+        reason    = rv.reason(:indent => indent, :first_indent => indent+'Reason: ')
 
         printf(Formats[rv.status], StatusLabel[rv.status], '  '*@depth, interpolated_description(assertion, setup))
         if rv.status == :error then
@@ -139,8 +143,12 @@ module BareTest
         str.scan(/[^ ]+ /)
       end
 
-      def defer(output)
-        @deferred << output
+      # Add data to output, but mark it as deferred
+      # We defer in order to be able to ignore suites. Ignored suites that
+      # contain unignored suites/assertions must be displayed, ignored suites
+      # that don't, will be popped from the deferred-stack
+      def defer(*output)
+        @deferred.concat(output.compact)
       end
 
       def pop_deferred

data/lib/baretest/run.rb

@@ -68,18 +68,21 @@ module BareTest
       @exclude_tags    = @options[:exclude_tags]   # nil is ok here
       include_states   = @options[:include_states] # nil is ok here
       exclude_states   = @options[:exclude_states] # nil is ok here
-      @states          = [nil, :success, :failure, :skipped, :pending, :error]
+      @states          = [nil, *BareTest::StatusOrder]
       @skipped         = {}
       @last_run_states = {}
-
-      @persistence    = @options[:persistence]
+      @persistence     = @options[:persistence]
 
       if (include_states || exclude_states) && !((include_states && include_states.empty?) && (exclude_states && exclude_states.empty?)) then
         [include_states, exclude_states].compact.each do |states|
           states << nil if states.include?(:new)
-          states << :pending if states.include?(:skipped)
-          states.concat([:error, :skipped, :pending]) if states.include?(:failure)
+          states.push(:error, :skipped, :pending) if states.include?(:failure)
           states.delete(:new)
+          if states.include?(:skipped) then
+            states.delete(:skipped)
+            states.push(:pending, :manually_skipped, :dependency_missing, :library_missing, :component_missing)
+          end
+          states.uniq!
         end
         @states = (include_states || @states) - (exclude_states || [])
       end
@@ -144,9 +147,9 @@ module BareTest
         skipped             = @skipped[suite] || recursively_skipped
 
         if recursively_skipped then
-          skip_recursively(suite, "Skipped")
+          skip_recursively(suite, "Ancestor was skipped")
         elsif skipped then
-          skip_suite(suite, "Skipped")
+          skip_suite(suite, "Container was skipped")
         end
       end
 

data/lib/baretest/use/support.rb

@@ -0,0 +1,9 @@
+BareTest.new_component :support do
+  require 'baretest/assertion/support'
+
+  BareTest::Assertion::Context.send :include, BareTest::Assertion::Support
+
+  teardown do
+    ::BareTest.clean_touches(self) # instance evaled, self is the assertion
+  end
+end

data/lib/baretest/version.rb

@@ -21,7 +21,7 @@ module BareTest
     TINY       = 0
 
     # Prerelease number - nil for release versions
-    PRERELEASE = 2
+    PRERELEASE = 3
 
     # The version as a string
     STRING     = %{#{MAJOR}.#{MINOR||0}.#{TINY||0}#{".pre#{PRERELEASE}" if PRERELEASE}}

data/test/suite/lib/baretest/assertion.rb

@@ -145,7 +145,7 @@ BareTest.suite 'BareTest' do
 
     suite '#setup' do
       assert 'Fails if setup raises an exception' do
-        setup     = proc { raise 'Some error' }
+        setup     = BareTest::Setup.new do raise 'Some error' end
         assertion = ::BareTest::Assertion.new(nil, 'assertion') do true end
         status    = assertion.execute([setup])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: baretest
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.pre2
+  version: 0.4.0.pre3
 platform: ruby
 authors: 
 - Stefan Rusterholz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 +01:00
+date: 2010-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -72,6 +72,7 @@ files:
 - lib/baretest/use/mocha.rb
 - lib/baretest/use/rack_test.rb
 - lib/baretest/use/rr.rb
+- lib/baretest/use/support.rb
 - lib/baretest/version.rb
 - lib/command.rb
 - lib/command/argument.rb
@@ -118,7 +119,7 @@ rdoc_options:
 - --tab-width
 - "2"
 - -t
-- baretest-0.4.0.pre2
+- baretest-0.4.0.pre3
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement