qed 1.1.0 → 1.2

data/lib/qed/reporter/base.rb

@@ -19,22 +19,29 @@ module Reporter
     attr :fail
     attr :error
 
-    def initialize(io=STDOUT)
-      @io    = io
-      @specs = 0
+    def initialize(options={})
+      @io      = options[:io] || STDOUT
+      @verbose = options[:verbose]
+
+      @demos = 0
       @steps = 0
       @pass  = []
       @fail  = []
       @error = []
     end
 
+    #
+    def verbose?
+      @verbose
+    end
+
     # Before running any specifications.
     def report_intro
     end
 
     # Beginning of a specification.
     def report_start(spec)
-      @specs += 1
+      @demos += 1
     end
 
     # Report a header.
@@ -67,7 +74,7 @@ module Reporter
 
     # Report step raised an error.
     def report_error(step, exception)
-      raise exception if $RESPECT_DEBUG
+      raise exception if $DEBUG
       @error << [step, exception]
     end
 

data/lib/qed/reporter/dotprogress.rb

@@ -53,7 +53,7 @@ module Reporter #:nodoc:
         io.puts
       end
 
-      io.puts "%s specs, %s steps, %s failures, %s errors" % [@specs, @steps, @fail.size, @error.size] #, @pass.size ]
+      io.puts "%s demos, %s steps, %s failures, %s errors" % [@demos, @steps, @fail.size, @error.size] #, @pass.size ]
     end
 
   end#class DotProgress

data/lib/qed/reporter/summary.rb

@@ -14,9 +14,10 @@ module Reporter #:nodoc:
     end
 
     def report_comment(step)
-      txt = step.to_s.tabto(2)
+      txt = step.to_s.strip.tabto(2)
       txt[0,1] = "*"
       io.puts txt
+      io.puts
     end
 
     def report_macro(step)

data/lib/qed/reporter/verbatim.rb

@@ -20,34 +20,34 @@ module Reporter #:nodoc:
     #  end
     #end
 
+    #def report_intro
+    #  io.puts
+    #end
+
     def report_header(step)
-      io.puts ANSICode.bold("#{step}")
-      #io.puts
+      io.print ANSICode.bold("#{step}")
     end
 
     def report_comment(step)
-      io.puts step
-      #io.puts
+      io.print step
     end
 
     #
     def report_macro(step)
       #io.puts
       #io.puts step.text
-      io.puts ANSICode.magenta("#{step}")
+      io.print ANSICode.magenta("#{step}")
       #io.puts
     end
 
     #
     def report_pass(step)
-      io.puts ANSICode.green("#{step}")
-      #io.puts
+      io.print ANSICode.green("#{step}")
     end
 
     def report_fail(step, error)
       tab = step.to_s.index(/\S/) #step.tab
-      io.puts ANSICode.red("#{step}")
-      #puts
+      io.print ANSICode.red("#{step}")
       msg = []
       msg << ANSICode.bold(ANSICode.red("FAIL: ")) + error.to_str
       msg << ANSICode.bold(error.backtrace[0].chomp(":in \`_binding'"))
@@ -58,8 +58,7 @@ module Reporter #:nodoc:
     def report_error(step, error)
       raise error if $DEBUG
       tab = step.to_s.index(/\S/) #step.tab
-      io.puts ANSICode.red("#{step}")
-      #io.puts
+      io.print ANSICode.red("#{step}")
       msg = []
       msg << ANSICode.bold(ANSICode.red("ERROR: ")) + error.to_str.sub(/for QED::Context.*?$/,'')
       msg << ANSICode.bold(error.backtrace[0].chomp(":in \`_binding'"))
@@ -85,6 +84,6 @@ module Reporter #:nodoc:
 
   end
 
-end #module
+end #module Reporter
 end #module QED
 

data/lib/qed/script.rb

@@ -1,4 +1,5 @@
 module QED
+  require 'yaml'
   require 'facets/dir/ascend'
 
   require 'ae'
@@ -32,10 +33,15 @@ module QED
       @output = output || Reporter::Verbatim.new #(self)
 
       source = File.read(file)
-      index  = source.rindex('---')
+      index  = source.rindex('---') || source.size
 
       @source = source[0...index]
-      @helper = source[index+3...-1].strip
+      @helper = source[index+3...-1].to_s.strip
+    end
+
+    # File basename less extension.
+    def name
+      @name ||= File.basename(file).chomp(File.extname(file))
     end
 
     #def convert
@@ -53,30 +59,82 @@ module QED
           output.report_header(step)
         when /^\S/
           output.report_comment(step)
+          context.When.each do |(regex, proc)|
+            if md = regex.match(step)
+              proc.call(*md[1..-1])
+            end
+          end
         else
-          run_step(step)
+          #if context.table
+          #  run_table(step)
+          #else
+            run_step(step)
+          #end
         end
       end
     end
 
     #
-    def run_step(step, &blk)
-      context.before.call if context.before
+    def run_step(step=nil, &blk)
+      context.Before.call if context.Before
       begin
         if blk
           blk.call #eval(step, context._binding)
         else
           eval(step, context._binding, @file) # TODO: would be nice to know file and lineno here
         end
-        output.report_pass(step)
+        output.report_pass(step) if step
       rescue Assertion => error
         output.report_fail(step, error)
       rescue Exception => error
         output.report_error(step, error)
+      ensure
+        context.After.call if context.After
+      end
+    end
+
+=begin
+    #
+    def run_table(step)
+      file = context.table
+      Dir.ascend(Dir.pwd) do |path|
+        f1 = File.join(path, file)
+        f2 = File.join(path, 'fixtures', file)
+        fr = File.file?(f1) ? f1 : File.exist?(f2) ? f2 : nil
+        (file = fr; break) if fr
+      end
+      output.report_pass(step) #step)
+
+      tbl = YAML.load(File.new(file))
+      key = tbl.shift
+      tbl.each do |set|
+        assign = key.zip(set).map{ |k, v| "#{k}=#{v.inspect};" }.join
+        run_table_step(assign + step, set)
+        #run_step(set.inspect.tabto(4)){ blk.call(set) }
+        #@_script.run_step(set.to_yaml.tabto(2)){ blk.call(set) }
+        #@_script.output.report_table(set)
+      end
+      #output.report_pass(step) #step)
+      context.table = nil
+    end
+
+    #
+    #def run_table_step(step, set)
+    def run_table_step(set, &blk)
+      context.before.call if context.before
+      begin
+        #eval(step, context._binding, @file) # TODO: would be nice to know file and lineno here
+        blk.call(*set)
+        output.report_pass('    ' + set.inspect) #step)
+      rescue Assertion => error
+        output.report_fail(set.inspect, error)
+      rescue Exception => error
+        output.report_error(set.inspect, error)
       ensure
         context.after.call if context.after
       end
     end
+=end
 
     # Cut-up script into steps.
     def steps
@@ -88,14 +146,14 @@ module QED
           if /^\s*$/.match line
             str << line
           elsif /^[=]/.match line
-            steps << str.chomp("\n")
-            steps << line.chomp("\n")
+            steps << str #.chomp("\n")
+            steps << line #.chomp("\n")
             str = ''
             #str << line
             code = false
           elsif /^\S/.match line
             if code
-              steps << str.chomp("\n")
+              steps << str #.chomp("\n")
               str = ''
               str << line
               code = false
@@ -114,6 +172,7 @@ module QED
           end
         end
         steps << str
+        #steps.map{ |s| s.chomp("\n") }
         steps
       )
     end
@@ -128,57 +187,105 @@ module QED
   #
   class Context < Module
 
+    TABLE = /^TABLE\[(.*?)\]/i
+
     def initialize(script)
       @_script = script
+      @_when   = []
+      @_tables = []
     end
 
     def _binding
       @_binding ||= binding
     end
 
-    # Set before step.
-    def before(&f)
-      @_before = f if f
+    # Before each step.
+    def Before(&procedure)
+      @_before = procedure if procedure
       @_before
     end
 
-    # Set after step.
-    def after(&f)
-      @_after = f if f
+    # After each step.
+    def After(&procedure)
+      @_after = procedure if procedure
       @_after
     end
 
-    # Table-based steps.
-    def table(file=nil, &blk)
-      require 'yaml'
-
-      file ||= File.basename(@_script.file).chomp(File.extname(@_script.file)) + '.yaml'
-
-      Dir.ascend(Dir.pwd) do |path|
-        f1 = File.join(path, file)
-        f2 = File.join(path, 'fixtures', file)
-        fr = File.file?(f1) ? f1 : File.exist?(f2) ? f2 : nil
-        (file = fr; break) if fr
+    #
+    def When(pattern=nil, &procedure)
+      return @_when unless procedure
+      raise ArgumentError unless pattern
+      unless Regexp === pattern
+        pattern = __when_string_to_regexp(pattern)
       end
+      @_when << [pattern, procedure]
+    end
 
+    # Table-based steps.
+    def Table(file=nil, &blk)
+      file = file || @_tables.last
       tbl = YAML.load(File.new(file))
       tbl.each do |set|
-        @_script.run_step(set.to_yaml.tabto(2)){ blk.call(set) }
-        #@_script.output.report_table(set)
+        blk.call(*set)
       end
+      @_tables << file
     end
 
-    def fixture(fname, content=nil)
-      raise if File.directory?(fname)
+    # Read/Write a fixture.
+    def Data(file, &content)
+      raise if File.directory?(file)
       if content
         FileUtils.mkdir_p(File.dirname(fname))
-        File.open(fname, 'w'){ |f| f << content }
+        case File.extname(file)
+        when '.yml', '.yaml'
+          File.open(file, 'w'){ |f| f << content.call.to_yaml }
+        else
+          File.open(file, 'w'){ |f| f << content.call }
+        end
       else
-        raise LoadError, "no such fixture file -- #{fname}" unless File.exist?(fname)
-        File.read(fname)
+        #raise LoadError, "no such fixture file -- #{fname}" unless File.exist?(fname)
+        case File.extname(file)
+        when '.yml', '.yaml'
+          YAML.load(File.new(file))
+        else
+          File.read(file)
+        end
       end
     end
 
+  private
+
+    def __when_string_to_regexp(str)
+      str = str.split(/(\(\(.*?\)\))(?!\))/).map{ |x|
+        x =~ /\A\(\((.*)\)\)\z/ ? $1 : Regexp.escape(x)
+      }.join
+      str = str.gsub(/(\\\ )+/, '\s+')
+      Regexp.new(str, Regexp::IGNORECASE)
+
+      #rexps = []
+      #str = str.gsub(/\(\((.*?)\)\)/) do |m|
+      #  rexps << '(' + $1 + ')'
+      #  "\0"
+      #end
+      #str = Regexp.escape(str)
+      #rexps.each do |r|
+      #  str = str.sub("\0", r)
+      #end
+      #str = str.gsub(/(\\\ )+/, '\s+')
+      #Regexp.new(str, Regexp::IGNORECASE)
+    end
+
+    # 
+    # check only local and maybe start paths
+    #def __locate_file(file)
+    #  Dir.ascend(Dir.pwd) do |path|
+    #    f1 = File.join(path, file)
+    #    f2 = File.join(path, 'fixtures', file)
+    #    fr = File.file?(f1) ? f1 : File.exist?(f2) ? f2 : nil
+    #    (file = fr; break) if fr
+    #  end
+    #end
+
   end
 
 end

data/meta/description

@@ -1,2 +1,2 @@
-QED (Quality Enahancing Demos) is a slick Interface-Driven Development
-(IDD) system utilizing Literate Programming concepts.
+QED (Quality Enahancing Demos) is a API-Driven Development
+framework utilizing concepts in Literate Programming.

data/meta/homepage

@@ -1 +1 @@
-http://proutils.rubyforge.org/qed
+http://proutils.github.com/qed

data/meta/repository

@@ -0,0 +1 @@
+git://github.com/proutils/qed.git

data/meta/version

@@ -1 +1 @@
-1.1.0
+1.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qed
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: "1.2"
 platform: ruby
 authors: 
 - Thomas Sawyer <transfire@gmail.com>
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -04:00
+date: 2009-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,9 +43,9 @@ dependencies:
         version: "0"
     version: 
 description: |-
-  QED (Quality Enahancing Demos) is a slick Interface-Driven Development
-  (IDD) system utilizing Literate Programming concepts.
-email: Thomas Sawyer <transfire@gmail.com>
+  QED (Quality Enahancing Demos) is a API-Driven Development
+  framework utilizing concepts in Literate Programming.
+email: 
 executables: 
 - qedoc
 - qed
@@ -60,10 +60,12 @@ files:
 - bin/qed
 - bin/qedoc
 - demo/01_spec.qed
-- demo/01_spec.yaml
-- demo/qed_helper.rb
+- demo/data.txt
+- demo/helper.rb
+- demo/table.yml
 - doc/qedoc/index.html
 - doc/qedoc/jquery.js
+- lib/qed/command.rb
 - lib/qed/document/jquery.js
 - lib/qed/document/markup.rb
 - lib/qed/document/template.rhtml
@@ -80,10 +82,11 @@ files:
 - meta/created
 - meta/description
 - meta/homepage
-- meta/package
-- meta/project
+- meta/name
+- meta/repository
 - meta/requires
 - meta/ruby
+- meta/suite
 - meta/summary
 - meta/title
 - meta/version
@@ -92,14 +95,13 @@ files:
 - COPYING
 - MANIFEST
 has_rdoc: true
-homepage: http://proutils.rubyforge.org/qed
+homepage: http://proutils.github.com/qed
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --title
-- qed api
+- QED API
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -116,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: proutils
+rubyforge_project: qed
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3