qed 1.3 → 2.0.0

data/lib/qed/session.rb

@@ -0,0 +1,95 @@
+module QED
+
+  #require 'qed/config'
+  require 'qed/script'
+
+  # = Demonstration Run-time Session
+  #
+  # The Session class encapsulates a set of demonstrations 
+  # and the procedure for looping through them and running
+  # each in turn.
+  #
+  class Session
+
+    # Demonstration files.
+    attr :demos
+
+    # Output format.
+    attr_accessor :format
+
+    # Trace mode
+    attr_accessor :trace
+
+    # New demonstration
+    def initialize(demos, options={})
+      require_reporters
+
+      @demos  = [demos].flatten
+
+      @format = :dotprogress
+      @trace  = false
+
+      options.each do |k,v|
+        __send__("#{k}=", v) if v
+      end
+    end
+
+    # Top-level configuration.
+    #def config
+    #  QED.config
+    #end
+
+    # TODO: Ultimately use Plugin library.
+    def require_reporters
+      Dir[File.dirname(__FILE__) + '/reporter/*'].each do |file|
+        require file
+      end
+    end
+
+    # Instance of selected Reporter subclass.
+    def reporter
+      @reporter ||= (
+        name = Reporter.constants.find{ |c| /#{format}/ =~ c.downcase }
+        Reporter.const_get(name).new(:trace => trace)
+      )
+    end
+
+    #
+    #def scope
+    #  @scope ||= Scope.new
+    #end
+
+    #
+    def scripts
+      @scripts ||= demos.map{ |demo| Script.new(demo) }
+    end
+
+    #
+    def observers
+      [reporter]
+    end
+
+    # Run session.
+    def run
+      #profile.before_session(self)
+      reporter.before_session(self)
+      #demos.each do |demo|
+      #  script = Script.new(demo, report)
+      scripts.each do |script|
+        script.run(*observers)
+      end
+      reporter.after_session(self)
+      #profile.after_session(self)
+    end
+
+    # Globally applicable advice.
+    #def environment
+    #  scripts.each do |script|
+    #    script.require_environment
+    #  end
+    #end
+
+  end#class Session
+
+end#module QED
+

data/lib/qedoc/command.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+
+module QEDoc
+
+  require 'optparse'
+  require 'qedoc/document'
+
+  class Command
+
+    #
+    def self.run
+      new.run
+    end
+
+    #
+    attr :options
+
+    #
+    def initialize
+      @options = {}
+    end
+
+    #
+    def parser
+      OptionParser.new do |usage|
+
+        usage.banner = "Usage: qedoc [OPTIONS] <QEDFile1> [ <QEDFile2> ... ]"
+
+        usage.on("-o", "--output [DIR]", "Output directory") do |dir|
+          options[:output]= dir
+        end
+
+        usage.on("-t", "--title [TITLE]", "Title of Document") do |title|
+          options[:title]= title
+        end
+
+        usage.on("--css [URI]", "Specify a URI for a CSS file add to HTML header.") do |uri|
+          options[:css] = uri
+        end
+
+        usage.on("--dryrun", "") do
+          options[:dryrun] = true
+        end
+
+        usage.on("-q", "--quiet", "") do
+          options[:quiet] = true
+        end
+
+        usage.on_tail("-h", "--help", "display this help message") do
+          puts usage
+          exit
+        end
+
+      end
+    end
+
+    #
+    def run
+      parser.parse!
+
+      options[:paths] = ARGV.dup
+
+      #opts[:output] = cli.options[:file]
+      #opts[:dryrun] = cli.options[:dryrun]
+      #opts[:quiet]  = cli.options[:quiet]
+      #opts[:css]    = cli.options[:css]
+      #opts[:title]  = cli.options[:title]
+
+      doc = QED::Document.new(options)
+
+      doc.generate
+    end
+
+  end
+
+end

data/lib/{qed → qedoc}/document.rb

@@ -1,5 +1,7 @@
 require 'erb'
 require 'fileutils'
+require 'tilt'
+require 'nokogiri'
 
 module QED
 
@@ -59,8 +61,8 @@ module QED
     def generate
       copy_support_files
 
-      text  = ''
-      files = []
+      output = ''
+      files  = []
 
       #paths.each do |path|
       #  files.concat(Dir.glob(path).select{ |f| File.file?(f) })
@@ -79,13 +81,18 @@ module QED
         #iotext = strio.string
         #strio.close
 
-        ext = File.extname(file)
-        txt = File.read(file)
+        #ext = File.extname(file)
+        #txt = File.read(file)
 
-        if ext == '.qed'
-          ext = file_type(txt)
-        end
+        #if ext == '.qed'
+        #  ext = file_type(txt)
+        #end
+
+        text = Tilt.new(file).render
+        html = Nokogiri::HTML(text)
+        body = html.css("body")
 
+=begin
         case ext
         #when '.qed'
         #  require_qedoc
@@ -101,10 +108,12 @@ module QED
           markdown = RDiscount.new(txt)
           text << markdown.to_html
         end
-        text << "\n"
+=end
+
+        output << "#{body}\n"
       end
 
-      temp = Template.new(template, text, title, css)
+      temp = Template.new(template, output, title, css)
       html = temp.parse_template
 
       save(html)
@@ -146,19 +155,19 @@ module QED
   private
 
     #
-    def file_type(text)
-      rdoc = text.index(/^\=/)
-      markdown = text.index(/^\#/)
-      if markdown && rdoc
-        rdoc < markdown ? '.rdoc' : '.markdown'
-      elsif rdoc
-        '.rdoc'
-      elsif markdown
-        '.markdown'
-      else  # fallback to rdoc
-        '.rdoc'
-      end
-    end
+    #def file_type(text)
+    #  rdoc = text.index(/^\=/)
+    #  markdown = text.index(/^\#/)
+    #  if markdown && rdoc
+    #    rdoc < markdown ? '.rdoc' : '.markdown'
+    #  elsif rdoc
+    #    '.rdoc'
+    #  elsif markdown
+    #    '.markdown'
+    #  else  # fallback to rdoc
+    #    '.rdoc'
+    #  end
+    #end
 
     #
     def require_qedoc

data/meta/requires

@@ -1,3 +1,5 @@
 ae
 ansi
 facets
+tilt
+nokogiri

data/meta/version

@@ -1 +1 @@
-1.3
+2.0.0

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: qed
 version: !ruby/object:Gem::Version 
-  version: "1.3"
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Thomas Sawyer <transfire@gmail.com>
@@ -9,39 +14,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -05:00
+date: 2010-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ae
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ansi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: facets
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: tilt
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: |-
   QED (Quality Ensured Demonstrations) is a TDD/BDD framework
   utilizing Literate Programming techniques.
@@ -56,30 +91,30 @@ extra_rdoc_files: []
 files: 
 - bin/qed
 - bin/qedoc
-- demo/01_spec.qed
-- demo/02_err.qed
-- demo/03_site.qed
-- demo/data.txt
-- demo/helpers/sample.rb
-- demo/table.yml
+- demo/error.rdoc
+- demo/website.rdoc
 - doc/qedoc/index.html
 - doc/qedoc/jquery.js
+- lib/qed/advice/events.rb
+- lib/qed/advice/patterns.rb
+- lib/qed/advice.rb
 - lib/qed/command.rb
 - lib/qed/config.rb
-- lib/qed/document/jquery.js
-- lib/qed/document/markup.rb
-- lib/qed/document/template.rhtml
-- lib/qed/document.rb
-- lib/qed/extract.rb
+- lib/qed/evaluator.rb
 - lib/qed/reporter/base.rb
-- lib/qed/reporter/ditto.rb
+- lib/qed/reporter/bullet.rb
 - lib/qed/reporter/dotprogress.rb
-- lib/qed/reporter/summary.rb
+- lib/qed/reporter/html.rb
 - lib/qed/reporter/verbatim.rb
-- lib/qed/runner.rb
+- lib/qed/scope.rb
 - lib/qed/script.rb
-- lib/qed/script1.rb
+- lib/qed/session.rb
 - lib/qed.rb
+- lib/qedoc/command.rb
+- lib/qedoc/document/jquery.js
+- lib/qedoc/document/markup.rb
+- lib/qedoc/document/template.rhtml
+- lib/qedoc/document.rb
 - meta/authors
 - meta/created
 - meta/description
@@ -94,7 +129,7 @@ files:
 - meta/version
 - README.rdoc
 - HISTORY
-- Syckfile
+- CHANGELOG.txt
 - COPYING
 has_rdoc: true
 homepage: http://proutils.github.com/qed
@@ -103,27 +138,29 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Qed API
+- QED API
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: qed
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: QED (Quality Ensured Demonstrations) is a TDD/BDD framework
+summary: Quod Erat Demonstrandum
 test_files: []