riot 0.10.10 → 0.10.11

data/CHANGELOG

@@ -1,3 +1,35 @@
+*0.10.11*
+
+* Context#asserts_topic now takes an optional description [gabrielg, jaknowlden]
+
+    asserts_topic.exists
+    asserts_topic("some kind of description").exists
+
+* Added not! assertion macro [gabrielg, jaknowlden]
+
+    setup { User.new(:funny? => false) }
+    asserts(:funny?).not!
+
+* Added Context#hookup to add some setup code to an already defined topic [jaknowlden]
+
+    context "yo mama" do
+      setup { YoMama.new }
+      # ...
+      context "is cool" do
+        hookup { topic.do_something_involving_state }
+        asserts_topic.kind_of?(YoMama)
+      end
+    end
+
+* Added Riot.alone! mode to ensure Riot.run is not run at-exit [jaknowlden]
+
+    Riot.alone!
+    Riot.run
+
+  This will still print output unless you also Riot.silently!
+
+* Returning non-zero status at-exit when tests don't pass [gabrielg, jaknowlden]
+
 *0.10.10*
 
 * Passing assertion macros can now return a custom message [dasch, jaknowlden]

data/VERSION

@@ -1 +1 @@
-0.10.10
+0.10.11

data/lib/riot.rb

@@ -17,11 +17,16 @@ module Riot
     the_reporter.summarize do
       root_contexts.each { |ctx| ctx.run(the_reporter) }
     end
+    the_reporter
   end
 
   def self.silently!; @silent = true; end
   def self.silently?; defined?(@silent) && @silent == true end
 
+  # This means you don't want Riot to run tests for you. You will execute Riot.run manually.
+  def self.alone!; @alone = true; end
+  def self.alone?; defined?(@alone) && @alone == true end
+
   def self.reporter=(reporter_class) @reporter_class = reporter_class; end
 
   def self.reporter
@@ -36,7 +41,7 @@ module Riot
   def self.verbose; Riot.reporter = Riot::VerboseStoryReporter; end
   def self.dots; Riot.reporter = Riot::DotMatrixReporter; end
 
-  at_exit { run unless Riot.silently? }
+  at_exit { exit(run.success?) unless Riot.alone? }
 end # Riot
 
 class Object

data/lib/riot/assertion_macro.rb

@@ -29,6 +29,7 @@ require 'riot/assertion_macros/includes'
 require 'riot/assertion_macros/kind_of'
 require 'riot/assertion_macros/matches'
 require 'riot/assertion_macros/nil'
+require 'riot/assertion_macros/not_borat'
 require 'riot/assertion_macros/raises'
 require 'riot/assertion_macros/respond_to'
 require 'riot/assertion_macros/same_elements'

data/lib/riot/assertion_macros/not_borat.rb

@@ -0,0 +1,16 @@
+module Riot
+  # Asserts the result of the test is a non-truthy value. Read the following assertions in the way Borat
+  # learned about humor:
+  #   asserts("you are funny") { false }.not!
+  #   should("be funny") { nil }.not!
+  #
+  # Thusly, Borat would say "You are funny ... not!" The above two assertions would pass because the values
+  # are non-truthy.
+  class NotMacro < AssertionMacro
+    register :not!
+
+    def evaluate(actual)
+      actual ? fail("expected to exist ... not!") : pass("does exist ... not!")
+    end
+  end
+end

data/lib/riot/context.rb

@@ -14,11 +14,27 @@ module Riot
     def teardowns; @parent.teardowns + @teardowns; end
     
     def setup(&definition) (@setups << Setup.new(&definition)).last; end
+
+    # A setup shortcut that returns the original topic so you don't have to. Good for nested setups. Instead
+    # of doing this in your context:
+    #
+    #   setup do
+    #     topic.do_something
+    #     topic
+    #   end
+    #
+    # You would do this:
+    #
+    #   hookup { topic.do_something } # Yay!
+    def hookup(&definition)
+      setup { self.instance_eval(&definition); topic }
+    end
+
     def teardown(&definition) (@teardowns << Setup.new(&definition)).last; 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 asserts_topic(what="topic"); asserts(what) { topic }; end
 
     def context(description, &definition)
       @contexts << self.class.new("#{@description} #{description}", self, &definition)

data/lib/riot/reporter.rb

@@ -6,6 +6,7 @@ module Riot
       @current_context = ""
     end
 
+    def success?; (@failures + @errors) == 0; end
     def summarize(&block)
       started = Time.now
       yield

data/riot.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.10.10"
+  s.version = "0.10.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "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",
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
      "test/assertion_macros/kind_of_test.rb",
      "test/assertion_macros/matching_test.rb",
      "test/assertion_macros/nil_test.rb",
+     "test/assertion_macros/not_borat_test.rb",
      "test/assertion_macros/raises_test.rb",
      "test/assertion_macros/respond_to_test.rb",
      "test/assertion_macros/same_elements_test.rb",
@@ -84,6 +86,7 @@ Gem::Specification.new do |s|
      "test/assertion_macros/kind_of_test.rb",
      "test/assertion_macros/matching_test.rb",
      "test/assertion_macros/nil_test.rb",
+     "test/assertion_macros/not_borat_test.rb",
      "test/assertion_macros/raises_test.rb",
      "test/assertion_macros/respond_to_test.rb",
      "test/assertion_macros/same_elements_test.rb",

data/test/assertion_macros/not_borat_test.rb

@@ -0,0 +1,15 @@
+require 'teststrap'
+
+context "A not! assertion macro" do
+  setup do
+    def assert_not(value)
+      Riot::Assertion.new("test") { value }.not!
+    end
+  end
+
+  assertion_test_passes("when value is false", "does exist ... not!") { assert_not(false) }
+  assertion_test_passes("when value is nil", "does exist ... not!") { assert_not(nil) }
+  assertion_test_fails("when value is not nil or false", "expected to exist ... not!") do
+    assert_not("funny")
+  end
+end # A not! assertion macro

data/test/benchmark/riot_vs_minitest.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__)+"/../../lib")
+$:.unshift(File.dirname(__FILE__) + "/../../lib")
 require 'benchmark'
 
 #
@@ -46,6 +46,7 @@ n = 100 * 100
 Benchmark.bmbm do |x|
   x.report("Riot") do
     Riot.silently!
+    Riot.alone!
     n.times { Riot.run }
   end
 

data/test/benchmark/simple_context_and_assertions.rb

@@ -1,4 +1,4 @@
-$:.concat ['./lib']
+$:.unshift(File.dirname(__FILE__) + "/../../lib/")
 require 'benchmark'
 
 #
@@ -62,6 +62,7 @@ n = 100 * 100
 Benchmark.bmbm do |x|
   x.report("Riot") do
     Riot.silently!
+    Riot.alone!
     n.times { Riot.run }
   end
 

data/test/context_test.rb

@@ -87,4 +87,24 @@ context "The asserts_topic shortcut" do
     (situation = Riot::Situation.new).topic = "bar"
     topic.equals("bar").run(situation)
   end.equals([:pass, %Q{is equal to "bar"}])
+
+  asserts(:to_s).equals("asserts topic")
+
+  context "with an explicit description" do
+    setup { Riot::Context.new("foo") {}.asserts_topic("get some") }
+    asserts(:to_s).equals("asserts get some")
+  end
+
 end # The asserts_topic shortcut
+
+context "Using a hookup" do
+  setup do
+    situation = Riot::Situation.new
+    a_context = Riot::Context.new("foobar") {}
+    a_context.setup { "I'm a string" }.run(situation)
+    a_context.hookup { topic.size }.run(situation)
+    situation.topic
+  end
+  
+  asserts_topic.equals("I'm a string")
+end # Using a hookup

data/test/report_test.rb

@@ -6,6 +6,7 @@ context "A reporter" do
       def pass(d, message) "passed(#{d}, #{message.inspect})"; end
       def fail(d, message) "failed(#{d}, #{message})"; end
       def error(d, e) "errored(#{d}, #{e})"; end
+      def results(time); end
     end.new
   end
 
@@ -44,9 +45,23 @@ context "A reporter" do
 
   context "instance" do
     setup { Riot::Reporter.new }
-
     should("return self invoking new") { topic.new }.equals { topic }
   end
+
+  context "with no errors or failures" do
+    hookup { topic.report("foo", [:pass, nil]) }
+    asserts(:success?)
+  end
+
+  context "with failures and no errors" do
+    hookup { topic.report("foo", [:fail, "blah"]) }
+    asserts(:success?).equals(false)
+  end
+
+  context "with errors and no failures" do
+    hookup { topic.report("foo", [:error, Exception.new("boogers")]) }
+    asserts(:success?).equals(false)
+  end
 end # A reporter
 
 require 'stringio'

data/test/teststrap.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.10.10
+  version: 0.10.11
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -50,6 +50,7 @@ files:
 - 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
@@ -68,6 +69,7 @@ files:
 - test/assertion_macros/kind_of_test.rb
 - test/assertion_macros/matching_test.rb
 - test/assertion_macros/nil_test.rb
+- test/assertion_macros/not_borat_test.rb
 - test/assertion_macros/raises_test.rb
 - test/assertion_macros/respond_to_test.rb
 - test/assertion_macros/same_elements_test.rb
@@ -121,6 +123,7 @@ test_files:
 - test/assertion_macros/kind_of_test.rb
 - test/assertion_macros/matching_test.rb
 - test/assertion_macros/nil_test.rb
+- test/assertion_macros/not_borat_test.rb
 - test/assertion_macros/raises_test.rb
 - test/assertion_macros/respond_to_test.rb
 - test/assertion_macros/same_elements_test.rb