quarry 0.5.0 → 0.5.2

data/lib/quarry/monitor.rb

@@ -17,3 +17,7 @@ BEGIN {
    end
 }
 
+
+def p(*args)
+  super *(args << caller[0])
+end

data/lib/quarry/reporter.rb

@@ -24,43 +24,65 @@ module Quarry
       @error = []
     end
 
+    # Before running any specifications.
     def report_intro
     end
 
+    # Beginning of a specification.
     def report_start(spec)
       @specs += 1
     end
 
+    # Report a header.
     def report_header(step)
     end
 
+    # Report a comment.
     def report_comment(step)
     end
 
-    def report_mode(step)
-      report_literal(step)
-    end
+    # Er... what was this for?
+    #def report_mode(step)
+    #  report_literal(step)
+    #end
 
+    # Before running a step.
     def report_step(step)
       @steps += 1
     end
 
+    # Report step passed.
     def report_pass(step)
       @pass << step
     end
 
+    # Report step failed.
     def report_fail(step, assertion)
       @fail << [step, assertion]
     end
 
+    # Report step raised an error.
     def report_error(step, exception)
       raise exception if $DEBUG
       @error << [step, exception]
     end
 
+    # Since regular macro step does not pass or fail,
+    # this method is used instead.
+    #
+    # TODO: Rename to #report_nominal (?)
+    def report_macro(step)
+    end
+
+    # After running a step.
+    def report_step_end(step)
+    end
+
+    # End of a specification.
     def report_end(spec)
     end
 
+    # After running all specifications.
     def report_summary
     end
 

data/lib/quarry/reporter/dotprogress.rb

@@ -7,21 +7,23 @@ module Quarry
     #
     class DotProgress < Reporter
 
+      #
       def report_intro
         @start_time = Time.now
         puts "Started"
       end
 
+      #
       def report_step(step)
         super
-        if step.code
+        #if step.code
           print "."
           #str = "(%s) %s" % [count.join('.'), str.tab(6).strip]
           #puts "* #{step.text.tab(2).strip}"
           #puts "\n#{step.code}\n" if $VERBOSE
-        else
+        #else
           #puts "\n#{step.text}"
-        end
+        #end
       end
 
       #def report(str)

data/lib/quarry/reporter/summary.rb

@@ -12,25 +12,25 @@ module Quarry
     class Summary < Reporter
 
       def report_header(step)
-        puts ANSICode.bold(step.text)
+        puts ANSICode.bold("#{step}")
       end
 
       def report_comment(step)
-        txt = step.text.tabto(2)
+        txt = step.to_s.tabto(2)
         txt[0,1] = "*"
         puts txt 
       end
 
       def report_macro(step)
-        txt = step.text.tabto(2)
+        txt = step.to_s.tabto(2)
         txt[0,1] = "*"
         puts txt 
         #puts
-        #puts ANSICode.magenta("#{step.code}")
+        #puts ANSICode.magenta("#{step}")
       end
 
       def report_pass(step)
-        #puts ANSICode.green("#{step.code}")
+        #puts ANSICode.green("#{step}")
       end
 
       def report_fail(step, assertion)
@@ -40,7 +40,7 @@ module Quarry
         msg = ANSICode.magenta(msg)
         puts msg
         #puts
-        puts ANSICode.red("#{step.code}")
+        puts ANSICode.red("#{step}")
       end
 
       def report_error(step, exception)
@@ -52,7 +52,7 @@ module Quarry
         msg = ANSICode.magenta(msg)
         puts msg
         #puts
-        puts ANSICode.red("#{step.code}")
+        puts ANSICode.red("#{step}")
       end
 
       #def report(str)

data/lib/quarry/reporter/verbatim.rb

@@ -12,58 +12,64 @@ module Quarry
       #  super
       #  if step.code
       #    #str = "(%s) %s" % [count.join('.'), str.tab(6).strip]
-      #    #puts "* #{step.text.tab(2).strip}"
+      #    #puts "* #{step.to_s.tab(2).strip}"
       #    #puts
-      #    #puts step.text
+      #    #puts step.to_s
       #    #puts
       #  else
-      #    #puts "#{step.text}\n"  # TODO: This never happens.
+      #    #puts "#{step}\n"  # TODO: This never happens.
       #  end
       #end
 
       def report_header(step)
-        puts ANSICode.bold(step.text)
-        puts
+        puts ANSICode.bold("#{step}")
+        #puts
       end
 
       def report_comment(step)
-        puts step.text
-        puts
+        puts step
+        #puts
       end
 
+      #
       def report_macro(step)
         #puts
         #puts step.text
-        puts ANSICode.magenta("#{step.code}")
-        puts
+        puts ANSICode.magenta("#{step}")
+        #puts
       end
 
+      #
       def report_pass(step)
-        puts ANSICode.green("#{step.code}")
-        puts
+        puts ANSICode.green("#{step}")
+        #puts
       end
 
       def report_fail(step, error)
-        tab = step.code.index(/\S/)
-        puts ANSICode.red("#{step.code}")
+        tab = step.tab #step.to_s.index(/\S/)
+        puts ANSICode.red("#{step}")
         puts
         msg = []
         msg << ANSICode.bold(ANSICode.red("FAIL: ")) + error.to_str
-        msg << ANSICode.bold(error.backtrace[0].chomp(":in \`run_step'"))          
+        msg << ANSICode.bold(error.backtrace[0].chomp(":in \`run'"))          
         puts msg.join("\n").tabto(tab||2)
-        puts
+        #puts
       end
 
       def report_error(step, error)
         raise error if $DEBUG
-        tab = step.code.index(/\S/)
-        puts ANSICode.red("#{step.code}")
+        tab = step.tab #step.to_s.index(/\S/)
+        puts ANSICode.red("#{step}")
         puts
         msg = []
         msg << ANSICode.bold(ANSICode.red("ERROR: ")) + error.to_str.sub(/for Quarry::Context.*?$/,'')
-        msg << ANSICode.bold(error.backtrace[0].chomp(":in \`run_step'"))
+        msg << ANSICode.bold(error.backtrace[0].chomp(":in \`run'"))
         #msg = ANSICode.red(msg)
         puts msg.join("\n").tabto(tab||2)
+        #puts
+      end
+
+      def report_step_end(step)
         puts
       end
 

data/lib/quarry/runner.rb

@@ -39,6 +39,10 @@ module Quarry
     attr :context
     #attr :count
 
+    #attr_accessor :before
+
+    #attr_accessor :after
+
     # New Specification
     def initialize(specs, output=nil)
       @specs  = [specs].flatten
@@ -72,24 +76,9 @@ module Quarry
         #context.instance_eval(&spec.given) if spec.given
 
         spec.steps.each do |step|
-          case step
-          when Markup::Header
-            output.report_header(step)
-          when Markup::Macro
-            case step.type
-            when :before
-              @before = step.code
-            when :after
-              @after = step.code
-            else
-              context.instance_eval(step.code, spec.file, step.lineno)
-            end
-            output.report_macro(step)
-          when Markup::Comment
-            output.report_comment(step)
-          else
-            run_step(spec, step) if step.code
-          end
+          output.report_step(self)
+          step.run(self, spec, context, output)
+          output.report_step_end(self)
         end
 
         # TODO <-- plugin in here end
@@ -99,6 +88,7 @@ module Quarry
       end
     end
 
+=begin
     # Run a specification step.
     #
     def run_step(spec, step)
@@ -117,6 +107,35 @@ module Quarry
       end
     end
 
+    # Run a specification tabular step.
+    #
+    # TODO: Table reporting needs to be improved. Big time!
+    def run_table(spec, step)
+      table = YAML.load(File.new(step.file))  # yaml or csv ?
+
+      vars = *table[0]
+      rows = table[1..-1]
+
+      output.report_step(step)
+      context.instance_eval(@before, spec.file) if @before
+      rows.each do |row|
+        set  = vars.zip(row).map{ |a| "#{a[0]}=#{a[1].inspect}" }.join(';')
+        code = set + "\n" + step.code
+        begin
+          context.instance_eval(code, spec.file, step.lineno)
+          #output.report_literal(set)
+          output.report_pass(step)
+        rescue Assertion => error
+          output.report_fail(step, error)
+        rescue Exception => error
+          output.report_error(step, error)
+        ensure
+          context.instance_eval(@after, spec.file) if @after
+        end
+      end
+    end
+=end
+
   end#class Runner
 
 end#module Quarry

data/lib/quarry/runner/context.rb

@@ -13,7 +13,7 @@ module Quarry
       end
 
       def inspect
-        @spec.file
+        "##{@spec.file}"
       end
 
     end #class Context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quarry
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - Thomas Sawyer <transfire@gmail.com>
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-19 00:00:00 -05:00
+date: 2008-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +25,9 @@ dependencies:
 description: Quarry is a small collection of libraries to facilitate Ruby project development, testing and debugging. In particular it includes a flexible but light-weight Behavior-Driven Development (BDD) library.
 email: transfire@gmail.com
 executables: 
-- ruby-xacto
 - quarry
 - quarry-doc
+- quarry-extract
 extensions: []
 
 extra_rdoc_files: 
@@ -35,6 +35,7 @@ extra_rdoc_files:
 - MANIFEST
 - CHANGES
 - RELEASE
+- TODO
 - VERSION
 - COPYING
 files: 
@@ -45,12 +46,13 @@ files:
 - MANIFEST
 - CHANGES
 - RELEASE
+- TODO
 - README
 - VERSION
 - COPYING
-- bin/ruby-xacto
 - bin/quarry
 - bin/quarry-doc
+- bin/quarry-extract
 - lib/quarry
 - lib/quarry.rb
 - lib/quarry/probe.rb
@@ -81,17 +83,21 @@ files:
 - lib/quarry/grammar/legacy
 - lib/quarry/grammar/should.rb
 - lib/quarry/grammar/legacy/assert.rb
+- lib/quarry/markup/macro.rb
 - lib/quarry/markup/step.rb
+- lib/quarry/markup/before.rb
+- lib/quarry/markup/header.rb
+- lib/quarry/markup/after.rb
+- lib/quarry/markup/table.rb
+- lib/quarry/markup/comment.rb
 - meta/created
 - meta/homepage
 - meta/summary
 - meta/abstract
 - meta/authors
 - meta/requires
-- spec/complex.rd
-- spec/mock.rd
-- spec/basic.rd
-- spec/stub.rd
+- spec/04_mock.rd
+- spec/03_stub.rd
 has_rdoc: true
 homepage: http://quarry.rubyforge.org
 post_install_message: 

data/spec/basic.rd

@@ -1,18 +0,0 @@
-= Example of Ruby Quarry Specification
-
-Notice this file is just a RDoc formatted text file.
-It could just as well be a Markdown file, or nearly any
-other markup format.
-
-Okay. Lets try out some code.
-
-  (2 + 2).assert == 4
-
-Now something that will fail:
-
-  (2 + 2).assert == 5
-
-And some that will raise an error:
-
-  nobody_knows_method
-

data/spec/complex.rd

@@ -1,48 +0,0 @@
-= Before and After in a Quarry Specification
-
-Quarry supports before and after clauses in specifications through
-the use of *BEFORE:* and *AFTER:* indicators. Before and after
-clauses are executed at the beginning and at the end of each test
-step.
-
-BEFORE: We use a before clause if we want to setup some code at the
-start of each step.
- 
-  #puts "Starting step..."
-
-AFTER: And an after clause to teardown objects after a step.
-
-  #puts "Finished!"
-
-There can only be one before or after clause at a time. So if
-we define a new BEFORE: or AFTER: section later in the specification,
-it will replace the current clause in use.
-
-Only use before and after claues when necessary --specifications
-are typically more readible without them. In fact, some developers
-make a policy of avoiding them altogether. YMMV.
-
-Macros, and any other non-testable code, can be designated using the
-*MACRO:* indicator. Because the context in which a specification
-is run is a self-extended module, macros are just method definitions.
-
-MACRO: Macro's contain code to execute but not tested.
-
-  def assert_integer(x)
-    x.assert.is_a? Integer
-  end
-
-Okay. Now lets try out some code.
-
-  (2 + 2).assert == 4
-
-  assert_integer(4)
-
-Now something that will fail:
-
-  (2 + 2).assert == 5
-
-And some that will raise an error:
-
-  nobody_knows_method
-