riot 0.12.1 → 0.12.2

data/test/core/assertion_macros/size_test.rb

@@ -52,10 +52,10 @@ context "A negative size assertion macro" do
     deny_size("washington", 9..12)
   end
 
-  assertion_test_passes("when string's size is not as expected", 'is not size 11') do
+  assertion_test_passes("when string's size is not as expected", 'is size 11') do
     deny_size("washington", 11)
   end
-  assertion_test_passes("when string's size is out of range", 'is not size 11..13') do
+  assertion_test_passes("when string's size is out of range", 'is size 11..13') do
     deny_size("washington", 11..13)
   end
 
@@ -65,10 +65,10 @@ context "A negative size assertion macro" do
   assertion_test_fails("when an array's size is in given range", 'expected size of [1, 2, 3] to not be 3..4, not 3') do
     deny_size([1, 2, 3], 3..4)
   end
-  assertion_test_passes("when an array's size is not as expected", "is not size 2") do
+  assertion_test_passes("when an array's size is not as expected", "is size 2") do
     deny_size([1, 2, 3], 2)
   end
-  assertion_test_passes("when an array's size is out of range", "is not size 4..6") do
+  assertion_test_passes("when an array's size is out of range", "is size 4..6") do
     deny_size([1, 2, 3], 4..6)
   end
 
@@ -78,10 +78,10 @@ context "A negative size assertion macro" do
   assertion_test_fails("when a hash size is in range", 'expected size of {:a=>"b"} to not be 1...3, not 1') do
     deny_size({:a => 'b'}, 1...3)
   end
-  assertion_test_passes("when a hash size is not as expected", "is not size 2") do
+  assertion_test_passes("when a hash size is not as expected", "is size 2") do
     deny_size({}, 2)
   end
-  assertion_test_passes("when a hash size is out of range", "is not size 2...4") do
+  assertion_test_passes("when a hash size is out of range", "is size 2...4") do
     deny_size({}, 2...4)
   end
 end

data/test/core/context/asserts_with_arguments_test.rb

@@ -0,0 +1,12 @@
+require 'teststrap'
+
+context "an assertion made with arguments" do
+  setup do
+    Riot::Context.new("foo") {}.asserts([:[], 0])
+  end
+
+  should("pass its argument to send, with the first argument as method name") do
+    (situation = Riot::Situation.new).instance_variable_set(:@_topic, [1, 2])
+    topic.equals(1).run(situation).first
+  end.equals(:pass)
+end # assertion made with arguments

data/test/core/context/using_describe_in_a_test.rb

@@ -21,7 +21,7 @@ context "Using a describe sub-context" do
         setup { "another thing is my" }
         asserts_topic.kind_of(String)
       end
-    end.run(Riot::Reporter.new)
+    end.run(Riot::SilentReporter.new)
   end
 
   asserts("current context description") do

data/test/core/report_test.rb

@@ -73,14 +73,18 @@ context "StoryReporter" do
 
   asserts("success message is stripped if nil") do
     topic.pass("foo", nil)
-    ColorHelper.uncolored(@out.string)
-  end.equals("  + foo\n")
+    @out.string
+    # ColorHelper.uncolored(@out.string)
+  end.matches(/\+ \e\[32mfoo\e\[0m\n/)
+  # end.equals("  + foo\n")
 
   asserts("failure message excludes line info if none provided") do
     @out.rewind
     topic.fail("foo", "bar", nil, nil)
-    ColorHelper.uncolored(@out.string)
-  end.equals("  - foo: bar\n")
+    @out.string
+    # ColorHelper.uncolored(@out.string)
+  end.matches(/\- \e\[33mfoo: bar\e\[0m\n/)
+  # end.equals("  - foo: bar\n")
 
   context 'reporting on an empty context' do
     setup do
@@ -149,6 +153,6 @@ 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\z/)
+    asserts_topic('puts the filtered exception backtrace').matches(/#{__FILE__}:\d+:[^\n]*\n\n.*$\n\z/)
   end
 end

data/test/core/runnable/message_test.rb

@@ -5,21 +5,21 @@ context "A message object" do
 
   asserts("opening phrase has inspected values") do
     Riot::Message.new("bar", nil, {:a => 2}).to_s
-  end.equals(%q["bar" nil {:a=>2}])
-
-  asserts("+ pushes phrase onto string") do
-    Riot::Message.new.mommy.push("dearest").to_s
-  end.equals(%q[mommy dearest])
+  end.equals(%q["bar", nil, {:a=>2}])
 
   context "receiving calls for unbound methods" do
     asserts("message") do
       Riot::Message.new.bar.to_s
     end.equals(%q[bar])
 
-    asserts("message with args") do
+    asserts("message with an arguments") do
       Riot::Message.new("Foo").bar("baz").to_s
     end.equals(%q["Foo" bar "baz"])
 
+    asserts("message with multiple arguments") do
+      Riot::Message.new("Foo").bar("baz", "boo", [1,2,3]).to_s
+    end.equals(%q{"Foo" bar "baz", "boo", [1, 2, 3]})
+
     asserts("in a long chain with underscored words") do
       Riot::Message.new.bar.baz.your_mom.to_s
     end.equals(%q[bar baz your mom])
@@ -32,4 +32,8 @@ context "A message object" do
 
   asserts("#not") { Riot::Message.new.not.to_s }.equals(", not")
   asserts("#not with message") { Riot::Message.new("Foo").not("a").to_s }.equals(%q["Foo", not "a"])
+
+  asserts("calling with inspect") do
+    Riot::Message.new.happy_nappy.inspect.to_s
+  end.equals("happy nappy")
 end # A message object

data/test/teststrap.rb

@@ -35,9 +35,3 @@ class MockReporter < Riot::Reporter
   def error(description, e); end
   def results; end
 end
-
-class ColorHelper
-  require 'rubygems'
-  require 'term/ansicolor'
-  extend Term::ANSIColor
-end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 12
-  - 1
-  version: 0.12.1
+  prerelease: 
+  version: 0.12.2
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -14,48 +10,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -06:00
+date: 2011-02-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 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: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .yardopts
 - CHANGELOG
+- Gemfile
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- TODO.markdown
-- VERSION
 - lib/riot.rb
 - lib/riot/assertion.rb
 - lib/riot/assertion_macro.rb
@@ -80,12 +64,16 @@ files:
 - lib/riot/message.rb
 - lib/riot/middleware.rb
 - lib/riot/reporter.rb
+- lib/riot/reporter/dot_matrix.rb
+- lib/riot/reporter/io.rb
+- lib/riot/reporter/pretty_dot_matrix.rb
+- lib/riot/reporter/silent.rb
+- lib/riot/reporter/story.rb
 - lib/riot/rr.rb
 - lib/riot/runnable.rb
 - lib/riot/situation.rb
+- lib/riot/version.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
@@ -106,6 +94,7 @@ files:
 - 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/asserts_with_arguments_test.rb
 - test/core/context/context_test.rb
 - test/core/context/context_with_options_test.rb
 - test/core/context/deny_test.rb
@@ -137,28 +126,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: An extremely fast, expressive, and context-driven unit-testing framework. Protest the slow test.
 test_files: 
-- test/benchmark/colorize.rb
 - test/benchmark/message_concatenation.rb
 - test/benchmark/riot_vs_minitest.rb
 - test/benchmark/same_elements_vs_set.rb
@@ -179,6 +165,7 @@ test_files:
 - 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/asserts_with_arguments_test.rb
 - test/core/context/context_test.rb
 - test/core/context/context_with_options_test.rb
 - test/core/context/deny_test.rb

data/TODO.markdown

@@ -1,14 +0,0 @@
-- Documentation
-  - Introduction
-    - overall example
-  - Assertion 
-    - scope
-    - extensions (e.g. rack/test)
-  - Yard
-    - use yard to document the #assertion method used to define new assertions so the defined assertions will show up in the docs ( http://gnuu.org/2009/11/18/customizing-yard-templates/ )
-    
-- Assertion Macros
-  - include/any/contains (array,hash, maybe string?)
-    - perhaps able to take an enumerable and compare...
-      { [1,2,3] }.contains(2,3) 
-      { "the song that never ends" }.contains("never","ends")

data/VERSION

@@ -1 +0,0 @@
-0.12.1

data/test.watchr

@@ -1,70 +0,0 @@
-ENV["WATCHR"] = "1"
-system 'clear'
-
-def growl(message)
-  growlnotify = `which growlnotify`.chomp
-  title = "Watchr Test Results"
-  image = message.include?('0 failures, 0 errors') ? "~/.watchr_images/passed.png" : "~/.watchr_images/failed.png"
-  options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
-  system %(#{growlnotify} #{options} &)
-end
-
-def run(cmd)
-  puts(cmd)
-  `#{cmd}`
-end
-
-def run_test_file(file)
-  system('clear')
-  result = run(%Q(ruby -I"lib:test" -rubygems #{file}))
-  growl result.split("\n").last rescue nil
-  puts result
-end
-
-def run_all_tests
-  system('clear')
-  result = run "rake test:all"
-  growl result.split("\n").last rescue nil
-  puts result
-end
-
-def run_all_features
-  system('clear')
-  run "cucumber"
-end
-
-def related_test_files(path)
-  Dir['test/**/*.rb'].select { |file| file =~ /#{File.basename(path).split(".").first}_test.rb/ }
-end
-
-def run_suite
-  run_all_tests
-  # run_all_features
-end
-
-watch('test/teststrap\.rb') { run_all_tests }
-watch('test/(.*).*_test\.rb') { |m| run_test_file(m[0]) }
-watch('lib/.*/.*\.rb') { |m| related_test_files(m[0]).map {|tf| run_test_file(tf) } }
-# watch('features/.*/.*\.feature') { run_all_features }
-
-# Ctrl-\
-Signal.trap 'QUIT' do
-  puts " --- Running all tests ---\n\n"
-  run_all_tests
-end
-
-@interrupted = false
-
-# Ctrl-C
-Signal.trap 'INT' do
-  if @interrupted then
-    @wants_to_quit = true
-    abort("\n")
-  else
-    puts "Interrupt a second time to quit"
-    @interrupted = true
-    Kernel.sleep 1.5
-    # raise Interrupt, nil # let the run loop catch it
-    run_suite
-  end
-end

data/test/benchmark/colorize.rb

@@ -1,39 +0,0 @@
-require 'rubygems'
-require 'benchmark'
-require 'colorize'
-require 'term/ansicolor'
-
-class MyString < String
-  include ::Term::ANSIColor
-end
-
-colorize = String.new
-term_ansicolor = MyString.new
-
-n = 50_000
-
-Benchmark.bmbm do |x|
-  x.report("colorize") do
-    n.times do
-      colorize.green
-      colorize.yellow
-      colorize.red
-    end
-  end
-  x.report("term-ansicolor") do
-    n.times do
-      term_ansicolor.green
-      term_ansicolor.yellow
-      term_ansicolor.red
-    end
-  end
-end
-
-# Rehearsal --------------------------------------------------
-# colorize         4.140000   0.160000   4.300000 (  4.375765)
-# term-ansicolor   0.720000   0.000000   0.720000 (  0.730665)
-# ----------------------------------------- total: 5.020000sec
-# 
-#                      user     system      total        real
-# colorize         4.070000   0.170000   4.240000 (  4.459804)
-# term-ansicolor   0.700000   0.000000   0.700000 (  0.728494)