qed 2.8.8 → 2.9.0

data/{.confile.rb → .config.rb}

@@ -4,7 +4,7 @@ config :qed do
   # default configuration
 end
 
-config :qed, :simplecov do
+config :qed, :profile=>:simplecov, :preset=>true do
   require 'simplecov'
   SimpleCov.start do
     coverage_dir 'log/coverage'
@@ -12,7 +12,7 @@ config :qed, :simplecov do
   end
 end
 
-config :qed, :example do
+config :qed, :profile=>:example do
   puts ("*" * 78)
   puts
 

data/.ruby

@@ -10,18 +10,30 @@ copyrights:
   license: BSD-2-Clause
 requirements:
 - name: ansi
+- name: brass
 - name: facets
   version: 2.8+
-- name: brass
-- name: confection
-- name: detroit
+- name: courtier
   groups:
-  - build
+  - optional
+  development: true
+- name: blankslate
+  groups:
+  - optional
+  - test
   development: true
 - name: ae
   groups:
   - test
   development: true
+- name: detroit
+  groups:
+  - build
+  development: true
+- name: fire
+  groups:
+  - build
+  development: true
 dependencies: []
 alternatives: []
 conflicts: []
@@ -30,10 +42,18 @@ repositories:
   scm: git
   name: upstream
 resources:
-  home: http://rubyworks.github.com/qed
-  code: http://github.com/rubyworks/qed
-  mail: http://groups.google.com/groups/rubyworks-mailinglist
-  bugs: http://github.com/rubyworks/qed/issues
+- uri: http://rubyworks.github.com/qed
+  name: home
+  type: home
+- uri: http://github.com/rubyworks/qed
+  name: code
+  type: code
+- uri: http://groups.google.com/groups/rubyworks-mailinglist
+  name: mail
+  type: mail
+- uri: http://github.com/rubyworks/qed/issues
+  name: bugs
+  type: bugs
 extra: {}
 load_path:
 - lib
@@ -41,10 +61,10 @@ revision: 0
 created: '2009-06-16'
 summary: Quod Erat Demonstrandum
 title: QED
-version: 2.8.8
+version: 2.9.0
 name: qed
 webcvs: http://github.com/rubyworks/qed/blob/master/
 description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 
   utilizing Literate Programming techniques.'
-date: '2012-03-14'
+date: '2012-04-14'

data/HISTORY.rdoc

@@ -1,8 +1,27 @@
 = RELEASE HISTORY
 
-== 2.8.8 | 2012-30-17
+== 2.9.0 | 2012-05-19
 
-Feel like a heel after the last four releases. The simplist solution
+IMPORTANT! The `.qed` configuration file is no longer used for configuration.
+Either use a unified `Config.rb` file or require a special config file via the
+`-r` option, e.g. `qed -r ./config/cov.rb`.
+
+Configuration is now handled by the RC library. The only other
+form of configuration supported is that of requiring a special file
+directly via `-r ./path/to/file.rb`. This keeps the code as
+simple as possible without giving-up functionality. Because the old
+`.qed` configuration file is no longer supported, this release has
+a major version bump.
+
+Changes:
+
+* Utilize the RC configuration management library.
+* Improve hash-arrow assertion notation.
+
+
+== 2.8.8 | 2012-03-17
+
+Feel like a heel after the last four releases. The simplest solution
 to the configuration issue is to allow traditional configuration
 trump confection based configuration. If the former is used, then
 the later will never even load. Problem solved.
@@ -21,13 +40,13 @@ variable `config='legacy'`.
 
 Changes:
 
-* Fix bug that prevented deafault demo locations from being used.
+* Fix bug that prevented default demo locations from being used.
 * Change environment variable to config='legacy' to deactivate Confection.
 
 
 == 2.8.6 | 2012-03-15
 
-This release simply make the configuration more versitile by supporting
+This release simply make the configuration more versatile by supporting
 Confection, task directory and traditional `.qed` configuration.
 
 Changes:
@@ -58,7 +77,7 @@ Changes:
 == 2.8.3 | 2012-03-14 18:00
 
 What a difference a week makes ;) The Confection library has been substantially
-improved and if that trend contiunes at all then I think it will be well worth
+improved and if that trend continues at all then I think it will be well worth
 supporting. So with this release QED will again move configuration handling
 over to Confection. Jump over to the Confection project to learn how to use it.
 In short, this release reverts the previous release. Along with this change,
@@ -80,8 +99,8 @@ independent file. The use of the Confection library was a "noble
 idea", but in the end not one that's likely to gain traction among 
 developers in general, so we have decided to revert back to the
 more traditional `.qed` config file. However, we also added built-in
-support for `task/qed.rb`, which we encourgage so as to promote
-clean project structures. Further, QED also suppots the `.map` YAML
+support for `task/qed.rb`, which we encourage so as to promote
+clean project structures. Further, QED also supports the `.map` YAML
 configuration file which allows you to move the QED config file
 wherever you might prefer it. Just add a `qed: path/to/config/file`
 entry.
@@ -413,7 +432,7 @@ Changes:
 
 == 1.1.1 | 2009-09-05
 
-This release 
+This release needs a description.
 
 Changes:
 

data/README.rdoc

@@ -29,8 +29,8 @@ any level of abstraction, from unit test to systems tests.
 
 * Write tests and documentation in the same breath!
 * Demos can be RDoc, Markdown or any other conforming text format.
-* Uses the excellent AE (Assertive Expressive) library for assertions.
-* Table macro allows large sets of data to be tested by the same code.
+* Can use any BRASS compliant assertion framework, such as the the excellent AE (Assertive Expressive) library.
+* Data and Table macros allows large sets of data to be tested by the same code.
 * Documentation tool provides nice output with jQuery-based TOC.
 
 
@@ -38,22 +38,25 @@ any level of abstraction, from unit test to systems tests.
 
 === Assertion Syntax
 
-QED uses the AE (Assertive Expressive) library to provide an elegant means to
-make assertions. To give a quick overview, assertion can be written as:
+QED can use any BRASS compliant assertions framework. Simply require the library in
+ones applique (see below). Traditionally this has been the AE (Assertive Expressive) library,
+which provides an elegant means to make assertions. To give a quick overview, assertion
+can be written as:
 
     4.assert == 5
 
 In this example, because 4 != 5, this expression will raise an Assertion
 exception. QED's Runner class is thus just a means of running and capturing
-code blocks containing these assertions.
+code blocks containing such assertions.
 
-You can learn more about AE at http://rubyworks.github.com/ae.
+You can learn more about BRASS and AE at http://rubyworks.github.com/brass and
+http://rubyworks.github.com/ae, repectively.
 
 === Document Structure
 
-QED documents are simply text files called *demonstrandum*. Because they 
-largely consist of free-form descriptive text, they are a practice pure 
-Literate Programming. For example:
+QED documents are simply text files called *demonstrandum* (demos for short).
+Because they largely consist of free-form descriptive text, they are a practice
+pure Literate Programming. For example:
 
     = Example
 
@@ -91,12 +94,15 @@ To run a document through QED, simply use the +qed+ command.
 The <code>-v</code> option specifies verbatim mode, which outputs the entire
 document.
 
-Notice we placed the QED document in a <code>demo/</code> directory, this is no
-standard place that demonstrations have to go. They can be placed anywhere
-in a project that is preferred (lately I've been use qed/). Also notice the
-`<code>01_</code>` prefix in front of the name. While this is not strictly
-necessary, it helps order the documents nicely in particular when generating
-QED documentation ("QEDocs").
+Notice we placed the QED document in a <code>demo/</code> directory, there is
+no standard place that demonstrations have to go. They can be placed anywhere
+in a project that is preferred (lately I've been use `qed/`). However, the 
+`qed` command will look for `qed/`, `demo/`, `demos/` and `spec/` in that order
+if no location is specified.
+
+Also notice the use of `<code>01_</code>` prefix in front of the file name.
+While this is not strictly necessary, it helps order the documents nicely,
+in particular when generating QED documentation ("QEDocs").
 
 === Utilizing Applique
 
@@ -128,24 +134,28 @@ how you can put the the system to use.
 
 === Configuration
 
-QED uses the {Confection}[http://rubyworks.github.com/confection] library to
+QED uses the {RC}[http://rubyworks.github.com/rc] library to
 handle configuration.
 
 Here's a generally useful example of using SimpleCov to generate a test
-coverage report when running your QED demos. Add this to your `Confile`:
+coverage report when running your QED demos. Add this to your `Config.rb`
+file:
 
-    config :qed, :profile=>:coverage do
+    config :qed, :coverage do
       require 'simplecov'
       SimpleCov.start do
         coverage_dir 'log/coverage'
       end
     end
 
-Or omit the `config` method and just add the block's code to `task/qed-coverage.rb`.
-Either approch makes the `coverage` profile available to the `qed` command.
+You can use the profile via the `-p/--profile` option on the command line:
 
     $ qed -p coverage
 
+Or by setting the `profile` environment variable.
+
+    $ profile=coverage qed
+
 === Generating Documentation
 
 To generate documentation from QED documents, use the +qedoc+ command.
@@ -166,7 +176,7 @@ QED depends on the following external libraries:
 
 * {BRASS}[http://rubyworks.github.com/brass] - Assertions System
 * {ANSI}[http://rubyworks.github.com/ansi] - ANSI Color Codes
-* {Confection}[http://rubyworks.github.com/confection] - Project Tool Configuration
+* {RC}[http://rubyworks.github.com/rc] - Runtime Configuration
 * {Facets}[http://rubyworks.github.com/facets] - Core Extensions
 
 These will be automatically installed when installing QED via RubyGems,
@@ -179,13 +189,26 @@ Optional libraries that are generally useful with QED.
 Install these individually and require them in your applique to use.
 
 
+== Development
+
+=== Testing
+
+QED uses itself for testing, which can be a bit tricky. But works fine for
+the most part. In the future we may add some addition tests via another
+test framework to ensure full coverage. But for now QED is proving sufficient.
+
+To run the tests, use `qed` command line tool --ideally use `$ ruby -Ilib bin/qed`
+to ensure the current version of QED is being used.
+
+For convenience, use `$ fire spec` to run the test specifications. To also 
+generate a test coverage report use `$ fire spec:cov`.
+
+
 == Copyrights
 
-Q.E.D.
+(BSD 2 Clause license)
 
 Copyright (c) 2009 Rubyworks, Thomas Sawyer
 
-BSD 2 Clause License
-
 See COPYING.rdoc for details.
 

data/lib/qed.yml

@@ -10,18 +10,30 @@ copyrights:
   license: BSD-2-Clause
 requirements:
 - name: ansi
+- name: brass
 - name: facets
   version: 2.8+
-- name: brass
-- name: confection
-- name: detroit
+- name: courtier
   groups:
-  - build
+  - optional
+  development: true
+- name: blankslate
+  groups:
+  - optional
+  - test
   development: true
 - name: ae
   groups:
   - test
   development: true
+- name: detroit
+  groups:
+  - build
+  development: true
+- name: fire
+  groups:
+  - build
+  development: true
 dependencies: []
 alternatives: []
 conflicts: []
@@ -30,10 +42,18 @@ repositories:
   scm: git
   name: upstream
 resources:
-  home: http://rubyworks.github.com/qed
-  code: http://github.com/rubyworks/qed
-  mail: http://groups.google.com/groups/rubyworks-mailinglist
-  bugs: http://github.com/rubyworks/qed/issues
+- uri: http://rubyworks.github.com/qed
+  name: home
+  type: home
+- uri: http://github.com/rubyworks/qed
+  name: code
+  type: code
+- uri: http://groups.google.com/groups/rubyworks-mailinglist
+  name: mail
+  type: mail
+- uri: http://github.com/rubyworks/qed/issues
+  name: bugs
+  type: bugs
 extra: {}
 load_path:
 - lib
@@ -41,10 +61,10 @@ revision: 0
 created: '2009-06-16'
 summary: Quod Erat Demonstrandum
 title: QED
-version: 2.8.8
+version: 2.9.0
 name: qed
 webcvs: http://github.com/rubyworks/qed/blob/master/
 description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 
   utilizing Literate Programming techniques.'
-date: '2012-03-14'
+date: '2012-04-14'

data/lib/qed/cli.rb

@@ -1,7 +1,11 @@
 if RUBY_VERSION < '1.9'
+  require 'qed/rc' unless ENV['norc']
+  require 'qed/configure'
   require 'qed/cli/qed'
   require 'qed/cli/qedoc'
 else
+  require_relative 'rc' unless ENV['norc']
+  require_relative 'configure'
   require_relative('cli/qed')
   require_relative('cli/qedoc')
 end

data/lib/qed/cli/qed.rb

@@ -1,7 +1,5 @@
 module QED
 
-  require 'qed/session'
-
   #
   def self.cli(*argv)
     Session.cli(*argv)
@@ -12,9 +10,9 @@ module QED
     #
     # Session settings are passed to `Session.new`.
     #
-    def self.settings
-      @settings ||= Settings.new
-    end
+    #def self.settings
+    #  @settings ||= Settings.new
+    #end
 
     #
     # Command line interface for running demos.
@@ -23,16 +21,16 @@ module QED
       require 'optparse'
       require 'shellwords'
 
-      files, options = cli_parse(argv)
+      # we are loading this here instead of above so simplecov coverage works better
+      # (actually, this is really not a problem anymore, but we'll leave it for now)
+      require 'qed/session'
 
-      #if files.empty?
-      #  puts "No files."
-      #  exit -1
-      #end
+      # If RC config file is available.
+      #RC.commit_configuration
 
-      settings.files = files unless files.empty?
+      options = cli_parse(argv)
 
-      session  = Session.new(settings)
+      session  = Session.new(options)
       success  = session.run
 
       exit -1 unless success
@@ -43,7 +41,8 @@ module QED
     #
     def self.cli_parse(argv)
       options = {}
-      options_parser = OptionParser.new do |opt|
+
+      parser = OptionParser.new do |opt|
         opt.banner = "Usage: qed [options] <files...>"
 
         opt.separator("Report Formats (pick one):")
@@ -52,10 +51,10 @@ module QED
         #  options[:format] = :dotprogress
         #end
         opt.on('--verbatim', '-v', "shortcut for verbatim reporter") do
-          settings.format = :verbatim
+          options[:format] = :verbatim
         end
         opt.on('--tapy', '-y', "shortcut for TAP-Y reporter") do
-          settings.format = :tapy
+          options[:format] = :tapy
         end
         #opt.on('--bullet', '-b', "use bullet-point reporter") do
         #  options[:format] = :bullet
@@ -67,25 +66,28 @@ module QED
         #  options[:format] = :script  # psuedo-reporter
         #end
         opt.on('--format', '-f FORMAT', "use custom reporter") do |format|
-          settings.format = format.to_sym
+          options[:format] = format.to_sym
         end
 
         opt.separator("Control Options:")
 
         opt.on('-p', '--profile NAME', "load runtime profile") do |name|
-          settings.profile = name.to_sym
+          options[:profile] = name
         end
         opt.on('--comment', '-c', "run comment code") do
-          settings.mode = :comment
+          options[:mode] = :comment
         end
         opt.on('--loadpath', "-I PATH", "add paths to $LOAD_PATH") do |paths|
-          settings.loadpath = paths.split(/[:;]/).map{|d| File.expand_path(d)}
+          options[:loadpath] = paths.split(/[:;]/).map{|d| File.expand_path(d)}
         end
-        opt.on('--require', "-r LIB", "require library") do |paths|
-          settings.requires = paths.split(/[:;]/)
+        opt.on('--require', "-r LIB", "require feature (immediately)") do |paths|
+          requires = paths.split(/[:;]/)
+          requires.each do |file|
+            require file
+          end
         end
         opt.on('--rooted', '-R', "run from project root instead of temporary directory") do
-          settings.rooted = true
+          options[:rooted] = true
         end
         opt.on('--trace', '-t [COUNT]', "number of backtraces for exceptions (0 for all)") do |cnt|
           #options[:trace] = true
@@ -113,8 +115,8 @@ module QED
 
           unless settings.profiles.empty?
             puts "Available Profiles:"
-            require 'confection'
-            settings.profiles.each do |name|
+            #require 'confection'
+            QED.profiles.each do |name|
               next if name.strip == ''
               puts "    -p #{name}"
             end
@@ -124,9 +126,11 @@ module QED
         end
       end
 
-      options_parser.parse!(argv)
+      parser.parse!(argv)
+
+      options[:files] = argv unless argv.empty?
 
-      return argv, options
+      return options
     end
 
   end

data/lib/qed/configure.rb

@@ -0,0 +1,20 @@
+module QED
+
+  #
+  def self.configure(name=nil, &block)
+    name = (name || 'default').to_s
+    profiles[name] = block if block
+    profiles[name]
+  end
+
+  # Alias for configure.
+  def self.profile(name=nil, &block)
+    configure(name, &block)
+  end
+
+  #
+  def self.profiles
+    @profiles ||= {}
+  end
+
+end

data/lib/qed/core_ext.rb

@@ -34,7 +34,13 @@ class Object
         InstanceExecMethods.module_eval { remove_method(method_name) } rescue nil
       end
     end
+  end
 
+  #
+  # This is used by the `#=>` notation.
+  #
+  def must_return(value)
+    assert(self == value, "#{self.inspect} #=> #{value.inspect}")
   end
 
 end

data/lib/qed/evaluator.rb

@@ -16,7 +16,10 @@ module QED
     # @param [Demo] demo
     #   The demo to run.
     #
-    # @param [Array] observers
+    # @option options [Boolean] :applique
+    #   Is this applique code?
+    #
+    # @option options [Array] :observers
     #   Objects that respond to observable interface.
     #   Typically this is just a Reporter instance.
     #

data/lib/qed/rc.rb

@@ -0,0 +1,12 @@
+require 'qed'
+require 'qed/configure'
+
+begin
+  require 'rc/api'
+  RC.profile_switch 'qed', '-p', '--profile'
+  RC.configure 'qed' do |config|
+    QED.configure(config.profile, &config)
+  end
+rescue LoadError
+end
+

data/lib/qed/reporter/abstract.rb

@@ -139,6 +139,10 @@ module Reporter
       #demos << demo
     end
 
+    #
+    def before_import(file)
+    end
+
     #
     def before_step(step)
     end
@@ -160,6 +164,10 @@ module Reporter
     def demo(demo)
     end
 
+    # Right before import.
+    def import(file)
+    end
+
     # Right before rule section.
     def rule(step)
     end
@@ -187,13 +195,17 @@ module Reporter
 
     # After running a step that failed.
     def fail(step, assertion)
-      #@fail << [step, assertion]
+      ## @fail << [step, assertion]
     end
 
     # After running a step that raised an error.
     def error(step, exception)
       raise exception if $DEBUG  # TODO: do we really want to do it like this?
-      #@error << [step, exception]
+      ## @error << [step, exception]
+    end
+
+    #
+    def after_import(file)
     end
 
     #

data/lib/qed/session.rb

@@ -19,15 +19,14 @@ module QED
     attr :settings
 
     # New Session
-    def initialize(settings, options={})
+    def initialize(settings={})
       require_reporters
 
       case settings
       when Settings
         @settings = settings
       else
-        options[:files] = settings
-        @settings = Settings.new(options)
+        @settings = Settings.new(settings)
       end
     end
 
@@ -127,11 +126,11 @@ module QED
 
       reset_assertion_counts
 
+      #require_profile  # <-- finally runs the profile
+
       prepare_loadpath
       require_libraries
 
-      require_profile  # TODO: here or in chdir?
-
       Dir.chdir(directory) do
         # pre-parse demos
         demos.each{ |demo| demo.steps }
@@ -173,9 +172,9 @@ module QED
     end
 
     #
-    def require_profile
-      settings.load_profile(profile)
-    end
+    #def require_profile
+    #  settings.load_profile(profile)
+    #end
 
     # Returns a list of demo files. The files returned depends on the
     # +files+ attribute and if none given, then the current run mode.

data/lib/qed/settings.rb

@@ -1,28 +1,36 @@
+require 'qed/configure'
+
 module QED
 
-  # Settings ecapsulates setup code for running QED.
+  # Settings ecapsulates setup configuration for running QED.
+  #
+  # When running `qed` on the command line tool, QED can use
+  # either a automatic configuration file, via the RC library,
+  # or setup configuration via an explicitly required file.
   #
-  # QED supports Confection-based configuration, if a Confile is present.
+  # Using a master configuraiton file, add a `config :qed` entry.
+  # For example:
   #
-  #     config :qed, :cover do
+  #     config :qed, :simplecov, :preset=>true do
   #       require 'simplecov'
   #       SimpleCov.start do
   #         coverage_dir 'log/coverage'
   #       end
   #     end
   #
-  # QED also supports traditional configuration files placed in either
-  # toplevel `.qed`, `.qed.rb`, `qed.rb` or these files in the `task/`
-  # directory or in the form of `task/<name>.qed`. The same example as
-  # above in one of these files would be:
+  # To not use RC, just create a requirable file such as `config/qed-coverage.rb`
   #
-  #     profile :cover do
+  #     QED.configure do |qed|
   #       require 'simplecov'
   #       SimpleCov.start do
   #         coverage_dir 'log/coverage'
   #       end
   #     end
   #
+  # Then when running qed use:
+  #
+  #     $ qed -r ./config/qed-coverage.rb
+  #
   class Settings
 
     require 'tmpdir'
@@ -35,34 +43,21 @@ module QED
     # Glob pattern used to search for project's root directory.
     ROOT_PATTERN = '{.map,.ruby,.git/,.hg/,_darcs/}'
 
-    # Glob pattern used to find QED configuration file relative to root directory.
-    CONFIG_PATTERN = '{.,,task/}qed,qedfile{,.rb}'
-
     # Home directory.
     HOME = File.expand_path('~')
 
     # Directory names to omit from automatic selection.
     OMIT_PATHS = %w{applique helpers support sample samples fixture fixtures}
 
-    # QED support configuration file mapping.
-    #MAP_FILE = '.map'
-
-    #
-    # Mast configuration file lookup glob.
-    #
-    CONFECTION_GLOB = '{,.}confile{.rb,}'
-
-    #
-    # Traditional configuration file lookup glob.
-    #
-    CONFIG_GLOB = '{,.,task/}qed{,file}{,.rb}'
-
     #
     # Initialize new Settings instance.
     #
     def initialize(options={})
       initialize_defaults
-      initialize_configuration
+
+      @profile = (options.delete(:profile) || default_profile).to_s
+
+      load_profile
 
       options.each do |key, val|
         send("#{key}=", val) if val
@@ -70,75 +65,23 @@ module QED
     end
 
     #
-    def initialize_defaults
-      @files      = nil
-      @format     = :dot
-      @trace      = false
-      @mode       = nil
-      @loadpath   = ['lib']
-      @requires   = []
-      @omit       = OMIT_PATHS  # TODO: eventually make configurable
-      @rootless   = false
-
-      @profile    = ENV['profile'] || :default
-    end
-
-    #
-    # QED can use either a maser configuration file, via the Confection
-    # library, or more traditional toplevel or task directory files. Only
-    # one of these two approaches can be used and the traditional
-    # system, if used, will override use of the confection system.
-    #
-    # Using a master configuraiton file, add for example:
-    #
-    #     config :qed, :simplecov do
-    #       require 'simplecov'
-    #       SimpleCov.start do
-    #         coverage_dir 'log/coverage'
-    #       end
-    #     end
+    # Initialize default settings.
     #
-    # If using a traditional configuration file, which can be either of
-    # `.qed`, `.qed.rb` or `qed.rb`, case-insensitive, or a `task/<name>.qed`
-    # located file, use the `#profile` method to define different profiles.
-    #
-    #     profile :simplecov do
-    #       require 'simplecov'
-    #       SimpleCov.start do
-    #         coverage_dir 'log/coverage'
-    #       end
-    #     end
-    #
-    def initialize_configuration
-      @profiles = {}
-
-      # traditional
-      Dir.glob(File.join(root, CONFIG_GLOB), File::FNM_CASEFOLD).each do |file|
-        next unless File.file?(file)
-        instance_eval(File.read(file), file)
-      end
-
-      # task directory config files
-      Dir.glob(File.join(root, 'task/*.qed')).each do |file|
-        next unless File.file?(file)
-        instance_eval(File.read(file), file)
-      end
-
-      # don't use confection gem if other approaches are being used.
-      return unless @profiles.empty?
-
-      # confection
-      if confection_file
-        require 'confection'
-        Confection.profiles(:qed).each do |name|
-          @profiles[name.to_s] = lambda{ load_profile_from_confection(name) }
-        end
-      end
+    def initialize_defaults
+      @files    = nil #DEFAULT_FILES
+      @format   = :dot
+      @trace    = false
+      @mode     = nil  # ?
+      @loadpath = ['lib']
+      @omit     = OMIT_PATHS
+      @rootless = false
+      @requires = []
+      #@profile  = :default
     end
 
-    # Lookup Confection config file.
-    def confection_file
-      Dir.glob(File.join(root, CONFECTION_GLOB), File::FNM_CASEFOLD).first
+    # Profile name can come from `profile` or `p` environment variables.
+    def default_profile
+      ENV['profile'] || ENV['p'] || 'default'
     end
 
     # Demonstration files (or globs).
@@ -183,8 +126,23 @@ module QED
     # Operate from system temporary directory?
     attr_accessor :rootless
 
-    # Selected profile.
-    attr_accessor :profile
+    #
+    # Load QED configuration profile. The load procedure is stored as
+    # a Proc object in a hash b/c different configuration systems
+    # can be used.
+    #
+    def load_profile
+      config = QED.profiles[@profile]
+      config.call(self) if config
+    end
+
+    #
+    # Profiles are collected from the RC library, unless 
+    # RC is deactivated via the override file.
+    # 
+    def profiles
+      QED.profiles.keys
+    end
 
     #
     # Operate relative to project root directory, or use system's location.
@@ -234,6 +192,7 @@ module QED
       FileUtils.mkdir_p(tmpdir)
     end
 
+=begin
     #
     # Define a profile.
     #
@@ -251,24 +210,7 @@ module QED
       return @profile[name.to_s] unless block
       @profiles[name.to_s] = block
     end
-
-    #
-    # Profiles are collected from the Confection library, unless 
-    # confection is deactivated via the override file.
-    # 
-    def profiles
-      @profiles.keys
-    end
-
-    #
-    # Load QED configuration profile. The load procedure is stored as
-    # a Proc object in a hash b/c different configuration systems
-    # can be used.
-    #
-    def load_profile(profile)
-      profile = @profiles[profile.to_s]
-      profile.call if profile
-    end
+=end
 
   private
 
@@ -370,20 +312,21 @@ module QED
     #end
 
     #
-    def load_confection_profile(name)
-      config = confection(:qed, name.to_sym)
-      config.exec
-    end
+    #def load_confection_profile(name)
+    #  config = confection(:qed, name.to_sym)
+    #  config.exec
+    #end
 
     #
-    def load_profile_from_file(file)
-      if File.exist?(file)
-        instance_eval(File.read(file), file)
-      else
-        # raise "no profile -- #{profile}"
-      end
-    end
+    #def load_profile_from_file(file)
+    #  if File.exist?(file)
+    #    instance_eval(File.read(file), file)
+    #  else
+    #    # raise "no profile -- #{profile}"
+    #  end
+    #end
 
   end
 
 end
+

data/lib/qed/step.rb

@@ -227,10 +227,13 @@ 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*\#\ ?\=\>(.*?)$/, ' == \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.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.gsub!(/\n\s*\#\ ?\=\>\s*(.*?)$/, '.must_return(\1)')
+      code.gsub!(/\s*\#\ ?\=\>\s*(.*?)$/, '.must_return(\1)')
+
       code
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qed
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &28672460 !ruby/object:Gem::Requirement
+  requirement: &25076880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28672460
+  version_requirements: *25076880
+- !ruby/object:Gem::Dependency
+  name: brass
+  requirement: &25074880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *25074880
 - !ruby/object:Gem::Dependency
   name: facets
-  requirement: &28671560 !ruby/object:Gem::Requirement
+  requirement: &25073040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +43,43 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *28671560
+  version_requirements: *25073040
 - !ruby/object:Gem::Dependency
-  name: brass
-  requirement: &28671020 !ruby/object:Gem::Requirement
+  name: courtier
+  requirement: &25071080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *28671020
+  version_requirements: *25071080
 - !ruby/object:Gem::Dependency
-  name: confection
-  requirement: &28670240 !ruby/object:Gem::Requirement
+  name: blankslate
+  requirement: &25068100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: *25068100
+- !ruby/object:Gem::Dependency
+  name: ae
+  requirement: &25065100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *28670240
+  version_requirements: *25065100
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &28669640 !ruby/object:Gem::Requirement
+  requirement: &25062600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28669640
+  version_requirements: *25062600
 - !ruby/object:Gem::Dependency
-  name: ae
-  requirement: &28669100 !ruby/object:Gem::Requirement
+  name: fire
+  requirement: &25059820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28669100
+  version_requirements: *25059820
 description: ! 'QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 
   utilizing Literate Programming techniques.'
@@ -91,7 +113,7 @@ extra_rdoc_files:
 - README.rdoc
 - COPYING.rdoc
 files:
-- .confile.rb
+- .config.rb
 - .ruby
 - .yardopts
 - bin/qed
@@ -100,6 +122,7 @@ files:
 - lib/qed/cli/qed.rb
 - lib/qed/cli/qedoc.rb
 - lib/qed/cli.rb
+- lib/qed/configure.rb
 - lib/qed/core_ext.rb
 - lib/qed/demo.rb
 - lib/qed/document/jquery.js
@@ -111,6 +134,7 @@ files:
 - lib/qed/helpers/shell_session.rb
 - lib/qed/parser.rb
 - lib/qed/qparser.rb
+- lib/qed/rc.rb
 - lib/qed/reporter/abstract.rb
 - lib/qed/reporter/dotprogress.rb
 - lib/qed/reporter/html.rb