qed 2.7.0 → 2.8.0

data/.ruby

@@ -14,13 +14,16 @@ requirements:
 - name: ansi
 - name: facets
   version: 2.8+
-- name: ae
-  version: 1.7+
+- name: brass
 - name: confection
 - name: detroit
   groups:
   - build
   development: true
+- name: ae
+  groups:
+  - test
+  development: true
 dependencies: []
 conflicts: []
 repositories:
@@ -36,12 +39,13 @@ extra: {}
 load_path:
 - lib
 revision: 0
-created: '2006-12-16'
+created: '2009-06-16'
 summary: Quod Erat Demonstrandum
 title: QED
-version: 2.7.0
+version: 2.8.0
+scm_uri: http://github.com/rubyworks/qed/blob/master/
 name: qed
 description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 
   utilizing Literate Programming techniques.'
-date: '2011-11-20'
+date: '2012-01-25'

data/HISTORY.rdoc

@@ -1,5 +1,24 @@
 = RELEASE HISTORY
 
+== 2.8.0 | 2012-01-19
+
+IMPORTANT: READ THIS RELEASE NOTICE! This release makes a minor
+change, but it is one that will effect all end-users. That is, QED no
+longer depends on AE as its one and only assertion framework. Instead
+any compliant framework can be used. Certainly most users will be happy
+to continue using AE, in which case simply add `require 'ae'` to your
+applique (e.g. in 'spec/applique/ae.rb') or add `-r ae` to the qed command
+line invocation to ensure demos continue running as before. In place of
+AE the _BRASS_ gem now provides basic assertion support. Any assertion
+framework that complies with the simple BRASS standards will work with QED.
+
+Changes:
+
+* No longer depend only on AE for assertion framework.
+* Rename $assertion_counts to $ASSERTION_COUNTS.
+* Complies with assertion standards set by BRASS project.
+
+
 == 2.7.0 | 2011-11-18
 
 The focus of this release is a much improved underlying API, including

data/README.rdoc

@@ -1,8 +1,10 @@
 = Ruby Q.E.D.
 
 {Homepage}[http://rubyworks.github.com/qed] |
+{Documentation}[http://rubydoc.info/gems/qed/frames] |
+{Report Issue}[http://github.com/rubyworks/qed/issues] |
 {Development}[http://github.com/rubyworks/qed] |
-{Mailing list}[http://groups.google.com/group/rubyworks-mailinglist] |
+{Mailing list}[http://groups.google.com/group/rubyworks-mailinglist]
 
 {<img src="http://travis-ci.org/rubyworks/qed.png" />}[http://travis-ci.org/rubyworks/qed]
 
@@ -154,7 +156,7 @@ if they are not already installed.
 
 Q.E.D.
 
-Copyright (c) 2007 Rubyworks, Thomas Sawyer
+Copyright (c) 2009 Rubyworks, Thomas Sawyer
 
 BSD 2 Clause License
 

data/lib/qed.yml

@@ -14,13 +14,16 @@ requirements:
 - name: ansi
 - name: facets
   version: 2.8+
-- name: ae
-  version: 1.7+
+- name: brass
 - name: confection
 - name: detroit
   groups:
   - build
   development: true
+- name: ae
+  groups:
+  - test
+  development: true
 dependencies: []
 conflicts: []
 repositories:
@@ -36,12 +39,13 @@ extra: {}
 load_path:
 - lib
 revision: 0
-created: '2006-12-16'
+created: '2009-06-16'
 summary: Quod Erat Demonstrandum
 title: QED
-version: 2.7.0
+version: 2.8.0
+scm_uri: http://github.com/rubyworks/qed/blob/master/
 name: qed
 description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 
   utilizing Literate Programming techniques.'
-date: '2011-11-20'
+date: '2012-01-25'

data/lib/qed/core_ext.rb

@@ -1,3 +1,5 @@
+require 'brass'
+
 require 'facets/dir/ascend'
 
 class Object
@@ -36,3 +38,4 @@ class Object
   end
 
 end
+

data/lib/qed/demo.rb

@@ -58,7 +58,9 @@ module QED
       @applique ||= (
         list = [Applique.new]
         applique_locations.each do |location|
-          Dir[location + '/**/*'].each do |file|
+          #Dir[location + '/**/*'].each do |file|
+          Dir[location + '/*'].each do |file|
+            next if File.directory?(file)
             list << Applique.for(file)
           end
         end

data/lib/qed/reporter/abstract.rb

@@ -236,8 +236,8 @@ module Reporter
 
     #
     def get_tally
-      assert_count = AE::Assertor.counts[:total]
-      assert_fails = AE::Assertor.counts[:fail]
+      assert_count = $ASSERTION_COUNTS[:total]
+      assert_fails = $ASSERTION_COUNTS[:fail]
       assert_delta = assert_count - assert_fails
 
       vars = [demos.size, steps.size, fails.size, errors.size, assert_delta, assert_count] #, @pass.size ]

data/lib/qed/scope.rb

@@ -1,7 +1,7 @@
-require 'ae'
-
 module QED
 
+  #require 'ae'
+
   # Scope is the context in which QED documents are run.
   #
   class Scope < Module

data/lib/qed/session.rb

@@ -121,6 +121,8 @@ module QED
 
       clear_directory
 
+      reset_assertion_counts
+
       prepare_loadpath
       require_libraries
 
@@ -146,11 +148,16 @@ module QED
       reporter.success?
     end
 
-    #
+    # Clear temporary testing directory.
     def clear_directory
       settings.clear_directory
     end
 
+    # Set $ASSERTION_COUNTS to zero point.
+    def reset_assertion_counts
+      $ASSERTION_COUNTS = Hash.new{|h,k| h[k] = 0 }
+    end
+
     # Add to load path (from -I option).
     def prepare_loadpath
       loadpath.each{ |dir| $LOAD_PATH.unshift(File.expand_path(dir)) }

data/lib/qed/step.rb

@@ -227,8 +227,10 @@ module QED
     #
     def tweak_code
       code = @example_lines.map{ |lineno, line| line }.join("")
-      code.gsub!(/\n\s*\#\ ?\=\>/, '.assert = ')
-      code.gsub!(/\s*\#\ ?\=\>/, '.assert = ')
+      #code.gsub!(/\n\s*\#\ ?\=\>/, '.assert = ')
+      #code.gsub!(/\s*\#\ ?\=\>/, '.assert = ')
+      code.gsub!(/\n\s*\#\ ?\=\>(.*?)$/, ' == \1 ? assert(true) : assert(false, "not returned -- \1")')   # TODO: what kind of error ?
+      code.gsub!(/\s*\#\ ?\=\>(.*?)$/,   ' == \1 ? assert(true) : assert(false, "not returned -- \1")')
       code
     end
 

data/qed/01_demos.rdoc

@@ -1,4 +1,4 @@
-= Demonstrations
+= QED Demonstrandum
 
 == Steps
 

data/qed/02_advice.rdoc

@@ -86,11 +86,10 @@ an object just magically appear.
 == Event Targets
 
 There is a small set of advice targets that do not come before or after,
-rather they occur *upon* a particular event. These include +:load+
-and +:unload+ for when a new helper is loaded; +:pass+, +:fail+ and +:error+
-for when a code block passes, fails or raises an error; and +:head+, +:desc:+,
-+:code+ and +:data:+ which targets the immediate processing of a text block
-and code excecution.
+rather they occur *upon* a particular event. These include +:pass+, +:fail+
+and +:error+ for when a code block passes, fails or raises an error; and
++:step+, +:applique+, +:match+ and +:test:+ which targets the processing 
+of a demo step and it's example excecution.
 
 These event targets can be advised by calling the +When+ method
 with the target type as an argument along with the code block

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qed
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70171077943540 !ruby/object:Gem::Requirement
+  requirement: &25621900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171077943540
+  version_requirements: *25621900
 - !ruby/object:Gem::Dependency
   name: facets
-  requirement: &70171077942820 !ruby/object:Gem::Requirement
+  requirement: &25620880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70171077942820
+  version_requirements: *25620880
 - !ruby/object:Gem::Dependency
-  name: ae
-  requirement: &70171077942200 !ruby/object:Gem::Requirement
+  name: brass
+  requirement: &25620240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171077942200
+  version_requirements: *25620240
 - !ruby/object:Gem::Dependency
   name: confection
-  requirement: &70171077941740 !ruby/object:Gem::Requirement
+  requirement: &25619480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171077941740
+  version_requirements: *25619480
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &70171077941200 !ruby/object:Gem::Requirement
+  requirement: &25618820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *25618820
+- !ruby/object:Gem::Dependency
+  name: ae
+  requirement: &25616480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171077941200
+  version_requirements: *25616480
 description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 
   utilizing Literate Programming techniques.'