riot 0.12.5 → 0.12.6

data/lib/riot/context.rb

@@ -51,8 +51,11 @@ module Riot
       @parent = parent || RootContext.new([],[], "", {})
       @description = description
       @contexts, @setups, @assertions, @teardowns = [], [], [], []
+      @context_error = nil
       @options = @parent.option_set.dup
       prepare_middleware(&definition)
+    rescue Exception => e
+      @context_error = e
     end
 
     # Create a new test context.
@@ -88,8 +91,12 @@ module Riot
     # @return [Riot::Reporter] the given reporter
     def run(reporter)
       reporter.describe_context(self) unless @assertions.empty?
-      local_run(reporter, situation_class.new)
-      run_sub_contexts(reporter)
+      if @context_error
+        reporter.report("context preparation", [:context_error, @context_error])
+      else
+        local_run(reporter, situation_class.new)
+        run_sub_contexts(reporter)
+      end
       reporter
     end
 
@@ -98,7 +105,11 @@ module Riot
     # @param [Riot::Reporter] reporter the reporter to report results to
     # @param [Riot::Situation] situation the situation to use for executing the context.
     def local_run(reporter, situation)
-      runnables.each { |runnable| reporter.report(runnable.to_s, runnable.run(situation)) }
+      runnables.each do |runnable|
+        code, response = *runnable.run(situation)
+        reporter.report(runnable.to_s, [code, response])
+        break if code == :setup_error
+      end
     end
 
     # Prints the full description from the context tree, grabbing the description from the parent and

data/lib/riot/message.rb

@@ -19,7 +19,7 @@ module Riot
   #    => "hello world whats the news"
   #
   # For every method called it is also acceptable to pass any number of arguments. These arguments will be
-  # added to the final message after having {Kernel#inspect} called on them. Another for instance:
+  # added to the final message after having `inspect` called on them. Another for instance:
   #
   #   message = Riot::Message.new
   #   message.expected([1, 2, 3], "foo").not([3, 2, 1], "bar")

data/lib/riot/middleware.rb

@@ -3,18 +3,18 @@ module Riot
   # Context middlewares are chainable, context preparers. This to say that a middleware knows about a single
   # neighbor and that it can prepare context before the context is "run". As a for instance, suppose you
   # wanted the following to be possible.
-  # 
+  #
   #   context Person do
   #     denies(:valid?)
   #   end # Person
-  # 
-  # Without writing a middleware, the topic in this would actually be nil, but what the context is saying is 
-  # that there should be something in the topic that responds to +:valid?+; an instance of +Person+ in this 
+  #
+  # Without writing a middleware, the topic in this would actually be nil, but what the context is saying is
+  # that there should be something in the topic that responds to +:valid?+; an instance of +Person+ in this
   # case. We can do this with middleware like so:
-  # 
+  #
   #   class Modelware < Riot::ContextMiddleware
   #     register
-  #   
+  #
   #     def call(context)
   #       if context.description.kind_of?(Model)
   #         context.setup { context.description.new }
@@ -22,37 +22,37 @@ module Riot
   #       middleware.call(context)
   #     end
   #   end # Modelware
-  # 
-  # That's good stuff. If you're familiar at all with the nature of Rack middleware - how to implement it, 
+  #
+  # That's good stuff. If you're familiar at all with the nature of Rack middleware - how to implement it,
   # how it's executed, etc. - you'll be familiar with Context middleware as the principles are similar:
-  # 
+  #
   # 1. Define a class that extends {Riot::ContextMiddleware}
   # 2. Call +register+
   # 3. Implement a +call+ method that accepts the Context that is about to be executed
   # 4. Do stuff, but make sure to pass the call along with +middleware.call(context)+
-  # 
+  #
   # Steps 1, 2, and 3 should be pretty straight-forward. Currently, +context+ is the only argument to +call+.
   # When your middleware is initialized it is given the next registered middleware in the chain (which is
   # where the `middleware` method gets its value from).
-  # 
+  #
   # So, "Do stuff" from step 4 is the where we start breaking things down. What can you actually do? Well,
   # you can do anything to the context that you could do if you were writing a Riot test; and I do mean
   # anything.
-  # 
+  #
   # * Add setup blocks (as many as you like)
   # * Add teardown blocks (as many as you like)
   # * Add hookup blocks (as many as you like)
   # * Add helpers (as many as you like)
   # * Add assertions
-  # 
+  #
   # The context in question will not run before all middleware have been applied to the context; this is
-  # different behavior than that of Rack middleware. {Riot::ContextMiddleware} is only about preparing a 
-  # context, not about executing it. Thus, where in your method you actually pass the call off to the next 
-  # middleware in the chain has impact on how the context is set up. Basically, whatever you do before 
-  # calling `middleware.call(context)` is done before any other middleware gets setup and before the innards 
-  # of the context itself are applied. Whatever you do after that call is done after all that, but still 
+  # different behavior than that of Rack middleware. {Riot::ContextMiddleware} is only about preparing a
+  # context, not about executing it. Thus, where in your method you actually pass the call off to the next
+  # middleware in the chain has impact on how the context is set up. Basically, whatever you do before
+  # calling `middleware.call(context)` is done before any other middleware gets setup and before the innards
+  # of the context itself are applied. Whatever you do after that call is done after all that, but still
   # before the actual setups, hookups, assertions, and teardowns are run.
-  # 
+  #
   # Do not expect the same instance of middleware to exist from one {Riot::Context} instance to the next. It
   # is highly likely that each {Riot::Context} will instantiate their own middleware instances.
   class ContextMiddleware
@@ -82,7 +82,7 @@ module Riot
     end
 
     # The magic happens here. Because you have access to the Context, you can add your own setups, hookups,
-    # etc. +call+ will be called before any tests are run, but after the Context is configured. Though 
+    # etc. +call+ will be called before any tests are run, but after the Context is configured. Though
     # something will likely be returned, do not put any faith in what that will be.
     #
     # @param [Riot::Context] context the Context instance that will be prepared by registered middleware

data/lib/riot/reporter.rb

@@ -2,7 +2,7 @@ module Riot
 
   # A Reporter decides how to output the result of a test. When a context is set to be executed, the
   # {Riot::Reporter#describe_context} method is called with the context that will be running; this remains
-  # so until the next context is executed. After each {Riot#Assertion#evaluate assertion is evaluated}, 
+  # so until the next context is executed. After each {Riot::AssertionMacro#evaluate assertion is evaluated}, 
   # {Riot::Reporter#report} is called with the description of the assertion and the resulting response.
   #
   # The general idea is that a sub-class of Reporter should be defined that knows specifically how to
@@ -22,9 +22,10 @@ module Riot
     attr_accessor :current_context
 
     # Creates a new Reporter instance and initializes counts to zero
-    def initialize
+    def initialize(*args)
+      @options = args.extract_options!
       @passes = @failures = @errors = 0
-      @current_context = ""
+      @current_context = Riot::RootContext.new
     end
 
     def new(*args, &block); self; end
@@ -69,7 +70,7 @@ module Riot
         @failures += 1
         message, line, file = *response[1..-1]
         fail(description, message, line, file)
-      when :error then
+      when :error, :setup_error, :context_error then
         @errors += 1
         error(description, result)
       end

data/lib/riot/reporter/io.rb

@@ -13,8 +13,8 @@ module Riot
     # @param [IO] writer the writer to use for results
     # @param [Hash] options options for reporter
     def initialize(*args)
-      super()
-      @options = (args.last.kind_of?(Hash) ? args.pop : {})
+      super
+      @options = args.extract_options!
       @writer = (args.shift || STDOUT)
     end
 
@@ -45,17 +45,14 @@ module Riot
       line ? "(on line #{line} in #{file})" : ""
     end
 
-    # Generates a message for assertions that error out. However, in the additional stacktrace, any mentions 
+    # Generates a message for assertions that error out. However, in the additional stacktrace, any mentions
     # of Riot and Rake framework methods calls are removed. Makes for a more readable error response.
     #
     # @param [Exception] e the exception to generate the backtrace from
     # @return [String] the error response message
     def format_error(e)
-      format = []
-      format << "    #{e.class.name} occurred"
-      format << "#{e.to_s}"
+      format = ["    #{e.class.name} occurred", "#{e.to_s}"]
       filter_backtrace(e.backtrace) { |line| format << "      at #{line}" }
-
       format.join("\n")
     end
 
@@ -64,13 +61,8 @@ module Riot
     # @param [Array] backtrace an exception's backtrace
     # @param [lambda] &line_handler called each time a good line is found
     def filter_backtrace(backtrace, &line_handler)
-      cleansed, bad = [], true
-
-      # goal is to filter all the riot stuff/rake before the first non riot thing
       backtrace.reverse_each do |bt|
-        # make sure we are still in the bad part
-        bad = (bt =~ /\/lib\/riot/ || bt =~ /rake_test_loader/) if bad
-        yield bt unless bad
+        yield bt unless (bt =~ /(\/lib\/riot|rake_test_loader)/)
       end
     end
 
@@ -78,7 +70,7 @@ module Riot
     def red(str);    with_color(31, str); end
     def yellow(str); with_color(33, str); end
     def green(str);  with_color(32, str); end
-    
+
     def plain?
       (@options[:plain] || @options["plain"])
     end

data/lib/riot/reporter/pretty_dot_matrix.rb

@@ -30,7 +30,6 @@ module Riot
     def simple_error(e)
       format = []
       filter_backtrace(e.backtrace) { |line| format << "at #{line}" }
-
       format.join("\n")
     end
   end

data/lib/riot/rr.rb

@@ -10,6 +10,11 @@ module Riot
     # setup, yeardown, helper, hookup, or assertion.
     class Situation < Riot::Situation
       include ::RR::Adapters::RRMethods
+
+      def initialize
+        self.reset
+        super
+      end
     end # Situation
 
     # Binds the {Riot::Assertion} to RR so that successes and failures found by RR are inherently handled

data/lib/riot/runnable.rb

@@ -48,6 +48,8 @@ module Riot
     def run(situation)
       situation.setup(&definition)
       [:setup]
+    rescue Exception => e
+      [:setup_error, e]
     end
   end # Setup
 

data/lib/riot/situation.rb

@@ -52,7 +52,7 @@ module Riot
     end
 
     # Anonymously evaluates any block given to it against the current instance of +self+. This is how
-    # {Riot::Assertion assertion} and {Riot::AssertionMAcro assertion macro} blocks are evaluated,
+    # {Riot::Assertion assertion} and {Riot::AssertionMacro assertion macro} blocks are evaluated,
     # for instance.
     #
     # @param [lambda] &block the block to evaluate against +self+

data/lib/riot/version.rb

@@ -1,4 +1,4 @@
 module Riot
-  VERSION = "0.12.5"
+  VERSION = "0.12.6"
 end
 

data/test/core/assertion_macros/raises_kind_of_test.rb

@@ -23,7 +23,7 @@ context "A raises_kind_of assertion macro" do
 
   assertion_test_fails("when nothing was raised",
                        "expected to raise kind of Whoops, but raised nothing") do
-    assertion = Riot::Assertion.new("foo") { "barf" }.raises_kind_of(Whoops)
+    Riot::Assertion.new("foo") { "barf" }.raises_kind_of(Whoops)
   end
 
   assertion_test_passes("when provided message equals expected message",

data/test/core/assertion_macros/raises_test.rb

@@ -13,7 +13,7 @@ context "A raises assertion macro" do
   end
 
   assertion_test_fails("when nothing was raised", "expected to raise Whoops, but raised nothing") do
-    assertion = Riot::Assertion.new("foo") { "barf" }.raises(Whoops)
+    Riot::Assertion.new("foo") { "barf" }.raises(Whoops)
   end
   
   assertion_test_passes("when provided message equals expected message", %Q{raises Whoops with message "Mom"}) do

data/test/core/middleware/context_middleware_test.rb

@@ -100,4 +100,24 @@ context "ContextMiddleware" do
 
     asserts("tests passed") { topic.passes }.equals(1)
   end # has access to options after context setup
+
+  context "that errors while preparing" do
+    hookup do
+      Class.new(Riot::ContextMiddleware) do
+        register
+        def call(context)
+          raise Exception.new("Banana pants")
+        end
+      end
+    end
+
+    setup do
+      Riot::Context.new("Foo") { asserts_topic.nil }.run(MockReporter.new)
+    end
+
+    asserts("tests passed") { topic.passes }.equals(0)
+    asserts("tests failed") { topic.failures }.equals(0)
+    asserts("tests errored") { topic.errors }.equals(1)
+  end # that is not meant to be used
+
 end # ContextMiddleware

data/test/core/reports/basic_reporter_test.rb

@@ -39,6 +39,11 @@ context "A reporter" do
     topic.errors
   end.equals(1)
 
+  asserts("error count increase when :setup_error sent to #report") do
+    topic.report("", [:setup_error, ""])
+    topic.errors
+  end.equals(2)
+
   asserts("description sent to #error") do
     topic.report("break it down", [:error, "error time"])
   end.equals("errored(break it down, error time)")
@@ -46,6 +51,7 @@ context "A reporter" do
   context "instance" do
     setup { Riot::Reporter.new }
     should("return self invoking new") { topic.new }.equals { topic }
+    should("accept an options hash") { topic.new({}) }.equals { topic }
   end
 
   context "with no errors or failures" do

data/test/core/reports/dot_matrix_reporter_test.rb

@@ -44,7 +44,13 @@ context "DotMatrixReporter" do
     asserts_topic('puts the full context + assertion name').matches('whatever asserts bang')
     asserts_topic('puts the exception message').matches('BOOM')
     # <file path>:<one or more number><two newlines><anything till end of line><newline> is the last thing in the stack trace
-    asserts_topic('puts the filtered exception backtrace').matches(/#{__FILE__}:\d+:[^\n]*\n\n.*$\n\z/)
+    asserts_topic('puts the filtered exception backtrace').matches do
+      if RUBY_VERSION =~ /^1.8.\d+/
+        /#{__FILE__}:\d+\n\n.*$\n\z/
+      else
+        /#{__FILE__}:\d+:[^\n]*\n\n.*$\n\z/
+      end
+    end
   end
 end
 

data/test/core/reports/story_reporter_test.rb

@@ -20,20 +20,18 @@ context "StoryReporter" do
 
   context 'reporting on an empty context' do
     setup do
-      context = Riot::Context.new('empty context') do
+      context = Riot::Context.new('empty context') {
         context("a nested empty context") {}
-      end
-      context.run(topic)
+      }.run(topic)
     end
     should("not output context name") { @out.string }.empty
   end
 
   context "reporting on a non-empty context" do
     setup do
-      context = Riot::Context.new('supercontext') do
+      Riot::Context.new('supercontext') {
         asserts("truth") { true }
-      end
-      context.run(topic)
+      }.run(topic)
     end
 
     should('output context name') { @out.string }.matches(/supercontext/)

data/test/core/runnable/erroring_gracefully_test.rb

@@ -0,0 +1,47 @@
+require 'teststrap'
+
+context "Executing setup with an error" do
+  setup do
+    Riot::Setup.new { raise "Error in setup" }.run(Riot::Situation.new)
+  end
+
+  asserts("result") { topic[0] }.equals(:setup_error)
+  asserts("result object") { topic[1] }.kind_of(Exception)
+  asserts("error message") { topic[1].message }.equals("Error in setup")
+  
+end # Executing setup with an error
+
+context "Executing a context" do
+  context "that errors during setup" do
+    setup do
+      Riot::Context.new("A") {
+        setup { raise "Whoopsie!" } # error
+        asserts("foo") { true }     # success
+        asserts("bar") { false }    # failure
+      }.run(Riot::SilentReporter.new)
+    end
+
+    asserts(:errors).equals(1)
+    asserts(:failures).equals(0)
+    asserts(:passes).equals(0)
+  end # that errors during setup
+  
+  context "that errors in a parent setup" do
+    setup do
+      Riot::Context.new("A") {
+        setup { raise "Whoopsie!" } # error
+
+        context "B" do
+          asserts("foo") { true }     # success
+          asserts("bar") { false }    # failure
+        end
+      }.run(Riot::SilentReporter.new)
+    end
+
+    asserts(:errors).equals(2) # Same setup fails twice
+    asserts(:failures).equals(0)
+    asserts(:passes).equals(0)
+  end # that errors in a parent setup
+  
+end # Executing a cotext
+

data/test/teststrap.rb

@@ -1,7 +1,9 @@
 $:.unshift(File.dirname(__FILE__) + "/../lib/")
+require 'rubygems'
+require 'bundler/setup'
+
 require 'riot'
 Riot.verbose
-
 Riot.pretty_dots if ENV["TM_MODE"]
 
 module Riot

metadata

@@ -1,39 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: riot
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.12.6
   prerelease: 
-  version: 0.12.5
 platform: ruby
-authors: 
+authors:
 - Justin 'Gus' Knowlden
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-13 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rr
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: An extremely fast, expressive, and context-driven unit-testing framework.
+  A replacement for all other testing frameworks. Protest the slow test.
 email: gus@gusg.us
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - CHANGELOG
 - Gemfile
@@ -112,6 +114,7 @@ files:
 - test/core/reports/story_reporter_test.rb
 - test/core/runnable/assertion_macro_test.rb
 - test/core/runnable/assertion_test.rb
+- test/core/runnable/erroring_gracefully_test.rb
 - test/core/runnable/message_test.rb
 - test/core/runnable/negative_assertion_test.rb
 - test/core/runnable/setup_test.rb
@@ -119,35 +122,32 @@ files:
 - test/core/runnable/teardown_test.rb
 - test/extensions/rrriot_test.rb
 - test/teststrap.rb
-has_rdoc: true
 homepage: http://github.com/thumblemonks/riot
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: An extremely fast, expressive, and context-driven unit-testing framework. Protest the slow test.
-test_files: 
+summary: An extremely fast, expressive, and context-driven unit-testing framework.
+  Protest the slow test.
+test_files:
 - test/benchmark/message_concatenation.rb
 - test/benchmark/riot_vs_minitest.rb
 - test/benchmark/same_elements_vs_set.rb
@@ -186,6 +186,7 @@ test_files:
 - test/core/reports/story_reporter_test.rb
 - test/core/runnable/assertion_macro_test.rb
 - test/core/runnable/assertion_test.rb
+- test/core/runnable/erroring_gracefully_test.rb
 - test/core/runnable/message_test.rb
 - test/core/runnable/negative_assertion_test.rb
 - test/core/runnable/setup_test.rb