qed 2.6.1 → 2.6.2

data/.ruby

@@ -1,48 +1,46 @@
---- 
-name: qed
-version: 2.6.1
-title: QED
-summary: Quod Erat Demonstrandum
-description: QED (Quality Ensured Demonstrations) is a TDD/BDD framework utilizing Literate Programming techniques.
-loadpath: 
-- lib
-manifest: MANIFEST
-requires: 
+---
+source:
+- meta/
+authors:
+- name: Trans
+  email: transfire@gmail.com
+copyrights:
+- holder: Thomas Sawyer, Rubyworks
+  year: '2006'
+  license: BSD-2-Clause
+replacements: []
+alternatives: []
+requirements:
 - name: ansi
-  version: 0+
-  group: []
-
 - name: facets
   version: 2.8+
-  group: []
-
 - name: ae
   version: 1.7+
-  group: []
-
 - name: detroit
-  version: 0+
-  group: 
+  groups:
   - build
+  development: true
+dependencies: []
 conflicts: []
-
-replaces: []
-
-engine_check: []
-
-organization: RubyWorks
-contact: trans <transfire@gmail.com>
-created: 2006-12-16
-copyright: Copyright (c) 2006 Thomas Sawyer
-licenses: []
-
-authors: 
-- Thomas Sawyer <transfire@gmail.com>
-maintainers: []
-
-resources: 
+repositories:
+- uri: git://github.com/rubyworks/qed.git
+  scm: git
+  name: upstream
+resources:
   home: http://rubyworks.github.com/qed
-  work: http://github.com/rubyworks/qed
-repositories: 
-  public: git://github.com/rubyworks/qed.git
-spec_version: 1.0.0
+  code: http://github.com/rubyworks/qed
+  mail: http://groups.google.com/groups/rubyworks-mailinglist
+  bugs: http://github.com/rubyworks/qed/issues
+extra: {}
+load_path:
+- lib
+revision: 0
+created: '2006-12-16'
+summary: Quod Erat Demonstrandum
+title: QED
+version: 2.6.2
+name: qed
+description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
+
+  utilizing Literate Programming techniques.'
+date: '2011-10-24'

data/HISTORY.rdoc

@@ -1,10 +1,23 @@
 = RELEASE HISTORY
 
+== 2.6.2 / 2011-10-23
+
+Fixed output status. When tests fail or error the `qed`
+command with exit -1 instead to 0. Also, the default
+spec location uses only one of `qed`, `demo` or `spec`
+instead of all.
+
+Changes:
+
+* Fix output status, exit -1 on test failure or error.
+* Fix default spec location to only use one or the other.
+
+
 == 2.6.1 / 2011-07-02
 
-A friend insisted QED default the loadpath tolib and
+A friend suggested QED default the load path to lib and
 automatically look for QED demos in default locations
-(sepc, demo, qed) if not files are passed to it on the
+(qed, demo, spec) if no files are passed to it on the
 command line. So it is.
 
 Changes:

data/LICENSE.rdoc

@@ -1,12 +1,12 @@
 = COPYRIGHT NOTICES
 
-== YES
+== QED
 
-Copyright:: (c) 2011 Rubyworks, Thomas Sawyer
+Copyright:: (c) 2007 Rubyworks, Thomas Sawyer
 License:: BSD-2-Clause
 Website:: http://rubyworks.github.com/yes
 
-    Copyright 2011 Thomas Sawyer. All rights reserved.
+    Copyright 2007 Thomas Sawyer, Rubyworks. All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
@@ -29,7 +29,3 @@ Website:: http://rubyworks.github.com/yes
     NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    The views and conclusions contained in the software and documentation are
-    those of the authors and should not be interpreted as representing official
-    policies, either expressed or implied, of Thomas Sawyer.
-

data/README.rdoc

@@ -157,6 +157,6 @@ Q.E.D.
 
 Copyright (c) 2007 Thomas Sawyer
 
-BSD 2-Clause License
+BSD 2 Clause License
 
 See LICENSE.rdoc for details.

data/{QED.rdoc → SPECSHEET.rdoc}

@@ -452,3 +452,5 @@ A constant defined in the applique is visible.
   APPLIQUE_CONSTANT.assert = true
 
 
+
+

data/lib/qed.yml

@@ -1,48 +1,46 @@
---- 
-name: qed
-version: 2.6.1
-title: QED
-summary: Quod Erat Demonstrandum
-description: QED (Quality Ensured Demonstrations) is a TDD/BDD framework utilizing Literate Programming techniques.
-loadpath: 
-- lib
-manifest: MANIFEST
-requires: 
+---
+source:
+- meta/
+authors:
+- name: Trans
+  email: transfire@gmail.com
+copyrights:
+- holder: Thomas Sawyer, Rubyworks
+  year: '2006'
+  license: BSD-2-Clause
+replacements: []
+alternatives: []
+requirements:
 - name: ansi
-  version: 0+
-  group: []
-
 - name: facets
   version: 2.8+
-  group: []
-
 - name: ae
   version: 1.7+
-  group: []
-
 - name: detroit
-  version: 0+
-  group: 
+  groups:
   - build
+  development: true
+dependencies: []
 conflicts: []
-
-replaces: []
-
-engine_check: []
-
-organization: RubyWorks
-contact: trans <transfire@gmail.com>
-created: 2006-12-16
-copyright: Copyright (c) 2006 Thomas Sawyer
-licenses: []
-
-authors: 
-- Thomas Sawyer <transfire@gmail.com>
-maintainers: []
-
-resources: 
+repositories:
+- uri: git://github.com/rubyworks/qed.git
+  scm: git
+  name: upstream
+resources:
   home: http://rubyworks.github.com/qed
-  work: http://github.com/rubyworks/qed
-repositories: 
-  public: git://github.com/rubyworks/qed.git
-spec_version: 1.0.0
+  code: http://github.com/rubyworks/qed
+  mail: http://groups.google.com/groups/rubyworks-mailinglist
+  bugs: http://github.com/rubyworks/qed/issues
+extra: {}
+load_path:
+- lib
+revision: 0
+created: '2006-12-16'
+summary: Quod Erat Demonstrandum
+title: QED
+version: 2.6.2
+name: qed
+description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
+
+  utilizing Literate Programming techniques.'
+date: '2011-10-24'

data/lib/qed/document.rb

@@ -27,11 +27,11 @@ module QED
     # Ouput file.
     attr_accessor :output
 
-    # Either html or plain.
+    # Format of output file, either 'html' or 'plain'.
     # Defaults to extension of output file.
     attr_accessor :format
 
-    #
+    # Files to document.
     attr_reader :paths
 
     #
@@ -88,6 +88,10 @@ module QED
     end
 
     # Generate specification document.
+    #
+    #--
+    # TODO: Use Malt to support more formats in future.
+    #++
     def generate
       #copy_support_files
 
@@ -101,9 +105,11 @@ module QED
 
       #TODO: load .config/qedrc.rb
 
-      demo_files.each do |file|
-        puts file unless quiet?
+      if dryrun or $DEBUG
+        puts demo_files.sort.join(" ")
+      end
 
+      demo_files.each do |file|
         #strio = StringIO.new('')
         #reporter = Reporter::Html.new(strio)
         #runner = Runner.new([file], reporter)
@@ -152,7 +158,7 @@ module QED
       end
 
       if html?
-        temp = Template.new(template, output, title, css)
+        temp = Template.new(template, out, title, css)
         html = temp.parse_template
         save(html)
       else
@@ -185,12 +191,13 @@ module QED
     # Save specification document.
     def save(text)
       if dryrun
-        puts "\nwrite #{output}"
+        puts "[dry-run] Write #{output}" unless quiet
       else
         make_output_directory
         File.open(output, 'wb') do |f|
           f << text
         end
+        puts "Write #{output}" unless quiet
       end
     end
 

data/lib/qed/document/template.rhtml

@@ -117,7 +117,8 @@
   <!-- Side Table of Contents -->
   <div id="sidebar" style="position: fixed; top: 10; right: 10; background: white;">
     <a href="javascript: toc_toggle();">
-      <img src="http://www.cdnjs.com/images/poweredbycloudflare.png" style="border: none;" alt="TOC" align="right"/>
+      <!-- TODO: find a preminatn image on web to use -->
+      <!-- <img src="http://www.cdnjs.com/images/poweredbycloudflare.png" style="border: none;" alt="TOC" align="right"/> -->
     </a>
 
     <div id="toc_side" class="toc">
@@ -126,7 +127,8 @@
 
   <div id="container">
     <div id="header">
-      <img src="http://www.cdnjs.com/images/poweredbycloudflare.png" align="left" style="padding-right: 10px;" alt=""/>
+      <!-- TODO: find a preminatn image on web to use -->
+      <!-- <img src="http://www.cdnjs.com/images/poweredbycloudflare.png" align="left" style="padding-right: 10px;" alt=""/> -->
 
       <div class="title"><%= title %></div>
 

data/lib/qed/reporter/abstract.rb

@@ -56,6 +56,11 @@ module Reporter
       @trace
     end
 
+    #
+    def success?
+      record[:error] + record[:fail] == 0
+    end
+
     #
     def update(type, *args)
       __send__("count_#{type}", *args) if respond_to?("count_#{type}")
@@ -271,7 +276,11 @@ module Reporter
 
     #
     def clean_backtrace(*btrace)
-      stack = btrace.reject{ |bt| bt =~ INTERNALS } unless $DEBUG
+      stack = if $DEBUG
+                btrace
+              else
+                btrace.reject{ |bt| bt =~ INTERNALS }
+              end
       stack.map do |bt|
         bt.chomp(":in \`__binding__'")
       end
@@ -306,6 +315,7 @@ module Reporter
       file, lineno = file_and_line(exception)
 
       return nil if file.empty?
+      return nil if file == '(eval)'
 
       source = source(file)
       
@@ -356,7 +366,11 @@ module Reporter
     # @return [String] source code
     def source(file)
       @source[file] ||= (
-        File.readlines(file)
+        if File.exist?(file)
+          File.readlines(file)
+        else
+          ''
+        end
       )
     end
 

data/lib/qed/scope.rb

@@ -63,11 +63,16 @@ module QED
 
     # Evaluate code in the context of the scope's special binding.
     # The return result of the evaluation is stored in `@_`.
+    #
+    # TODO: rename to avoid conflict with Kernel method.
     def eval(code, file=nil, line=nil)
-      @_ = super(code, __binding__, @_file, line)
+      if file
+        @_ = super(code, __binding__, file.to_s, line.to_i)
+      else
+        @_ = super(code, __binding__)
+      end
     end
 
-
     # Utilize is like #require, but will evaluate the script in the context
     # of the current scope.
     #--

data/lib/qed/session.rb

@@ -9,9 +9,9 @@ module QED
   #
   class Session
 
-    # If files are not specifies than these directories 
+    # If files are not specified than these directories 
     # will be searched.
-    DEFAULT_FILES = ['spec', 'demo', 'qed']
+    DEFAULT_FILES = ['qed', 'demo', 'spec']
 
     # Default recognized demos file types.
     DEMO_TYPES = %w{qed rdoc md markdown}
@@ -56,8 +56,8 @@ module QED
     def initialize(files, options={})
       require_reporters
 
-      @files = [files].flatten
-      @files = DEFAULT_FILES if @files.empty?
+      @files = [files].flatten.compact
+      @files = [DEFAULT_FILES.find{ |d| File.directory?(d) }] if @files.empty?
 
       @format    = options[:format]   || :dotprogress
       @trace     = options[:trace]    || false
@@ -82,6 +82,8 @@ module QED
     #end
 
     # TODO: Ultimately use Plugin library to support custom reporters?
+
+    # Require all reporters.
     def require_reporters
       Dir[File.dirname(__FILE__) + '/reporter/*'].each do |file|
         require file
@@ -140,6 +142,8 @@ module QED
         reporter.after_session(self)
         #profile.after_session(self)
       end
+
+      reporter.success?
     end
 
     #
@@ -149,7 +153,7 @@ module QED
 
     # Add to load path (from -I option).
     def prepare_loadpath
-      loadpath.each{ |dir| $LOAD_PATH.unshift(dir) }
+      loadpath.each{ |dir| $LOAD_PATH.unshift(File.expand_path(dir)) }
     end
 
     # Require libraries (from -r option).
@@ -235,7 +239,8 @@ module QED
       #end
 
       session = new(files, options)
-      session.run
+      success = session.run
+      exit -1 unless success
     end
 
     # Instance of OptionParser

metadata

@@ -1,71 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qed
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.6.2
   prerelease: 
-  version: 2.6.1
 platform: ruby
-authors: 
-- Thomas Sawyer <transfire@gmail.com>
+authors:
+- Trans
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ansi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &31390400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: facets
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *31390400
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: &31389700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.8"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.8'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ae
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *31389700
+- !ruby/object:Gem::Dependency
+  name: ae
+  requirement: &31389100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.7"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: detroit
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *31389100
+- !ruby/object:Gem::Dependency
+  name: detroit
+  requirement: &31388600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: QED (Quality Ensured Demonstrations) is a TDD/BDD framework utilizing Literate Programming techniques.
-email: transfire@gmail.com
-executables: 
+  prerelease: false
+  version_requirements: *31388600
+description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
+
+  utilizing Literate Programming techniques.'
+email:
+- transfire@gmail.com
+executables:
 - qedoc
 - qed
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- HISTORY.rdoc
+- SPECSHEET.rdoc
 - README.rdoc
-files: 
+- LICENSE.rdoc
+files:
 - .ruby
 - .yardopts
 - bin/qed
@@ -96,60 +100,54 @@ files:
 - lib/qed.rb
 - lib/qed.yml
 - lib/yard-qed.rb
-- qed/01_demos.rdoc
-- qed/02_advice.rdoc
-- qed/03_helpers.rdoc
-- qed/04_samples.rdoc
-- qed/05_quote.rdoc
-- qed/07_toplevel.rdoc
-- qed/08_cross_script.rdoc
-- qed/09_cross_script.rdoc
-- qed/10_constant_lookup.rdoc
-- qed/applique/constant.rb
-- qed/applique/env.rb
-- qed/applique/fileutils.rb
-- qed/applique/markup.rb
-- qed/applique/quote.rb
-- qed/applique/toplevel.rb
-- qed/helpers/advice.rb
-- qed/helpers/sample.rb
-- qed/helpers/toplevel.rb
-- qed/samples/data.txt
-- qed/samples/table.yml
+- spec/01_demos.rdoc
+- spec/02_advice.rdoc
+- spec/03_helpers.rdoc
+- spec/04_samples.rdoc
+- spec/05_quote.rdoc
+- spec/07_toplevel.rdoc
+- spec/08_cross_script.rdoc
+- spec/09_cross_script.rdoc
+- spec/10_constant_lookup.rdoc
+- spec/applique/constant.rb
+- spec/applique/env.rb
+- spec/applique/fileutils.rb
+- spec/applique/markup.rb
+- spec/applique/quote.rb
+- spec/applique/toplevel.rb
+- spec/helpers/advice.rb
+- spec/helpers/sample.rb
+- spec/helpers/toplevel.rb
+- spec/samples/data.txt
+- spec/samples/table.yml
 - test/integration/topcode.rdoc
 - HISTORY.rdoc
+- SPECSHEET.rdoc
 - README.rdoc
-- QED.rdoc
 - LICENSE.rdoc
 homepage: http://rubyworks.github.com/qed
-licenses: []
-
+licenses:
+- BSD-2-Clause
 post_install_message: 
-rdoc_options: 
-- --title
-- QED API
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: qed
-rubygems_version: 1.8.2
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Quod Erat Demonstrandum
 test_files: []
-