riot 0.12.1 → 0.12.2

data/lib/riot/version.rb

@@ -0,0 +1,4 @@
+module Riot
+  VERSION = "0.12.2"
+end
+

data/riot.gemspec

@@ -1,162 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "riot/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{riot}
-  s.version = "0.12.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2011-01-14}
-  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 = [
-    "README.markdown"
-  ]
-  s.files = [
-    "CHANGELOG",
-    "MIT-LICENSE",
-    "README.markdown",
-    "Rakefile",
-    "TODO.markdown",
-    "VERSION",
-    "lib/riot.rb",
-    "lib/riot/assertion.rb",
-    "lib/riot/assertion_macro.rb",
-    "lib/riot/assertion_macros/any.rb",
-    "lib/riot/assertion_macros/assigns.rb",
-    "lib/riot/assertion_macros/empty.rb",
-    "lib/riot/assertion_macros/equals.rb",
-    "lib/riot/assertion_macros/equivalent_to.rb",
-    "lib/riot/assertion_macros/exists.rb",
-    "lib/riot/assertion_macros/includes.rb",
-    "lib/riot/assertion_macros/kind_of.rb",
-    "lib/riot/assertion_macros/matches.rb",
-    "lib/riot/assertion_macros/nil.rb",
-    "lib/riot/assertion_macros/not_borat.rb",
-    "lib/riot/assertion_macros/raises.rb",
-    "lib/riot/assertion_macros/respond_to.rb",
-    "lib/riot/assertion_macros/same_elements.rb",
-    "lib/riot/assertion_macros/size.rb",
-    "lib/riot/context.rb",
-    "lib/riot/context_helpers.rb",
-    "lib/riot/context_options.rb",
-    "lib/riot/message.rb",
-    "lib/riot/middleware.rb",
-    "lib/riot/reporter.rb",
-    "lib/riot/rr.rb",
-    "lib/riot/runnable.rb",
-    "lib/riot/situation.rb",
-    "riot.gemspec",
-    "test.watchr",
-    "test/benchmark/colorize.rb",
-    "test/benchmark/message_concatenation.rb",
-    "test/benchmark/riot_vs_minitest.rb",
-    "test/benchmark/same_elements_vs_set.rb",
-    "test/benchmark/simple_context_and_assertions.rb",
-    "test/core/assertion_macros/any_test.rb",
-    "test/core/assertion_macros/assigns_test.rb",
-    "test/core/assertion_macros/empty_test.rb",
-    "test/core/assertion_macros/equals_test.rb",
-    "test/core/assertion_macros/equivalent_to_test.rb",
-    "test/core/assertion_macros/exists_test.rb",
-    "test/core/assertion_macros/includes_test.rb",
-    "test/core/assertion_macros/kind_of_test.rb",
-    "test/core/assertion_macros/matches_test.rb",
-    "test/core/assertion_macros/nil_test.rb",
-    "test/core/assertion_macros/not_borat_test.rb",
-    "test/core/assertion_macros/raises_test.rb",
-    "test/core/assertion_macros/respond_to_test.rb",
-    "test/core/assertion_macros/same_elements_test.rb",
-    "test/core/assertion_macros/size_test.rb",
-    "test/core/context/asserts_topic_test.rb",
-    "test/core/context/context_test.rb",
-    "test/core/context/context_with_options_test.rb",
-    "test/core/context/deny_test.rb",
-    "test/core/context/helper_test.rb",
-    "test/core/context/hookup_test.rb",
-    "test/core/context/nested_contexts_test.rb",
-    "test/core/context/premium_setup_test.rb",
-    "test/core/context/should_test.rb",
-    "test/core/context/using_describe_in_a_test.rb",
-    "test/core/middleware/chained_context_middleware_test.rb",
-    "test/core/middleware/context_middleware_test.rb",
-    "test/core/report_test.rb",
-    "test/core/runnable/assertion_macro_test.rb",
-    "test/core/runnable/assertion_test.rb",
-    "test/core/runnable/message_test.rb",
-    "test/core/runnable/negative_assertion_test.rb",
-    "test/core/runnable/setup_test.rb",
-    "test/core/runnable/situation_test.rb",
-    "test/core/runnable/teardown_test.rb",
-    "test/extensions/rrriot_test.rb",
-    "test/teststrap.rb"
-  ]
-  s.homepage = %q{http://github.com/thumblemonks/riot}
+  s.name          = %q{riot}
+  s.version       = Riot::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = ["Justin 'Gus' Knowlden"]
+  s.summary       = %q{An extremely fast, expressive, and context-driven unit-testing framework. Protest the slow test.}
+  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.files         = `git ls-files`.split("\n") 
+  s.homepage      = %q{http://github.com/thumblemonks/riot}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{An extremely fast, expressive, and context-driven unit-testing framework. Protest the slow test.}
-  s.test_files = [
-    "test/benchmark/colorize.rb",
-    "test/benchmark/message_concatenation.rb",
-    "test/benchmark/riot_vs_minitest.rb",
-    "test/benchmark/same_elements_vs_set.rb",
-    "test/benchmark/simple_context_and_assertions.rb",
-    "test/core/assertion_macros/any_test.rb",
-    "test/core/assertion_macros/assigns_test.rb",
-    "test/core/assertion_macros/empty_test.rb",
-    "test/core/assertion_macros/equals_test.rb",
-    "test/core/assertion_macros/equivalent_to_test.rb",
-    "test/core/assertion_macros/exists_test.rb",
-    "test/core/assertion_macros/includes_test.rb",
-    "test/core/assertion_macros/kind_of_test.rb",
-    "test/core/assertion_macros/matches_test.rb",
-    "test/core/assertion_macros/nil_test.rb",
-    "test/core/assertion_macros/not_borat_test.rb",
-    "test/core/assertion_macros/raises_test.rb",
-    "test/core/assertion_macros/respond_to_test.rb",
-    "test/core/assertion_macros/same_elements_test.rb",
-    "test/core/assertion_macros/size_test.rb",
-    "test/core/context/asserts_topic_test.rb",
-    "test/core/context/context_test.rb",
-    "test/core/context/context_with_options_test.rb",
-    "test/core/context/deny_test.rb",
-    "test/core/context/helper_test.rb",
-    "test/core/context/hookup_test.rb",
-    "test/core/context/nested_contexts_test.rb",
-    "test/core/context/premium_setup_test.rb",
-    "test/core/context/should_test.rb",
-    "test/core/context/using_describe_in_a_test.rb",
-    "test/core/middleware/chained_context_middleware_test.rb",
-    "test/core/middleware/context_middleware_test.rb",
-    "test/core/report_test.rb",
-    "test/core/runnable/assertion_macro_test.rb",
-    "test/core/runnable/assertion_test.rb",
-    "test/core/runnable/message_test.rb",
-    "test/core/runnable/negative_assertion_test.rb",
-    "test/core/runnable/setup_test.rb",
-    "test/core/runnable/situation_test.rb",
-    "test/core/runnable/teardown_test.rb",
-    "test/extensions/rrriot_test.rb",
-    "test/teststrap.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rr>, [">= 0"])
-      s.add_runtime_dependency(%q<term-ansicolor>, [">= 0"])
-    else
-      s.add_dependency(%q<rr>, [">= 0"])
-      s.add_dependency(%q<term-ansicolor>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rr>, [">= 0"])
-    s.add_dependency(%q<term-ansicolor>, [">= 0"])
-  end
+  s.add_dependency 'rr', '>=0'
 end
 
+

data/test/core/assertion_macros/any_test.rb

@@ -5,12 +5,12 @@ context "An any assertion macro" do
     Riot::Assertion.new("test") { o }.any
   end
 
-  assertion_test_passes("when an array has items", "is not empty") { assert_any([1]) }
+  assertion_test_passes("when an array has items", "has items") { assert_any([1]) }
   assertion_test_fails("when an array is empty", "expected [] to have items") do
     assert_any([])
   end
 
-  assertion_test_passes("when a hash has items", "is not empty") { assert_any({:name => 'washington'}) }
+  assertion_test_passes("when a hash has items", "has items") { assert_any({:name => 'washington'}) }
   assertion_test_fails("when a hash is empty", "expected {} to have items") do
     assert_any({})
   end
@@ -27,25 +27,25 @@ context "A negative, any assertion macro" do
 
   asserts(":pass when string is empty") do
     any("").run(Riot::Situation.new)
-  end.equals([:pass, "has elements"])
+  end.equals([:pass, "has items"])
 
   asserts(":pass when array is empty") do
     any([]).run(Riot::Situation.new)
-  end.equals([:pass, "has elements"])
+  end.equals([:pass, "has items"])
 
   asserts(":pass when hash is empty") do
     any({}).run(Riot::Situation.new)
-  end.equals([:pass, "has elements"])
+  end.equals([:pass, "has items"])
 
   asserts(":fail when string is empty") do
     any("foo").run(Riot::Situation.new)[0..1]
-  end.equals([:fail, %Q{expected "foo" not to have elements}])
+  end.equals([:fail, %Q{expected "foo" not to have items}])
 
-  asserts(":fail when array has elements") do
+  asserts(":fail when array has items") do
     any([1,2]).run(Riot::Situation.new)[0..1]
-  end.equals([:fail, %Q{expected [1, 2] not to have elements}])
+  end.equals([:fail, %Q{expected [1, 2] not to have items}])
 
-  asserts(":fail when hash has elements") do
+  asserts(":fail when hash has items") do
     any({"bar" => "baz"}).run(Riot::Situation.new)[0..1]
-  end.equals([:fail, %Q{expected {"bar"=>"baz"} not to have elements}])
+  end.equals([:fail, %Q{expected {"bar"=>"baz"} not to have items}])
 end

data/test/core/assertion_macros/assigns_test.rb

@@ -7,10 +7,10 @@ context "An assigns assertion macro" do
     Riot::Assertion.new("test") { item }
   end
 
-  assertion_test_passes("when foo is defined") { topic.assigns(:foo) }
-  assertion_test_passes("when foo is defined with expected value") { topic.assigns(:foo, 1) }
+  assertion_test_passes("when foo is defined","assigns :foo") { topic.assigns(:foo) }
+  assertion_test_passes("when foo is defined with expected value","assigns :foo with 1") { topic.assigns(:foo, 1) }
 
-  assertion_test_fails("when foo does not match expectation", "expected :foo to be equal to 2, not 1") do
+  assertion_test_fails("when foo does not match expectation", "expected :foo to be assigned with 2, not 1") do
     topic.assigns(:foo, 2)
   end
 
@@ -32,15 +32,15 @@ context "A negative assigns assertion macro" do
 
   asserts(":pass when @bar is not defined") do
     topic.assigns(:bar).run(Riot::Situation.new)
-  end.equals([:pass, ""])
+  end.equals([:pass, "assigns :bar"])
 
   asserts(":pass when @nil_val is actually nil") do
     topic.assigns(:nil_val).run(Riot::Situation.new)
-  end.equals([:pass, ""])
+  end.equals([:pass, "assigns :nil_val"])
 
   asserts(":pass when @foo does not equal 2") do
     topic.assigns(:foo, 2).run(Riot::Situation.new)
-  end.equals([:pass, ""])
+  end.equals([:pass, "assigns :foo with 2"])
 
   asserts(":fail when @foo is defined") do
     topic.assigns(:foo).run(Riot::Situation.new)[0..1]
@@ -48,5 +48,5 @@ context "A negative assigns assertion macro" do
 
   asserts(":fail when @foo does equal 1") do
     topic.assigns(:foo, 1).run(Riot::Situation.new)[0..1]
-  end.equals([:fail, "expected :foo to not be equal to 1"])
+  end.equals([:fail, "expected :foo to not be assigned with 1"])
 end # A negative assigns assertion macro

data/test/core/assertion_macros/equivalent_to_test.rb

@@ -38,7 +38,7 @@ context "A negative equivalent_to assertion macro" do
 
   asserts("an array is not equivalent to 'what'") do
     topic.equivalent_to([]).run(Riot::Situation.new)
-  end.equals([:pass, "is not equivalent to []"])
+  end.equals([:pass, "is equivalent to []"])
 
   context "with numeric topic" do
     setup { Riot::Assertion.new("blue", true) { 31413 } }
@@ -49,7 +49,7 @@ context "A negative equivalent_to assertion macro" do
 
     asserts ":pass when in expected range" do 
       topic.equivalent_to(32000..33000).run(Riot::Situation.new)
-    end.equals([:pass, "is not equivalent to 32000..33000"])
+    end.equals([:pass, "is equivalent to 32000..33000"])
     
   end # with numeric topic
-end # A negative equivalent_to assertion macro
+end # A negative equivalent_to assertion macro

data/test/core/assertion_macros/exists_test.rb

@@ -7,11 +7,11 @@ context "An exists assertion macro" do
 
   asserts(":pass when result has a value") do
     assert_exists("foo")
-  end.equals([:pass, "is not nil"])
+  end.equals([:pass, "does exist"])
 
   asserts(":pass because empty string is considered a value") do
     assert_exists("")
-  end.equals([:pass, "is not nil"])
+  end.equals([:pass, "does exist"])
 
   asserts(":fail with message when value is nil") do
     assert_exists(nil)[0..1]
@@ -33,6 +33,6 @@ context "A negative exists assertion macro" do
 
   asserts(":pass when nil") do 
     assert_exists(nil)
-  end.equals([:pass, "is nil"])
+  end.equals([:pass, "does exist"])
   
-end # A negative exists assertion macro
+end # A negative exists assertion macro

data/test/core/assertion_macros/includes_test.rb

@@ -17,9 +17,9 @@ context "A negative includes assertion macro" do
     Riot::Assertion.new("an array", true) { [1, 6, 42, 7] }
   end
   
-  assertion_test_passes("when array doesn't include 69", "does not include 69") { topic.includes(69) }
+  assertion_test_passes("when array doesn't include 69", "includes 69") { topic.includes(69) }
   
   assertion_test_fails("when 42 is included in array", "expected [1, 6, 42, 7] to not include 42") do
     topic.includes(42)
   end
-end
+end

data/test/core/assertion_macros/kind_of_test.rb

@@ -15,7 +15,7 @@ context "A kind_of assertion macro" do
 end # A kind_of assertion macro
 
 context "A negative kind_of assertion macro" do
-  assertion_test_passes(":pass when specific result is not a kind of String", "is not a kind of String") do
+  assertion_test_passes(":pass when specific result is not a kind of String", "is a kind of String") do
     Riot::Assertion.new("foo", true) { 1 }.kind_of(String)
   end
   
@@ -23,8 +23,8 @@ context "A negative kind_of assertion macro" do
     Riot::Assertion.new("foo", true) { "a" }.kind_of(String)
   end
 
-  assertion_test_passes(":pass when nil", "is not a kind of String") do
+  assertion_test_passes(":pass when nil", "is a kind of String") do
     Riot::Assertion.new("foo", true) { }.kind_of(String)
   end
   
-end # A negative kind_of assert macro
+end # A negative kind_of assert macro

data/test/core/assertion_macros/matches_test.rb

@@ -30,7 +30,7 @@ context "A negative matching assertion macro" do
     topic.matches(/abc/)
   end
 
-  assertion_test_passes("when expression does not match", 'does not match /abcd/') do
+  assertion_test_passes("when expression does not match", 'matches /abcd/') do
     topic.matches(/abcd/)
   end
 
@@ -41,7 +41,7 @@ context "A negative matching assertion macro" do
       topic.matches(/^42$/)
     end
 
-    assertion_test_passes("actual value converted to string", 'does not match /^52$/') do
+    assertion_test_passes("actual value converted to string", 'matches /^52$/') do
       topic.matches(/^52$/)
     end
   end

data/test/core/assertion_macros/nil_test.rb

@@ -10,6 +10,6 @@ end # A nil assertion macro
 context "A negative nil assertion macro" do
   helper(:assert_not_nil) { |o| Riot::Assertion.new("foo", true) { o }.nil.run(Riot::Situation.new) }
   
-  asserts(":pass when result is not nil") { assert_not_nil(1)         }.equals([:pass, "is not nil"])
+  asserts(":pass when result is not nil") { assert_not_nil(1)         }.equals([:pass, "is nil"])
   asserts(":fail with message")           { assert_not_nil(nil)[0..1] }.equals([:fail, %Q{expected is nil, not "non-nil"}])
-end # A negative nil assertion macro
+end # A negative nil assertion macro

data/test/core/assertion_macros/raises_test.rb

@@ -8,11 +8,11 @@ context "A raises assertion macro" do
     asserts_raises(nil).raises(Whoops)
   end
 
-  assertion_test_fails("when unexpected exception is raised", "should have raised Exception, not Whoops") do
+  assertion_test_fails("when unexpected exception is raised", "expected to raise Exception, not Whoops") do
     asserts_raises(nil).raises(Exception)
   end
 
-  assertion_test_fails("when nothing was raised", "should have raised Whoops, but raised nothing") do
+  assertion_test_fails("when nothing was raised", "expected to raise Whoops, but raised nothing") do
     assertion = Riot::Assertion.new("foo") { "barf" }.raises(Whoops)
   end
   
@@ -36,31 +36,31 @@ end # A raises assertion macro
 context "A negative raises assertion macro" do
   helper(:deny_raises) { |o| Riot::Assertion.new("foo", true) { raise Whoops, o } }
 
-  assertion_test_fails("when expected exception is raised", "should have not raised Whoops, but raised Whoops") do
+  assertion_test_fails("when expected exception is raised", "expected to not raise Whoops") do
     deny_raises(nil).raises(Whoops)
   end
 
-  assertion_test_passes("when unexpected exception is raised", "not raised Exception") do
+  assertion_test_passes("when unexpected exception is raised", "raises Exception") do
     deny_raises(nil).raises(Exception)
   end
 
-  assertion_test_passes("when nothing was raised", "raised nothing") do
+  assertion_test_passes("when nothing was raised", "raises Whoops") do
     Riot::Assertion.new("foo", true) { "barf" }.raises(Whoops)
   end
   
-  assertion_test_fails("when provided message equals expected message", 'should have not raised Whoops with message "Mom", but raised Whoops with message "Mom"') do
+  assertion_test_fails("when provided message equals expected message", 'expected to not raise Whoops with message "Mom", but raised Whoops with message "Mom"') do
     deny_raises('Mom').raises(Whoops, 'Mom')
   end
 
-  assertion_test_passes("when messages and exception aren't equal", 'not raised Exception with message "Dad"') do
+  assertion_test_passes("when messages and exception aren't equal", 'raises Exception with message "Dad"') do
     deny_raises('Mom').raises(Exception, 'Dad')
   end
 
-  assertion_test_fails("when provided message matches expected message", 'should have not raised Whoops with message /Mom/, but raised Whoops with message "Mom"') do
+  assertion_test_fails("when provided message matches expected message", 'expected to not raise Whoops with message /Mom/, but raised Whoops with message "Mom"') do
     deny_raises('Mom').raises(Whoops, /Mom/)
   end
 
-  assertion_test_fails("when messages don't match", "should have not raised Whoops with message /Mom/, but raised Whoops with message \"Dad\"") do
+  assertion_test_fails("when messages don't match", "expected to not raise Whoops with message /Mom/, but raised Whoops with message \"Dad\"") do
     deny_raises('Dad').raises(Whoops,/Mom/)
   end
-end # A raises assertion macro
+end # A raises assertion macro

data/test/core/assertion_macros/respond_to_test.rb

@@ -23,8 +23,8 @@ context "A negative respond_to assertion macro" do
     topic.responds_to(:length)
   end
   
-  assertion_test_passes("when method is not defined", "does not respond to :goofballs") do
+  assertion_test_passes("when method is not defined", "responds to :goofballs") do
     topic.respond_to(:goofballs)
   end
   
-end
+end

data/test/core/assertion_macros/same_elements_test.rb

@@ -3,11 +3,11 @@ require 'teststrap'
 context "A same_elements assertion macro" do
   setup { Riot::Assertion.new("test") { ["foo", "bar", 69] } }
 
-  assertion_test_passes(%Q{when [69, "foo", "bar"] are returned}) do
+  assertion_test_passes(%Q{when [69, "foo", "bar"] are returned},%Q{has same elements as [69, "foo", "bar"]}) do
     topic.same_elements([69, "foo", "bar"])
   end
 
-  assertion_test_passes(%Q{when [69, "foo", "bar"] are returned in any order}) do
+  assertion_test_passes(%Q{when [69, "foo", "bar"] are returned in any order},%Q{has same elements as ["foo", "bar", 69]}) do
     topic.same_elements(["foo", "bar", 69])
   end
 
@@ -27,8 +27,8 @@ context "A negative same_elements assertion macro" do
     topic.same_elements(["foo", "bar", 69])
   end
 
-  assertion_test_passes("when elements do not match") do
+  assertion_test_passes("when elements do not match",%Q{has same elements as ["foo", "bar", 96]}) do
     topic.same_elements(["foo", "bar", 96])
   end
   
-end # A negative same_elements macro
+end # A negative same_elements macro