sapphire 0.6.0 → 0.6.1

data/bin/sapphire

@@ -4,24 +4,45 @@ require 'rubygems'
 require 'sapphire'
 include Sapphire::Sapphire
 
-reporter = ConsoleReporter.new()
+$reporters = []
 
 ARGV.each do |arg|
+
+  #if arg.start_with? "reporter="
+  #  item = arg.split "reporter="
+  #  $reporters << Object.const_get(item.last).new()
+  #  next
+  #end
+
   if !arg.end_with? ".rb"
     next
   end
+
   require arg
   Runner.instance.last_scenario.file_name = arg if Runner.instance.last_scenario and Runner.instance.last_scenario.file_name == ""
 end
 
-reporter.BeginTesting
+if $reporters.empty?
+  $reporters << ConsoleReporter.new()
+end
+
 
 if Runner.instance.test_plans.count > 0
   Runner.instance.last_test_plan.execute
 else
+
+  Report do |x| x.BeginTesting end
+
   Runner.instance.scenarios.each do |scenario|
-    scenario.execute reporter
-    reporter.TestingComplete
-    reporter.OutputResults
+    scenario.execute
   end
+
+  Report do |x| x.TestingComplete end
+  Report do |x| x.OutputResults end
 end
+
+def Report(&block)
+  $reporters.each do |reporter|
+    block.call reporter
+  end
+end

data/lib/sapphire/DSL/TestPlans/FileHandler.rb

@@ -2,11 +2,11 @@ module Sapphire
   module DSL
     module TestPlans
       class FileHandler
-        def Handle(item, reporter)
+        def Handle(item)
           x = AppConfig.Current.SpecsPath || ""
           require File.expand_path(x + item, __FILE__)
           Runner.instance.last_scenario.file_name = item
-          Runner.instance.last_scenario.execute reporter
+          Runner.instance.last_scenario.execute
         end
       end
     end

data/lib/sapphire/DSL/TestPlans/PathHandler.rb

@@ -2,12 +2,12 @@ module Sapphire
   module DSL
     module TestPlans
       class PathHandler
-        def Handle(item, reporter)
+        def Handle(item)
           x = AppConfig.Current.SpecsPath || ""
           Dir[x + item + '*.rb'].each  do |file|
             require file
             Runner.instance.last_scenario.file_name = file
-            Runner.instance.last_scenario.execute reporter
+            Runner.instance.last_scenario.execute
           end
         end
       end

data/lib/sapphire/DSL/TestPlans/TestPlan.rb

@@ -3,8 +3,7 @@ module Sapphire
     module TestPlans
 
       def TestPlan(text, &block)
-        reporter = ConsoleReporter.new()
-        Runner.instance.add_test_plan(TestPlan.new(text, reporter, &block))
+        Runner.instance.add_test_plan(TestPlan.new(text, &block))
       end
 
       class TestPlan
@@ -13,11 +12,10 @@ module Sapphire
         attr_reader :value
         attr_reader :text
 
-        def initialize(text, reporter, &block)
+        def initialize(text, &block)
           @value = text
           @text = text.to_s
           @block = block
-          @reporter = reporter
 
           @items = []
           @handlers = []
@@ -36,7 +34,7 @@ module Sapphire
             @handlers.each do |handler|
               handler.keys.each do |handler_key|
                 if(handler_key == key)
-                  handler[handler_key].Handle item[key], @reporter
+                  handler[handler_key].Handle item[key]
                 end
               end
             end
@@ -48,11 +46,17 @@ module Sapphire
         end
 
         def execute
-          @reporter.BeginTesting
+          Report do |x| x.BeginTesting end
           $stdout.puts ""
           @block.call
-          @reporter.TestingComplete
-          @reporter.OutputResults
+          Report do |x| x.TestingComplete end
+          Report do |x| x.OutputResults end
+        end
+
+        def Report(&block)
+          $reporters.each do |reporter|
+            block.call reporter
+          end
         end
       end
     end

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -8,19 +8,20 @@ module Sapphire
         @failing_count = 0
         @pending_count = 0
         @test_count = 0
+        @output = $stdout
       end
 
       def ScenarioStart(scenario)
-        $stdout.puts scenario.file_name + ": "
+        @output.puts scenario.file_name + ": "
       end
 
       def ScenarioComplete(scenario)
-        $stdout.puts ""
+        @output.puts ""
       end
 
       def Indent(depth)
         (1..depth).each do
-          $stdout.print "\t"
+          @output.print "\t"
         end
       end
 
@@ -28,28 +29,28 @@ module Sapphire
         Indent(depth)
 
         if result.type == 'pass'
-          $stdout.puts result.text.colorize :green
+          @output.puts result.text.colorize :green
         elsif result.type == 'pending'
-          $stdout.puts result.text.colorize :yellow
+          @output.puts result.text.colorize :yellow
           Indent(depth+1)
-          $stdout.puts " ## Not Yet Implemented ##"
+          @output.puts " ## Not Yet Implemented ##"
         else
-          $stdout.puts result.text.colorize :red
+          @output.puts result.text.colorize :red
           if result.messages.is_a? Array
             result.messages.each do |message|
               Indent(depth+1)
-              $stdout.puts message
+              @output.puts message
             end
 
           else
             Indent(depth+1)
-            $stdout.puts result.messages
+            @output.puts result.messages
           end
-          $stdout.puts ""
+          @output.puts ""
           result.stack.each do |line|
             #if (!line.include? "sapphire")
               Indent(depth+1)
-              $stdout.puts line
+              @output.puts line
             #end
           end
 
@@ -57,7 +58,7 @@ module Sapphire
       end
 
       def InsertLineBreak()
-        $stdout.puts ""
+        @output.puts ""
       end
 
       def TestStarted(test)
@@ -66,19 +67,19 @@ module Sapphire
 
       def TestPassed(test)
         @passing_count = @passing_count + 1
-        $stdout.print ".".colorize :green
+        @output.print ".".colorize :green
       end
 
       def TestFailed(test)
         @failing_count = @failing_count + 1
         Add test
-        $stdout.print "F".colorize :red
+        @output.print "F".colorize :red
       end
 
       def TestPending(test)
         @pending_count = @pending_count + 1
         Add test
-        $stdout.print "*".colorize :yellow
+        @output.print "*".colorize :yellow
       end
 
       def Add(r)
@@ -99,18 +100,18 @@ module Sapphire
       end
 
       def OutputResults()
-        $stdout.puts ""
+        @output.puts ""
 
         @not_passing.keys.each do |key|
           self.PrintResult @not_passing[key]
         end
 
-        $stdout.puts ""
-        $stdout.puts "Finished in " + (@end - @start).round().to_s + " seconds."
-        $stdout.puts "Test Count: " + @test_count.to_s
-        $stdout.puts "Passing: " + @passing_count.to_s.colorize(:green)
-        $stdout.puts "Failing: " + @failing_count.to_s.colorize(:red)
-        $stdout.puts "Pending: " + @pending_count.to_s.colorize(:yellow)
+        @output.puts ""
+        @output.puts "Finished in " + (@end - @start).round().to_s + " seconds."
+        @output.puts "Test Count: " + @test_count.to_s
+        @output.puts "Passing: " + @passing_count.to_s.colorize(:green)
+        @output.puts "Failing: " + @failing_count.to_s.colorize(:red)
+        @output.puts "Pending: " + @pending_count.to_s.colorize(:yellow)
       end
 
       def Output(result, depth)

data/lib/sapphire/Testing/Coverage/Feature.rb

@@ -14,7 +14,7 @@ module Sapphire
 
         def initialize(token)
           @token = token
-          @behaviors = []
+          @requirements = []
         end
 
         def AddRequirement(requirement)

data/lib/sapphire/Testing/Executable.rb

@@ -1,27 +1,33 @@
 module Sapphire
   module Testing
     module Executable
-      def execute(reporter)
+      def execute()
         start = Time.now
-        reporter.TestStarted(self)
+        Report do |x| x.TestStarted(self) end
         begin
           if(self.value.is_a? Pending)
             result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
             self.AddResult(result)
-            reporter.TestPending result
+            Report do |x| x.TestPending(result) end
             return
           end
           self.block.call
           result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
           self.AddResult(result)
-          reporter.TestPassed result
+          Report do |x| x.TestPassed(result) end
         rescue => msg
           stack = msg.backtrace
           message = msg.messages if (msg.is_a? ExpectationException)
           message ||= msg.message
           result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
           self.AddResult(result)
-          reporter.TestFailed result
+          Report do |x| x.TestFailed(result) end
+        end
+      end
+
+      def Report(&block)
+        $reporters.each do |reporter|
+          block.call reporter
         end
       end
     end

data/lib/sapphire/Testing/HtmlReporter.rb

@@ -9,6 +9,7 @@ module Sapphire
         @failing_count = 0
         @pending_count = 0
         @test_count = 0
+        @output = $stdout
       end
 
       def TestStarted(test)
@@ -17,44 +18,44 @@ module Sapphire
 
       def TestPassed(test)
         @passing_count = @passing_count + 1
-        $stdout.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{test.text}</span></dd>"
+        @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{test.text}</span></dd>"
       end
 
       def TestFailed(test)
 
         failure_style = 'failed'
-        $stdout.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
+        @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
         @header_red = true
-        $stdout.puts "    <script type=\"text/javascript\">makeRed('example_group_#{@example_group_number}');</script>" unless @example_group_red
+        @output.puts "    <script type=\"text/javascript\">makeRed('example_group_#{@example_group_number}');</script>" unless @example_group_red
         @example_group_red = true
-        $stdout.puts "    <dd class=\"spec #{failure_style}\">"
-        $stdout.puts "      <span class=\"failed_spec_name\">#{test.text}</span>"
-        $stdout.puts "      <div class=\"failure\" id=\"failure_#{@test_count}\">"
+        @output.puts "    <dd class=\"spec #{failure_style}\">"
+        @output.puts "      <span class=\"failed_spec_name\">#{test.text}</span>"
+        @output.puts "      <div class=\"failure\" id=\"failure_#{@test_count}\">"
 
         if test.messages.is_a? Array
           message_block = ""
           test.messages.each do |message|
             message_block += message + "<br>"
           end
-          $stdout.puts "        <div class=\"message\"><pre>#{message_block}</pre></div>"
+          @output.puts "        <div class=\"message\"><pre>#{message_block}</pre></div>"
         else
-          $stdout.puts "        <div class=\"message\"><pre>#{test.messages}</pre></div>"
+          @output.puts "        <div class=\"message\"><pre>#{test.messages}</pre></div>"
         end
 
         test.stack.each do |line|
           if (!line.include? "sapphire")
-            $stdout.puts "        <div class=\"backtrace\"><pre>#{line}</pre></div>"
+            @output.puts "        <div class=\"backtrace\"><pre>#{line}</pre></div>"
           end
         end
 
-        $stdout.puts "      </div>"
-        $stdout.puts "    </dd>"
+        @output.puts "      </div>"
+        @output.puts "    </dd>"
       end
 
       def TestPending(test)
-        $stdout.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
-        $stdout.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{@example_group_number}');</script>" unless @example_group_red
-        $stdout.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{test.text} (PENDING: ### Not Yet Implemented ###)</span></dd>"
+        @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
+        @output.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{@example_group_number}');</script>" unless @example_group_red
+        @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{test.text} (PENDING: ### Not Yet Implemented ###)</span></dd>"
       end
 
       def TestingComplete
@@ -63,30 +64,30 @@ module Sapphire
         totals = "#{@test_count} example#{'s' unless @test_count == 1}, #{@failure_count} failure#{'s' unless @failure_count == 1}"
         totals << ", #{@pending_count} pending" if @pending_count > 0
 
-        $stdout.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{(@end - @start).round(2).to_s} seconds</strong>\";</script>"
-        $stdout.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
-        $stdout.puts "</div>"
-        $stdout.puts "</div>"
-        $stdout.puts "</body>"
-        $stdout.puts "</html>"
+        @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{(@end - @start).round(2).to_s} seconds</strong>\";</script>"
+        @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
+        @output.puts "</div>"
+        @output.puts "</div>"
+        @output.puts "</body>"
+        @output.puts "</html>"
       end
 
       def BeginTesting
         @start = Time.now
-        $stdout.puts html_header
-        $stdout.puts report_header
+        @output.puts html_header
+        @output.puts report_header
       end
 
       def ScenarioStart(scenario)
         @example_group_red = false
         @example_group_number += 1
         unless @example_group_number == 1
-          $stdout.puts "  </dl>"
-          $stdout.puts "</div>"
+          @output.puts "  </dl>"
+          @output.puts "</div>"
         end
-        $stdout.puts "<div class=\"example_group\">"
-        $stdout.puts "  <dl>"
-        $stdout.puts "  <dt id=\"example_group_#{@example_group_number}\">#{scenario.text}</dt>"
+        @output.puts "<div class=\"example_group\">"
+        @output.puts "  <dl>"
+        @output.puts "  <dt id=\"example_group_#{@example_group_number}\">#{scenario.text}</dt>"
       end
 
       def OutputResults()

data/lib/sapphire/Testing/TestRunnerAdapter.rb

@@ -2,16 +2,22 @@ module Sapphire
   module Testing
     module TestRunnerAdapter
 
-      def execute(reporter)
-        reporter.ScenarioStart self
+      def Report(&block)
+        $reporters.each do |reporter|
+          block.call reporter
+        end
+      end
+
+      def execute()
+        Report do |x| x.ScenarioStart(self) end
 
         self.backgrounds.each do |b|
 
-          b.execute reporter
+          b.execute
 
           b.and.each do |g_a|
 
-            g_a.execute reporter
+            g_a.execute
 
           end
 
@@ -20,29 +26,29 @@ module Sapphire
         self.givens.each do |g|
           g.when.each do |w|
 
-            g.execute reporter
+            g.execute
 
             g.and.each do |g_a|
 
-              g_a.execute reporter
+              g_a.execute
 
             end
 
-            w.execute reporter
+            w.execute
 
             w.and.each do |w_a|
 
-              w_a.execute reporter
+              w_a.execute
 
             end
 
             w.then.each do |t|
 
-              t.execute reporter
+              t.execute
 
               t.and.each do |t_a|
 
-                t_a.execute reporter
+                t_a.execute
 
               end
 
@@ -52,13 +58,13 @@ module Sapphire
 
           if(g.finally)
 
-            g.finally.execute reporter
+            g.finally.execute
 
           end
 
         end
 
-        reporter.ScenarioComplete self
+        Report do |x| x.ScenarioComplete(self) end
 
       end
     end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &10000008 !ruby/object:Gem::Requirement
+  requirement: &10056984 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10000008
+  version_requirements: *10056984
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9999756 !ruby/object:Gem::Requirement
+  requirement: &10056732 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9999756
+  version_requirements: *10056732
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9999504 !ruby/object:Gem::Requirement
+  requirement: &10056480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9999504
+  version_requirements: *10056480
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: