baretest 0.4.0 → 0.4.1

data/MANIFEST.txt

@@ -40,7 +40,6 @@ lib/baretest/run.rb
 lib/baretest/run/cli.rb
 lib/baretest/run/minimal.rb
 lib/baretest/run/none.rb
-lib/baretest/run/profile.rb
 lib/baretest/run/spec.rb
 lib/baretest/run/tap.rb
 lib/baretest/run/xml.rb

data/lib/baretest.rb

@@ -84,14 +84,14 @@ module BareTest
 
   # Enure that the suite is run wiht a minimal version of baretest
   def self.require_baretest(version)
-    if (version.split(".").map { |s| s.to_i } <=> BareTest::VERSION.to_a) == 0 then
+    if (version.split(".").map { |s| s.to_i } <=> BareTest::VERSION.to_a) > 0 then
       abort "Requires baretest version #{version}, you have #{BareTest::VERSION}"
     end
   end
 
   # Ensure that the suite is run with a minimal version of ruby
   def self.require_ruby(version)
-    if (version.split(".").map { |s| s.to_i } <=> RUBY_VERSION.split(".").map { |s| s.to_i }) == 1 then
+    if (version.split(".").map { |s| s.to_i } <=> RUBY_VERSION.split(".").map { |s| s.to_i }) > 0 then
       abort "Requires ruby version #{version}, you have #{RUBY_VERSION}"
     end
   end

data/lib/baretest/run/spec.rb

@@ -24,12 +24,14 @@ module BareTest
         return super unless suite.description
         puts("\n"+'  '*@depth+suite.description)
         @depth += 1
-        super
+        rv = super
         @depth -= 1
+        rv
       end
 
       def run_test(assertion, setup)
         puts('  '*@depth+assertion.description)
+        BareTest::Status.new(assertion, :success)
       end
     end
   end

data/lib/baretest/run/tap.rb

@@ -21,7 +21,6 @@ module BareTest
         count = proc { |acc,csuite|
           acc+
           csuite.assertions.size+
-          csuite.skipped.size+
           csuite.suites.map { |d,suite| suite }.inject(0, &count)
         }
         puts "1..#{count[0, suite]}"
@@ -34,8 +33,10 @@ module BareTest
         printf "%sok %d - %s%s\n",
           rv.status == :success ? '' : 'not ',
           @current+=1,
-          rv.description,
+          assertion.description,
           rv.status == :success ? '' : " # #{rv.status}"
+
+        rv
       end
     end
   end

data/lib/baretest/version.rb

@@ -18,7 +18,7 @@ module BareTest
     MINOR      = 4
 
     # The tiny version number
-    TINY       = 0
+    TINY       = 1
 
     # Prerelease number - nil for release versions
     PRERELEASE = nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Stefan Rusterholz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +01:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -71,7 +71,6 @@ files:
 - lib/baretest/run/cli.rb
 - lib/baretest/run/minimal.rb
 - lib/baretest/run/none.rb
-- lib/baretest/run/profile.rb
 - lib/baretest/run/spec.rb
 - lib/baretest/run/tap.rb
 - lib/baretest/run/xml.rb
@@ -129,7 +128,7 @@ rdoc_options:
 - --tab-width
 - "2"
 - -t
-- baretest-0.4.0
+- baretest-0.4.1
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/baretest/run/profile.rb

@@ -1,151 +0,0 @@
-# encoding: utf-8
-#--
-# Copyright 2009-2010 by Stefan Rusterholz.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-
-
-module BareTest
-  class Run
-
-    # CLI runner is invoked with `-f cli` or `--format cli`.
-    # It is intended for use with an interactive shell, to provide a comfortable, human
-    # readable output.
-    # It prints colored output (requires ANSI colors compatible terminal).
-    #
-    module Profile # :nodoc:
-      Formats = {
-        :pending => "\e[43m%9s\e[0m  %s%s (%s)\n",
-        :skipped => "\e[43m%9s\e[0m  %s%s (%s)\n",
-        :success => "\e[42m%9s\e[0m  %s%s (%s)\n",
-        :failure => "\e[41m%9s\e[0m  %s%s (%s)\n",
-        :error   => "\e[37;40;1m%9s\e[0m  %s%s (%s)\n"  # ]]]]]]]] - bbedit hates open brackets...
-      }
-
-      FooterFormats = {
-        :incomplete => "\e[43m%9s\e[0m\n",
-        :success    => "\e[42m%9s\e[0m\n",
-        :failure    => "\e[41m%9s\e[0m\n",
-        :error      => "\e[37;40;1m%9s\e[0m\n"  # ]]]]]]]] - bbedit hates open brackets...
-      }
-
-      def run_all(*args)
-        @depth = 0
-        puts "Running all tests#{' verbosly' if $VERBOSE}"
-        start = Time.now
-        super # run all suites
-        status = global_status
-        printf "\n%2$d tests run in %1$.1fs\n%3$d successful, %4$d pending, %5$d failures, %6$d errors\n",
-          Time.now-start, *@count.values_at(:test, :success, :pending, :failure, :error)
-        print "Final status: "
-        printf FooterFormats[status], status_label(status)
-      end
-
-      def run_suite(suite)
-        return super unless suite.description
-        skipped = suite.skipped.size
-        case size = suite.assertions.size
-          when 0
-            if skipped.zero? then
-              puts "\n           \e[1m#{'  '*@depth+suite.description}\e[0m"
-            else
-              puts "\n           \e[1m#{'  '*@depth+suite.description}\e[0m (#{skipped} skipped)"
-            end
-          when 1
-            if skipped.zero? then
-              puts "\n           \e[1m#{'  '*@depth+suite.description}\e[0m (1 test)"
-            else
-              puts "\n           \e[1m#{'  '*@depth+suite.description}\e[0m (1 test/#{skipped} skipped)"
-            end
-          else
-            if skipped.zero? then
-              puts "\n           \e[1m#{'  '*@depth+suite.description}\e[0m (#{size} tests)"
-            else
-              puts "\n           \e[1m#{'  '*@depth+suite.description}\e[0m (#{size} tests/#{skipped} skipped)"
-            end
-        end
-        @depth += 1
-        super(suite) # run the suite
-        @depth -= 1
-      end
-
-      def run_test(assertion, setup)
-        start            = Time.now
-        rv               = super # run the assertion
-        times            = [Time.now-start]
-
-        if times.first < 1e-3 then
-          iters = 19
-        elsif times.first < 1
-          iters = 2
-        else
-          iters = 0
-        end
-
-        iters.times do
-          assertion.reset
-          start = Time.now
-          assertion.execute
-          times << (Time.now-start)
-        end
-
-        time = times.inject{ |a,b| a+b }/iters
-
-        indent           = '           '+'  '*@depth
-        message          = []
-        deeper           = []
-
-        printf(
-          Formats[rv.status],
-          status_label(rv.status),
-          '  '*@depth,
-          rv.description,
-          humanized_duration(time)
-        )
-        if rv.status == :error then
-          message = (rv.exception.message || "no error message given").split("\n")
-          deeper  = $VERBOSE ? rv.exception.backtrace : rv.exception.backtrace.first(1)
-        elsif rv.status == :failure
-          message = (rv.reason || "no failure reason given").split("\n")
-          deeper  = ["#{rv.file}:#{rv.line}"]
-        end
-        message.each do |line| print(indent, line, "\n") end
-        deeper.each do |line| print(indent, '  ', line, "\n") end
-
-        rv
-      end
-
-      def word_wrap(string, cols)
-        str.scan(/[^ ]+ /)
-      end
-
-      def status_label(status)
-        status.to_s.capitalize.center(9)
-      end
-
-      def humanized_duration(duration)
-        case
-          when duration < 1e-3
-            "%dµs" % (duration*1e6)
-          when duration < 1
-            "%.1fms" % (duration*1e3)
-          when duration < 60
-            "%.1fs" % duration
-          else
-            minutes, seconds = *duration.divmod(60)
-            hours, minutes   = *minutes.divmod(60)
-            # lets assume unit tests don't take more than a day :)
-            if hours > 0 then
-              "#{hours}h #{minutes}m #{seconds}s"
-            else
-              "#{minutes}m #{seconds}s"
-            end
-        end
-      end
-    end
-  end
-
-  @format["baretest/run/profile"] = Run::Profile # register the extender
-end