baretest 0.4.0.pre3 → 0.4.0

data/MANIFEST.txt

@@ -5,11 +5,16 @@ bin/baretest
 doc/baretest.rdoc
 doc/mocking_stubbing_test_doubles.rdoc
 doc/news/news-0.3.0.rdoc
+doc/news/news-0.4.0.rdoc
 doc/quickref.rdoc
 doc/whats_going_on.rdoc
 doc/writing_tests.rdoc
+examples/README_EXAMPLES.rdoc
+examples/components/mocha.rb
 examples/components/rack-test.rb
+examples/components/rr.rb
 examples/irb_mode/failures.rb
+examples/isolation/example1.rb
 examples/rake/test.rake
 examples/tests/01_basics_I.rb
 examples/tests/02_basics_II_helpers.rb

data/README.rdoc

@@ -87,48 +87,44 @@ right one: `rake gem:install GEM=gem1.9`
 
 Usage:
 
-  baretest [options] [glob, ...]
-
-  Glob defaults to 'test/**/*.rb'
-  Providing a directory as glob is equivalent to dir/**/*.rb
-  Options:
-    -f, --format FORMAT      use FORMAT for output
-    -F, --formats            show available formats
-    -d, --debug              set debugging flags (set $DEBUG to true)
-    -i, --interactive        drop into IRB on error or failure
-    -s, --setup FILE         specify setup file
-    -v, --version            print the version and exit
-    -w, --warn               turn warnings on for your script
-
-
-
-== Planned Features
-
-* Word-wrapping for CLI runner
-* 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.)
-* Alternative CLI runner with status implicit via colored/bg-colored descriptions
-* Alternative CLI runner which prints the name of the test prior the label and rewrites
-  the line when the test has executed to add status & coloring.
-* Simple stubbing with automatic cleanup at teardown. Example:
-
-    assert "Should require a single file listed in :requires option." do |a|
-      file = 'foo/bar'
-      stub(Kernel, :require) do |file, *args| a.touch(file) end
-      ::Test::Suite.create(nil, nil, :requires => file)
+    baretest [command] [options] *(selector | -selector)
+      command:   The command to run. See `baretest commands`
+      options:   The flags and options, see in the "Options" section.
+      selector:  The tests to run. Example:
+                   baretest -- test/suite/a -test/suite/a/x @tag -@other %failure -%pending
+                 Defaults to 'test/{suite,unit,integration,system}
+                 See `baretest selectors` to get more information
     
-      touched file
-    end
-
-* A redmine plugin
-* --fail-all flag, to test/review diagnostics of tests (no idea how to do that yet)
-
-
-
-== Rejected Features
+    Default command is 'run', which runs the testsuite or the provided testfiles.
+    
+    Options:
+    
+          --commands       overview over the commands
+      -d, --debug          set debugging flags (set $DEBUG to true)
+      -i, --interactive    drop into IRB on error or failure. Use 'help!' in the irb session for more information
+      -f, --format FORMAT  use FORMAT for output, see `baretest formats`
+      -s, --setup FILE     specify setup file
+      -w, --warn           turn warnings on for your script
+      -h, --help           help for usage and flags
+      -v, --version        print the version and exit
+          --init           Deprecated form for `baretest --init`
+    
+    Options for 'CLI' formatter:
+    
+      -c, --[no-]color    Enable/disable output coloring
+      -p, --[no-]profile  Enable/disable profiling assertions
+    
+    Environment variables for 'CLI' formatter:
+    
+    * COLOR    Enable/disable output coloring
+    * PROFILE  Enable/disable profiling assertions
+    
+    Environment variables:
+    
+    * FORMAT       use FORMAT for output, see `baretest formats`
+    * VERBOSE      turn warnings on for your script
+    * INTERACTIVE  drop into IRB on error or failure. Use 'help!' in the irb session for more information
 
-* Currently none
 
 
 == A Bit of Background
@@ -251,6 +247,11 @@ From examples/test.rb:
 * Tass
   * adding rr integration
   * reporting bugs
+* robgleeson
+  * Introducing me to rack-test
+  * Feedback
+
+
 
 == Known bugs
 
@@ -258,6 +259,17 @@ Currently none.
 
 
 
+== Known issues
+
+* A setup that raises an exception will cause all teardowns to not be executed.
+  This will change in a future release as follows: a setup that raises an
+  exception will only cause teardowns defined on the same suite not to be
+  executed.
+* --interactive can't be used to investigate problems in setup or teardown
+* Inherited skip reasons are not reported
+
+
+
 == Foot Notes
 <sup>1</sup>:: The abbreviated form without support code and output formatters.
                The normal code is expanded to more lines for readability.

data/bin/baretest

@@ -51,7 +51,7 @@ Command "run" do
 
     o :commands
     o :debug,       '-d', '--debug',         :Boolean, "set debugging flags (set $DEBUG to true)"
-    o :interactive, '-i', '--interactive',   :Boolean, "drop into IRB on error or failure"
+    o :interactive, '-i', '--interactive',   :Boolean, "drop into IRB on error or failure. Use 'help!' in the irb session for more information"
     o :format,      '-f', '--format FORMAT', :String,  "use FORMAT for output, see `baretest formats`"
     o :setup_file,  '-s', '--setup FILE',    :File,    "specify setup file"
     o :verbose,     '-w', '--warn',          :Boolean, "turn warnings on for your script"
@@ -80,12 +80,47 @@ Command "run" do
     o :help
   end
 
-  command "formats"
-  command "env"
-  command "version"
-  command "commands"
-  command "selectors"
-  command "help"
+  command "reset" do
+    usage
+
+    virtual_argument :command
+  end
+
+  command "formats" do
+    usage
+
+    virtual_argument :command
+  end
+
+  command "env" do
+    usage
+
+    virtual_argument :command
+  end
+
+  command "version" do
+    usage
+
+    virtual_argument :command
+  end
+
+  command "commands" do
+    usage
+
+    virtual_argument :command
+  end
+
+  command "selectors" do
+    usage
+
+    virtual_argument :command
+  end
+
+  command "help" do
+    usage
+
+    virtual_argument :command
+  end
 end
 
 
@@ -135,6 +170,8 @@ Command.with(ARGV) do
       exit(success ? 0 : 1)
     when "init" # create the test directory
       BareTest::CommandLine.init(arguments, options)
+    when "reset" # trash runtime stats & caching
+      BareTest::CommandLine.reset(arguments, options)
     when "formats" # list available formats
       BareTest::CommandLine.formats(arguments, options)
     when "env" # show information about baretest (config, version, paths, ...)

data/doc/news/news-0.3.0.rdoc

@@ -1,6 +1,7 @@
-NEWS
+= NEWS
+
+== baretest version 0.3.0
 
-For baretest version 0.3.0
 * Setup-variations
 * skip-method and Skip < StandardError
 * Persist data (independently of the test directory) over multiple runs

data/doc/news/news-0.4.0.rdoc

@@ -0,0 +1,9 @@
+= NEWS
+
+== baretest version 0.4.0
+
+* Components
+* Integration of mocha
+* Integration of RR
+* Integration of rack-test
+* Improved `baretest` executable

data/examples/README_EXAMPLES.rdoc

@@ -0,0 +1,14 @@
+= README
+
+== Examples
+
+The examples directory shall serve to quickly lead you into using baretest.
+
+=== Directories
+
+components:: Contains examples on how to use components that ship with baretest
+             itself.
+irb_mode::   Examples to help you explore baretest when run with the -i flag.
+rake::       Example rake tasks to use baretest from within rake.
+tests::      Several example files, ordered by difficulty, each dealing with a
+             topic, containing suites that explain the topic.

data/examples/components/mocha.rb

@@ -0,0 +1,22 @@
+class User; end
+
+BareTest.suite "Mocha", :use => :mocha do
+  suite "When mocking the 'find' method on the 'User' class to return :jane" do
+    setup do
+      User.expects(:find).with(42).returns(:jane)
+    end
+
+    assert "Calling User.find returns :jane" do
+      same :jane, User.find(42)
+    end
+
+    assert "Calling User.find will make it notice reception of that method" do
+      User.find(42)
+      true
+    end
+
+    assert "Fails when not calling find and asserting its reception" do
+      true
+    end
+  end
+end

data/examples/components/rr.rb

@@ -0,0 +1,49 @@
+class User; end
+
+BareTest.suite "RR", :use => :rr do
+  suite "When stubbing the 'find' method on the 'User' class to return :jane" do
+    setup do
+      stub(User).find(42) { :jane }
+    end
+
+    assert "Spying on having received 'find' fails with no call being done" do
+      received(User).find(42).call # don't forget the final '.call' here!
+    end
+
+    assert "User.find(42) returns :jane" do
+      same :jane, User.find(42)
+    end
+
+    assert "User.find(123) fails as it is an unexpected method invocation" do
+      User.find(123)
+    end
+
+    assert "Spying on having received 'find' succeeds with the call being done" do
+      User.find(42)
+      received(User).find(42).call
+      true # poor, but right now you have to do that
+    end
+  end
+
+  suite "When mocking the 'find' method on the 'User' class to return :jane" do
+    setup do
+      mock(User).find(42) { :jane }
+    end
+
+    assert "Fails when not calling find" do
+      true # still fails, as the mock expectation is not satisfied
+    end
+
+    assert "User.find(42) returns :jane" do
+      same :jane, User.find(42)
+    end
+
+    assert "User.find(123) fails as it is an unexpected method invocation" do
+      User.find(123)
+    end
+
+    assert "User.find(42) will satisfy the mock expectation and thus succeed" do
+      User.find(42)
+    end
+  end
+end

data/examples/isolation/example1.rb

@@ -0,0 +1,16 @@
+class Foo
+  def foo
+    "foo"
+  end
+end
+
+BareTest.suite "Isolation example" do
+  assert "Do some silly stuff" do
+    ::Foo.class_eval do def foo; "bar"; end; end
+    equal "bar", ::Foo.new.foo
+  end
+
+  assert "Unaffected by prior silly stuff" do
+    equal "foo", ::Foo.new.foo
+  end
+end

data/lib/baretest/assertion.rb

@@ -115,11 +115,13 @@ module BareTest
       elsif !@block
         status = Status.new(self, :pending)
       else
-        context  = ::BareTest::Assertion::Context.new(self)
-        status   = execute_phase(:setup, context, with_setup.map { |s| [[s.value], s.block] }) if with_setup
-        status   = execute_phase(:exercise, context, @block) unless status
-        status   = execute_phase(:teardown, context, and_teardown.map { |t| [nil, t] }) unless (status || !and_teardown)
-        status ||= Status.new(self, :success, context)
+        handlers        = @suite ? @suite.ancestors.inject({}) { |handlers, suite| handlers.merge(suite.verification_exception_handlers) } : nil
+        context         = ::BareTest::Assertion::Context.new(self)
+        status          = execute_phase(:setup, context, with_setup.map { |s| [[s.value], s.block] }) if with_setup
+        setup_failed    = status
+        status          = execute_phase(:exercise, context, @block, handlers) unless status
+        teardown_status = execute_phase(:teardown, context, and_teardown.map { |t| [nil, t] }) unless (setup_failed || !and_teardown)
+        status = status || teardown_status || Status.new(self, :success, context)
       end
 
       status
@@ -130,7 +132,7 @@ module BareTest
     # will generate a full Status instance.
     # This is for practical reasons - it means you can go through several
     # phases, looking for the first non-nil one.
-    def execute_phase(name, context, code)
+    def execute_phase(name, context, code, handlers=nil)
       status         = nil
       skip_reason    = nil
       failure_reason = nil
@@ -154,6 +156,12 @@ module BareTest
         status         = :manually_skipped
         skip_reason    = skip.message
       rescue Exception => exception
+        exception_class = exception.class
+        handled_by      = handlers && handlers.find { |handling, handler| exception_class <= handling }
+        if handled_by then
+          handler       = handled_by.last
+          return handler.call(self, context, exception) # FIXME: ugly mid-method return - work around it returning a complete Status
+        end
         status         = :error
         failure_reason = "An error occurred during #{name}: #{exception}"
         exception      = exception

data/lib/baretest/commandline.rb

@@ -128,6 +128,13 @@ module BareTest
     end
     module_function :init
 
+    # Remove all files that store state, cache things etc. from persistence.
+    def reset(arguments, options)
+      options[:persistence] ||= Persistence.new
+      options[:persistence].clear
+    end
+    module_function :reset
+
     # Shows all formats available in run's -f/--format option.
     def formats(arguments, options)
       puts "Available formats:"
@@ -165,6 +172,9 @@ module BareTest
             Create a basic skeleton of directories and files to contain baretests test-
             suite. Non-destructive (existing files won't be overriden or deleted).
 
+        \e[1mreset\e[0m (default command)
+            Delete persistent data collected from previous runs.
+
         \e[1mrun\e[0m (default command)
             Run the tests and display information about them.
 
@@ -198,7 +208,7 @@ module BareTest
             as otherwise baretest will try to interpret them as short options (like -f).
         
         \e[1mExample\e[0m
-            `baretest -- test/suite -test/suite/foo :a -:b #failure -#pending`
+            `baretest -- test/suite -test/suite/foo :a -:b %failure -%pending`
 
             This will run all tests that
             * Are in the directory test/suite or any of its subdirectories
@@ -216,7 +226,7 @@ module BareTest
             * Directories are equivalent to `directory/**/*` patterns
 
         \e[1mTags\e[0m
-            Tags are preceeded with an :.
+            Tags are preceeded with a ':'.
             Examples:
               baretest :focus
               baretest -- -:hocus
@@ -224,9 +234,10 @@ module BareTest
 
         \e[1mLast-run-status\e[0m
             Last run states are preceeded with a %.
-            * %success, %failure, %error, %skipped, %pending
+            * %new, %success, %failure, %error, %skipped, %pending
             * %error, %skipped and %pending are a subset of %failure
             * %pending is a subset of %skipped
+            * %new matches tests that are run for the very first time
 
       END_OF_DESCRIPTION
 

data/lib/baretest/irb_mode.rb

@@ -71,6 +71,7 @@ module BareTest
              "nesting!     - a >-separated list of suite descriptions this assertion is nested",
              "description! - this assertion's description",
              "code!        - the code of this assertion",
+             "eval!        - eval (from_line, number_of_lines) or (from_line..to_line)",
              #"restart! - Restart this irb session, resetting everything",
              "irb_help     - irb's original help",
              "q            - Quit - alias to irb's exit",
@@ -174,6 +175,29 @@ module BareTest
         end
       end
 
+      def eval!(from, number=nil, explicit_binding=nil)
+        if code = @__assertion__.code then
+          if from.is_a?(Range) then
+            number = from.end-from.begin+1
+            from   = from.begin
+          end
+          number    ||= 1
+          total_lines = code.chomp.count("\n")-1
+          first_line  = @__assertion__.line
+          if !from.between?(first_line, first_line+total_lines-1)
+            puts "From must be between #{first_line} and #{first_line+total_lines-1}"
+          elsif !number.between?(0, total_lines)
+            puts "Number must be between 1 and #{total_lines}"
+          else
+            from -= first_line-1
+            puts "Evaluating: ", *code.split(/\n/)[from, number]
+            eval(code.split(/\n/)[from, number].join("\n"), explicit_binding || context.workspace.binding) # this 'context' comes from irb
+          end
+        else
+          puts "Code could not be extracted"
+        end
+      end
+
       # Prepend the line number in front of ever line
       def insert_line_numbers(code, start_line=1) # :nodoc:
         digits       = Math.log10(start_line+code.count("\n")).floor+1
@@ -202,11 +226,11 @@ module BareTest
       case rv.status
         when :failure
           start_irb_failure_mode(assertion, rv)
-          irb_mode_for_assertion(assertion, rv, with_setup)
+          irb_mode_for_assertion(assertion, rv, with_setup, assertion.suite.ancestry_teardown)
           stop_irb_mode
         when :error
           start_irb_error_mode(assertion, rv)
-          irb_mode_for_assertion(assertion, rv, with_setup)
+          irb_mode_for_assertion(assertion, rv, with_setup, assertion.suite.ancestry_teardown)
           stop_irb_mode
         # with other states, irb-mode is not started
       end
@@ -271,14 +295,17 @@ module BareTest
     # Drop into an irb shell in the context of the assertion passed as an argument.
     # Uses Assertion#clean_copy(AssertionContext) to create the context.
     # Adds the code into irb's history.
-    def irb_mode_for_assertion(assertion, status, with_setup) # :nodoc:
-      irb_context = ::BareTest::Assertion::Context.new(assertion)
-      irb_context.extend IRBContext
-      irb_context.__status__ = status
-      assertion.execute_phase(:setup, irb_context, with_setup.map { |s| s.block })
+    def irb_mode_for_assertion(assertion, status, with_setup, and_teardown) # :nodoc:
+      handlers        = @suite ? @suite.ancestors.inject({}) { |handlers, suite| handlers.merge(suite.verification_exception_handlers) } : nil
+      context         = ::BareTest::Assertion::Context.new(assertion)
+      context.extend IRBContext
+      context.__status__ = status
+
+      status          = assertion.execute_phase(:setup, context, with_setup.map { |s| [[s.value], s.block] }) if with_setup
+      setup_failed    = status
 
       $stdout = StringIO.new # HAX - silencing 'irb: warn: can't alias help from irb_help.' - find a better way
-      irb = IRB::Irb.new(IRB::WorkSpace.new(irb_context))
+      irb = IRB::Irb.new(IRB::WorkSpace.new(context))
       $stdout = STDOUT # /HAX
       # HAX - cargo cult, taken from irb.rb, not yet really understood.
       IRB.conf[:IRB_RC].call(irb.context) if IRB.conf[:IRB_RC] # loads the irbrc?
@@ -294,7 +321,7 @@ module BareTest
 
       catch(:IRB_EXIT) do irb.eval_input end
 
-      assertion.execute_phase(:teardown, irb_context, assertion.suite.ancestry_teardown)
+      teardown_status = assertion.execute_phase(:teardown, context, and_teardown.map { |t| [nil, t] }) unless (setup_failed || !and_teardown)
     end
 
     # Invoked when we leave the irb session

data/lib/baretest/persistence.rb

@@ -14,6 +14,11 @@ require 'fileutils'
 
 module BareTest
 
+  # A simple file based storage. This is used to persist data between runs
+  # of baretest (caching data, keeping the last run's states for filtering,
+  # etc.)
+  # The data is stored in ~/.baretest, per project. A file with the name pattern
+  #
   class Persistence
 
     # The default storage path base (~/.baretest)
@@ -30,7 +35,16 @@ module BareTest
       }
       unless found then
         found = UID.hex_uid
-        File.open(".baretest_id_#{found}", "w") {} # no File::touch, evil
+        File.open(".baretest_id_#{found}", "w") { |fh|
+          # The content of this file is irrelevant, only its name. So lets
+          # add a little bit of explaining text in case somebody wonders about
+          # the purpose of this file.
+          fh.write(
+            "This file is used by baretest to find the persisted data in your ~/.baretest directory.\n" \
+            "Deleting this file will result in orphaned persistence data.\n" \
+            "See `baretest help reset`."
+          )
+        }
       end
 
       found
@@ -53,6 +67,12 @@ module BareTest
       @storage_dir = File.expand_path(storage_dir || self.class.storage_path)
       @project_dir = File.expand_path(project_dir || ".")
       @project_id  = self.class.determine_project_id(@project_dir)
+      stat         = File.stat(@project_dir)
+      store('project', {
+        :project_directory        => @project_dir,
+        :project_directory_inode  => stat.ino,
+        :project_directory_device => stat.dev
+      })
     end
 
     # Stores data to a file.
@@ -90,5 +110,36 @@ module BareTest
         default
       end
     end
+
+    # Deletes the file for the given filename.
+    # filename:: A relative path. Empty directories are recursively deleted
+    #            up to (but without) Persistence#storage_dir. The path is
+    #            relative to Persistence#storage_dir
+    def delete(filename)
+      raise "Invalid filename: #{filename}" if filename =~ %r{\A\.\./|/\.\./\z}
+      project_storage_dir = "#{@storage_dir}/#{@project_id}"
+      path                = "#{project_storage_dir}/#{filename}.yaml"
+
+      File.delete(path)
+      container = File.dirname(path)
+      while container != project_storage_dir
+        begin
+          Dir.delete(container)
+        rescue Errno::ENOTEMPTY
+          break
+        else
+          container = File.dirname(container)
+        end
+      end
+    end
+
+    # Remove all files that store state, cache things etc.
+    def clear
+      delete('final_states')
+    end
+
+  private
+    def assert_valid_filename(filename)
+    end
   end
 end

data/lib/baretest/run/cli.rb

@@ -74,7 +74,7 @@ module BareTest
       }
 
       def run_all(*args)
-        puts "Running all tests#{' verbosly' if $VERBOSE}"
+        puts "Running all tests#{' verbosly' if @options[:verbose]}"
 
         @depth    = 0
         @deferred = []
@@ -129,7 +129,7 @@ module BareTest
 
         printf(Formats[rv.status], StatusLabel[rv.status], '  '*@depth, interpolated_description(assertion, setup))
         if rv.status == :error then
-          backtrace = $VERBOSE ? rv.exception.backtrace : rv.exception.backtrace.first(1)
+          backtrace = @options[:verbose] ? rv.exception.backtrace : rv.exception.backtrace.first(1)
         elsif rv.status == :failure
           backtrace = ["#{assertion.file}:#{assertion.line}"]
         end

data/lib/baretest/status.rb

@@ -59,20 +59,20 @@ module BareTest
     # The failure/error/skipping/pending reason.
     # Returns nil if there's no reason, a string otherwise
     # Options:
-    # :default::     Reason to return if no reason is present
-    # :separator::   String used to separate multiple reasons
-    # :indent::      A String, the indentation to use. Prefixes every line.
-    # :first_indent: A String, used to indent the first line only (replaces indent).
+    # :default::      Reason to return if no reason is present
+    # :separator::    String used to separate multiple reasons
+    # :indent::       A String, the indentation to use. Prefixes every line.
+    # :first_indent:: A String, used to indent the first line only (replaces indent).
     def reason(opt=nil)
       if opt then
         default, separator, indent, first_indent = 
           *opt.values_at(:default, :separator, :indent, :first_indent)
         reason = @skip_reason || @failure_reason || default
         return nil unless reason
-        reason = Array(reason)
+        reason = reason.kind_of?(Array) ? reason : [reason]
         reason = reason.join(separator || "\n")
         reason = reason.gsub(/^/, indent) if indent
-        reason = reason.gsub(/^#{Regexp.escape(indent)}/, first_indent) if first_indent
+        reason = reason.gsub(/\A#{Regexp.escape(indent)}/, first_indent) if first_indent
         reason
       else
         @reason.empty? ? nil : @reason.join("\n")

data/lib/baretest/suite.rb

@@ -49,6 +49,8 @@ module BareTest
     # All things this suite is tagged with, see Suite::new for more information
     attr_reader   :tags
 
+    attr_reader   :verification_exception_handlers # :nodoc:
+
     # A list of valid options Suite::new accepts
     ValidOptions = [:skip, :requires, :use, :provides, :depends_on, :tags]
 
@@ -90,6 +92,7 @@ module BareTest
       @setup       = {nil => []}
       @components  = []
       @teardown    = []
+      @verification_exception_handlers = {}
       if @parent then
         @ancestors   = [self, *@parent.ancestors]
         @depends_on  = @parent.depends_on
@@ -132,6 +135,17 @@ module BareTest
       end
     end
 
+    # Experimental
+    # Define handlers for specific exception classes. The handler gets
+    # the assertion, the phase and the exception yielded and is expected
+    # to return a BareTest::Status.
+    def handle_verification_exceptions(*exception_classes, &block) # :nodoc:
+      exception_classes.each do |exception_class|
+        raise "Already registered a verification exception handler for class #{exception_class}" if @verification_exception_handlers[exception_class]
+        @verification_exception_handlers[exception_class] = block
+      end
+    end
+
     # Instruct this suite to require the given files.
     # The suite is skipped if a file can't be loaded.
     def requires(*paths)
@@ -164,10 +178,10 @@ module BareTest
     # The failure/error/skipping/pending reason.
     # Returns nil if there's no reason, a string otherwise
     # Options:
-    # :default::     Reason to return if no reason is present
-    # :separator::   String used to separate multiple reasons
-    # :indent::      A String, the indentation to use. Prefixes every line.
-    # :first_indent: A String, used to indent the first line only (replaces indent).
+    # :default::      Reason to return if no reason is present
+    # :separator::    String used to separate multiple reasons
+    # :indent::       A String, the indentation to use. Prefixes every line.
+    # :first_indent:: A String, used to indent the first line only (replaces indent).
     def reason(opt=nil)
       if opt then
         default, separator, indent, first_indent = 

data/lib/baretest/uid.rb

@@ -13,8 +13,7 @@ module BareTest
   # 'macaddr').
   class UID
 
-    # :nodoc:
-    Epoch = Time.utc(2000,1,1).to_i
+    Epoch = Time.utc(2000,1,1).to_i # :nodoc:
 
     # The numeric value of the uid (an Integer)
     attr_reader :value

data/lib/baretest/use/mocha.rb

@@ -3,20 +3,16 @@
 
 # This file provides integration with the "mocha" mocking framework.
 
+BareTest.new_component :mocha do
+  BareTest.require 'mocha'
 
-# Load this file and get integration with the "rr" mocking framework.
+  BareTest::Assertion::Context.send :include, Mocha::API
 
-BareTest.new_component :mocha do
-  require 'mocha'
-  
-  BareTest::Assertion::Context.send :include Mocha::API
-  
   teardown do
     begin
       mocha_verify
     rescue Mocha::ExpectationError => e
-      @reason = e.message
-      @status = :failure
+      raise ::BareTest::Assertion::Failure, e.message
     ensure
       mocha_teardown
     end

data/lib/baretest/use/rr.rb

@@ -1,17 +1,21 @@
-# Original by Tass`
-# Adapted to :use framework by apeiros
-
 BareTest.new_component :rr do
-  require 'rr'
+  BareTest.require 'rr'
 
   BareTest::Assertion::Context.send :include, RR::Adapters::RRMethods
 
+  handle_verification_exceptions RR::Errors::RRError do |assertion, phase, exception|
+    ::BareTest::Status.new(assertion, :failure, :verify, nil, exception.message)
+  end
+
   teardown do
     begin
       ::RR.verify
-    rescue ::RR::Errors => e
-      @reason = e.message
-      @status = :failure
+    rescue ::RR::Errors::RRError => e
+      raise ::BareTest::Assertion::Failure, e.message
+    else
+      nil
+    ensure
+      RR.reset
     end
   end
 end

data/lib/baretest/version.rb

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

data/lib/baretest.rb

@@ -57,12 +57,10 @@ module BareTest
   end
 
   # The standard glob used by baretest to load test files
-  # :nodoc:
-  DefaultInitialPositiveGlob = 'test/{suite,unit,isolation,integration,system}/**/*.rb'
+  DefaultInitialPositiveGlob = 'test/{suite,unit,isolation,integration,system}/**/*.rb' # :nodoc:
 
   # Selectors that are valid to be passed into process_selectors
-  # :nodoc:
-  ValidStateSelectors = [:new, :success, :failure, :error, :skipped, :pending]
+  ValidStateSelectors = [:new, :success, :failure, :error, :skipped, :pending] # :nodoc:
 
   class << self
     # A hash of components - available via BareTest::use(name) and
@@ -120,9 +118,17 @@ module BareTest
       files.each do |glob|
         glob = "#{glob}/**/*.rb" if File.directory?(glob)
         Dir.glob(glob) { |path|
-          helper_path = path.sub(%r{^test/(suite|unit|integration|system)/}, 'test/helper/\1/')
+          helper_path = path.sub(%r{((?:^|/)test)/(suite|unit|integration|system)/}, '\1/helper/\2/')
           exists = (helper_path != path && File.exist?(helper_path))
-          puts(exists ? "Loading helper file #{helper_path}" : "No helper file #{helper_path} to load") if verbose
+          if verbose then
+            if helper_path == path then
+              puts "Could not resolve helper path for path #{path}"
+            elsif exists
+              puts "Loading helper file #{helper_path}"
+            else
+              puts "No helper file #{helper_path} to load"
+            end
+          end
           load(helper_path) if exists
           puts "Loading test file #{path}" if verbose
           load(path)
@@ -239,6 +245,35 @@ module BareTest
   def self.use(component)
     @toplevel_suite.use(component)
   end
+
+  # Tries to require a file, if it fails, it will require rubygems and retries
+  def self.require(*paths)
+    paths.each do |path|
+      begin
+        Kernel.require path
+      rescue LoadError
+        begin
+          Kernel.require 'rubygems'
+        rescue LoadError
+        end
+        Kernel.instance_method(:require).bind(self).call path # ugly, but at least until rubygems 1.3.5, Kernel.require isn't overriden
+      end
+    end
+  end
+
+  # Returns the absolute path to the external file
+  # Example
+  #   suite "#mkdir" do
+  #     setup do
+  #       @base = BareTest.external('suite_mkdir') # => "/.../PROJECT/test/external/suite_mkdir"
+  def self.external(*path)
+    File.join(test_directory, 'external', *path)
+  end
+
+  # Returns the absolute path to the test directory
+  def self.test_directory
+    File.expand_path(path, 'test')
+  end
 end
 
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: baretest
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.pre3
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Stefan Rusterholz
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 +01:00
+date: 2010-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -31,11 +36,16 @@ files:
 - doc/baretest.rdoc
 - doc/mocking_stubbing_test_doubles.rdoc
 - doc/news/news-0.3.0.rdoc
+- doc/news/news-0.4.0.rdoc
 - doc/quickref.rdoc
 - doc/whats_going_on.rdoc
 - doc/writing_tests.rdoc
+- examples/README_EXAMPLES.rdoc
+- examples/components/mocha.rb
 - examples/components/rack-test.rb
+- examples/components/rr.rb
 - examples/irb_mode/failures.rb
+- examples/isolation/example1.rb
 - examples/rake/test.rake
 - examples/tests/01_basics_I.rb
 - examples/tests/02_basics_II_helpers.rb
@@ -119,25 +129,27 @@ rdoc_options:
 - --tab-width
 - "2"
 - -t
-- baretest-0.4.0.pre3
+- baretest-0.4.0
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
-  version: 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: baretest
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "A testframework that doesn\xE2\x80\x99t stand in your way or forces you to learn a new language. Two methods is all that is required to know. If you need it, it provides you with all kinds of features to support you writing your tests."