qed 2.1.1 → 2.2.0

data/lib/qed/script.rb

@@ -1,52 +1,48 @@
 module QED
   require 'yaml'
-  require 'tilt'
-  require 'nokogiri'
 
   require 'facets/dir/ascend'
 
+  require 'qed/parser'
   require 'qed/evaluator'
 
-  #Assertion   = AE::Assertion
-  #Expectation = Assertor
-
   # = Script
   #
-  # When run current working directory is changed to that of
-  # the demonstration script's. So any relative file references
-  # within a demo must take that into account.
-  #
   class Script
 
-    # Demonstration file.
-    attr :file
+    #
+    attr :applique
 
-    # Expanded dirname of +file+.
-    attr :dir
+    # Demonstrandum file.
+    attr :file
 
     #
     attr :scope
 
     # New Script
-    def initialize(file, scope=nil)
+    def initialize(applique, file, scope=nil)
+      @applique = applique.dup # localize copy of applique
       @file     = file
-      @scope    = scope || Scope.new
-      apply_environment
+      @scope    = scope || Scope.new(applique)
+      @binding  = @scope.__binding__
+      #@loadlist = []
+      #apply_environment
     end
 
     # One binding per script.
     def binding
-      @binding ||= @scope.__binding__
+      @binding #||= @scope.__binding__
     end
 
     #
     def advice
-      @scope.__advice__
+      #@scope.__advice__
+      @applique.__advice__
     end
 
-    #
-    def dir
-      @dir ||= File.expand_path(File.dirname(file))
+    # Expanded dirname of +file+.
+    def directory
+      @directory ||= File.expand_path(File.dirname(file))
     end
 
     # File basename less extension.
@@ -54,36 +50,6 @@ module QED
       @name ||= File.basename(file).chomp(File.extname(file))
     end
 
-    # Nokogiri HTML document.
-    def document
-      @document ||= Nokogiri::HTML(to_html)
-    end
-
-    # Root node of the html document.
-    def root
-      document.root
-    end
-
-    # Open file and translate template into HTML text.
-    def to_html
-      #case file
-      #when /^http/
-      #  ext  = File.extname(file).sub('.','')
-      #  Tilt[ext].new{ source }
-      #else
-      #end
-      if File.extname(file) == '.html'
-        File.read(file)
-      else
-        Tilt.new(file).render
-      end
-    end
-
-    # Open, convert to HTML and cache.
-    def html
-      @html ||= to_html
-    end
-
     #
     #def source
     #  @source ||= (
@@ -97,30 +63,16 @@ module QED
     #  )
     #end
 
+    def parse
+      Parser.new(file).parse
+    end
+
     #
     def run(*observers)
       evaluator = Evaluator.new(self, *observers)
       evaluator.run
     end
 
-    #
-    def environment
-      glob = File.join(dir, '{environment,common,shared}', '*')
-      Dir[glob]
-    end
-
-    #
-    def apply_environment
-      environment.each do |file|
-        case File.extname(file)
-        when '.rb'
-          eval(File.read(file), scope.__binding__, file)
-        else
-          Script.new(file, scope).run
-        end
-      end
-    end
-
   end
 
 end

data/lib/qed/session.rb

@@ -1,9 +1,10 @@
 module QED
 
   #require 'qed/config'
+  require 'qed/applique'
   require 'qed/script'
 
-  # = Demonstration Run-time Session
+  # = Runtime Session
   #
   # The Session class encapsulates a set of demonstrations 
   # and the procedure for looping through them and running
@@ -32,6 +33,8 @@ module QED
       options.each do |k,v|
         __send__("#{k}=", v) if v
       end
+
+      @applique = create_applique
     end
 
     # Top-level configuration.
@@ -61,7 +64,7 @@ module QED
 
     #
     def scripts
-      @scripts ||= demos.map{ |demo| Script.new(demo) }
+      @scripts ||= demos.map{ |demo| Script.new(@applique, demo) }
     end
 
     #
@@ -77,7 +80,9 @@ module QED
       #  script = Script.new(demo, report)
       scripts.each do |script|
         script.run(*observers)
-      end
+        #pid = fork { script.run(*observers) }
+        #Process.detach(pid)
+       end
       reporter.after_session(self)
       #profile.after_session(self)
     end
@@ -89,6 +94,42 @@ module QED
     #  end
     #end
 
+    # TODO: associate scripts to there applique
+    def create_applique
+      applique = Applique.new
+      #eval "include QED::DomainLanguage", TOPLEVEL_BINDING
+      applique_scripts.each do |file|
+        #next if @loadlist.include?(file)
+        #case File.extname(file)
+        #when '.rb'
+          # since scope is just TOPLEVEL now
+          #require(file)
+          applique.module_eval(File.read(file), file)
+          #eval(File.read(file), scope.__binding__, file)  # TODO: for each script!? Nay.
+        #else
+        #  Script.new(file, scope).run
+        #end
+        #@loadlist << file
+      end
+      applique
+    end
+
+    #
+    def applique_scripts
+      locs = []
+      demos.each do |demo|
+        Dir.ascend(File.dirname(demo)) do |path|
+          break if path == Dir.pwd
+          dir = File.join(path, 'applique')
+          if File.directory?(dir)
+            locs << dir
+          end
+        end
+      end
+      envs = locs.map{ |loc| Dir[File.join(loc,'**/*.rb')] }
+      envs.flatten.compact.uniq
+    end
+
   end#class Session
 
 end#module QED

data/script/qedoc

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+qedoc -o doc/qedoc/ -t "QED Demonstrandum" qed/*.rdoc

data/script/test

@@ -0,0 +1,2 @@
+#!/usr/bin/ruby
+system "ruby -Ilib -- bin/qed demo/*.rdoc"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qed
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Thomas Sawyer <transfire@gmail.com>
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-06-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ae
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: ansi
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: facets
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +64,11 @@ dependencies:
   name: tilt
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,39 +78,76 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
-description: |-
-  QED (Quality Ensured Demonstrations) is a TDD/BDD framework
-  utilizing Literate Programming techniques.
+- !ruby/object:Gem::Dependency 
+  name: syckle
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+description: QED (Quality Ensured Demonstrations) is a TDD/BDD framework utilizing Literate Programming techniques.
 email: 
 executables: 
 - qedoc
 - qed
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
 - bin/qed
 - bin/qedoc
-- demo/error.rdoc
-- demo/website.rdoc
-- doc/qedoc/index.html
-- doc/qedoc/jquery.js
+- demo/01_demos.rdoc
+- demo/02_advice.rdoc
+- demo/03_helpers.rdoc
+- demo/04_fixtures.rdoc
+- demo/05_quote.rdoc
+- demo/07_toplevel.rdoc
+- demo/08_cross_script.rdoc
+- demo/09_cross_script.rdoc
+- demo/10_constant_lookup.rdoc
+- demo/applique/constant.rb
+- demo/applique/env.rb
+- demo/applique/fileutils.rb
+- demo/applique/markup.rb
+- demo/applique/quote.rb
+- demo/applique/toplevel.rb
+- demo/fixtures/data.txt
+- demo/fixtures/table.yml
+- demo/helpers/advice.rb
+- demo/helpers/sample.rb
+- demo/helpers/toplevel.rb
+- eg/hello_world.rdoc
+- eg/view_error.rdoc
+- eg/website.rdoc
 - lib/qed/advice/events.rb
 - lib/qed/advice/patterns.rb
 - lib/qed/advice.rb
+- lib/qed/applique.rb
 - lib/qed/command.rb
 - lib/qed/config.rb
 - lib/qed/evaluator.rb
-- lib/qed/reporter/base.rb
+- lib/qed/package.yml
+- lib/qed/parser.rb
+- lib/qed/profile.yml
+- lib/qed/reporter/abstract.rb
 - lib/qed/reporter/bullet.rb
 - lib/qed/reporter/dotprogress.rb
 - lib/qed/reporter/html.rb
@@ -115,21 +161,15 @@ files:
 - lib/qedoc/document/markup.rb
 - lib/qedoc/document/template.rhtml
 - lib/qedoc/document.rb
-- meta/authors
-- meta/created
-- meta/description
-- meta/homepage
-- meta/name
-- meta/released
-- meta/repository
-- meta/requires
-- meta/ruby
-- meta/suite
-- meta/summary
-- meta/title
-- meta/version
+- script/qedoc
+- script/test
+- PROFILE
 - README.rdoc
 - HISTORY
+- REQUIRE
+- ROADMAP
+- DIARY.rdoc
+- VERSION
 - COPYING
 has_rdoc: true
 homepage: http://proutils.github.com/qed
@@ -139,26 +179,32 @@ post_install_message:
 rdoc_options: 
 - --title
 - QED API
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: qed
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Quod Erat Demonstrandum