Merge pull request #51 from charlesfrantz/master

Stop catching interrupts in context blocks

Bumping to 0.12.7

lib/riot/runnable.rb

@@ -20,7 +20,7 @@ def initialize(description, &definition)
     end
 
     # Given a {Riot::Situation}, eval the provided block against it and then return a status tuple.
-    # 
+    #
     # @param [Riot::Situation] situation An instance of a {Riot::Situation}
     # @return [Array<Symbol[, String]>] array containing at least an evaluation state
     def run(situation)
@@ -39,22 +39,22 @@ def initialize(&definition)
       super("setup", &definition)
     end
 
-    # Calls {Riot::Situation#setup} with the predefined block at {Riot::Context} run-time. Though this is 
-    # like every other kind of {Riot::RunnableBlock}, +run+ will not return a meaningful state, which means 
+    # Calls {Riot::Situation#setup} with the predefined block at {Riot::Context} run-time. Though this is
+    # like every other kind of {Riot::RunnableBlock}, +run+ will not return a meaningful state, which means
     # the reporter will likely not report anything.
     #
     # @param [Riot::Situation] situation the situation for the current {Riot::Context} run
     # @return [Array<Symbol>] array containing the evaluation state
     def run(situation)
       situation.setup(&definition)
       [:setup]
-    rescue Exception => e
+    rescue StandardError => e
       [:setup_error, e]
     end
   end # Setup
 
-  # Used to decorate a helper. A helper generally ends up being a glorified method that can be referenced 
-  # from within a setup, teardown, hookup, other helpers, assertion blocks, and assertion macro blocks; 
+  # Used to decorate a helper. A helper generally ends up being a glorified method that can be referenced
+  # from within a setup, teardown, hookup, other helpers, assertion blocks, and assertion macro blocks;
   # basically anywhere the {Riot::Situation} instance is available.
   #
   #   context "Making dinner" do
@@ -74,8 +74,8 @@ def initialize(name, &definition)
       @name = name
     end
 
-    # Calls {Riot::Situation#helper} with the predefined helper name and block at {Riot::Context} run-time. 
-    # Though this is like every other kind of {Riot::RunnableBlock}, +run+ will not return a meaningful 
+    # Calls {Riot::Situation#helper} with the predefined helper name and block at {Riot::Context} run-time.
+    # Though this is like every other kind of {Riot::RunnableBlock}, +run+ will not return a meaningful
     # state, which means the reporter will likely not report anything.
     #
     # @param [Riot::Situation] situation the situation for the current {Riot::Context} run

lib/riot/version.rb

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