riot 0.10.3 → 0.10.4

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.10.4

data/lib/riot/context.rb

@@ -1,8 +1,10 @@
 module Riot
+  RootContext = Struct.new(:setups)
   class Context
-    def initialize(description, setups=[], &definition)
+    def initialize(description, parent=RootContext.new([]), &definition)
+      @parent = parent
       @description = description
-      @contexts, @setups, @assertions = [], setups, []
+      @contexts, @setups, @assertions = [], [], []
       self.instance_eval(&definition)
     end
     
@@ -10,18 +12,21 @@ module Riot
       @setups << Setup.new(&definition)
     end
 
+    def setups
+      @parent.setups + @setups
+    end
+
     def asserts(what, &definition) new_assertion("asserts", what, &definition); end
     def should(what, &definition) new_assertion("should", what, &definition); end
 
     def asserts_topic; asserts("topic") { topic }; end
 
     def context(description, &definition)
-      # not liking the dup
-      @contexts << Context.new("#{@description} #{description}", @setups.dup, &definition)
+      @contexts << Context.new("#{@description} #{description}", self, &definition)
     end
     
     def run(reporter)
-      runnables = @setups + @assertions
+      runnables = setups + @assertions
       reporter.describe_context(@description) unless @assertions.empty?
       situation = Situation.new
       runnables.each do |runnable|

data/lib/riot/reporter.rb

@@ -46,27 +46,38 @@ module Riot
       values = [passes, failures, errors, ("%0.6f" % time_taken)]
       say "\n%d passes, %d failures, %d errors in %s seconds" % values
     end
+
+    begin
+      raise LoadError if ENV["TM_MODE"]
+      require 'rubygems'
+      require 'term/ansicolor'
+      include Term::ANSIColor
+    rescue LoadError
+      def green(str); str; end
+      alias :red :green
+      alias :yellow :green
+    end
   end
 
   class StoryReporter < IOReporter
     def describe_context(description) say description; end
-    def pass(description) say "  + " + description.green; end
-    def fail(description, message) say "  - " + "#{description}: #{message}".yellow; end
-    def error(description, e) say "  ! " + "#{description}: #{e.message}".red; end
+    def pass(description) say "  + " + green(description); end
+    def fail(description, message) say "  - " + yellow("#{description}: #{message}"); end
+    def error(description, e) say "  ! " + red("#{description}: #{e.message}"); end
   end
 
   class VerboseStoryReporter < StoryReporter
     def error(description, e)
       super(description, e)
-      say "    #{e.class.name} occured".red
-      e.backtrace.each { |line| say "      at #{line}".red }
+      say red("    #{e.class.name} occured")
+      e.backtrace.each { |line| say red("      at #{line}") }
     end
   end
 
   class DotMatrixReporter < IOReporter
-    def pass(description); writer.write ".".green; end
-    def fail(description, message); writer.write "F".yellow; end
-    def error(description, e); writer.write "E".red; end
+    def pass(description); writer.write green("."); end
+    def fail(description, message); writer.write yellow("F"); end
+    def error(description, e); writer.write red("E"); end
     # TODO: Print the failures and errors at the end. Sorry :|
   end
 
@@ -77,17 +88,3 @@ module Riot
     def results(time_taken); end
   end
 end # Riot
-
-# Colorize strings
-class ::String
-  begin
-    raise LoadError if ENV["TM_MODE"]
-    require 'rubygems'
-    require 'term/ansicolor'
-    include Term::ANSIColor
-  rescue LoadError
-    def green; self; end
-    alias :red :green
-    alias :yellow :green
-  end
-end

data/riot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2009-12-02}
+  s.date = %q{2009-12-03}
   s.description = %q{An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [

data/test/context_test.rb

@@ -17,14 +17,14 @@ end # Reporting a context
 
 context "Defining a context with multiple setups" do
   setup do
-    a_context = Riot::Context.new("foobar") do
+    @a_context = Riot::Context.new("foobar") do
       setup { "foo" }
       setup { topic + "bar" }
       asserts("blah") { topic == "foobar" }
     end
-    a_context.run(MockReporter.new)
+    @a_context.run(MockReporter.new)
   end
-
+  asserts("has setups") { @a_context.setups.count }.equals(2)
   asserts("all tests pass") { topic.passes == 1 }
 end # Defining a context with multiple setups
 
@@ -59,7 +59,7 @@ context "Nesting a context" do
 
     asserts("parent setups are called") { topic.passes == 1 }
   end # with setups
-end # Nestings a context
+end # Nesting a context
 
 context "Using should" do
   setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -06:00
+date: 2009-12-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency