tap 0.11.1 → 0.12.0

data/lib/tap/test/file_test_class.rb

@@ -4,9 +4,12 @@ module Tap
     # Class methods extending tests which include FileTest.
     module FileTestClass
       
-      # The class-level test root (a Tap::Root).
+      # The class-level test root (a Tap::Root)
       attr_accessor :class_test_root
       
+      # An array of directories to be cleaned up by cleanup
+      attr_accessor :cleanup_dirs
+
     end
   end
 end

data/lib/tap/test/regexp_escape.rb

@@ -73,8 +73,8 @@ module Tap
         end
       end
       
-      def initialize(str)
-        super(RegexpEscape.escape(str))
+      def initialize(str, *options)
+        super(RegexpEscape.escape(str), *options)
         @original_str = str
       end
       

data/lib/tap/test/script_test.rb

@@ -20,9 +20,9 @@ module Tap
         subset_test("SCRIPT", "s") do
           Tap::Root.chdir(test_dir, true) do  
             Utils.with_argv do
-              puts "\n# == #{method_name}"
+              puts "\n# == #{name}"
 
-              cmd = ScriptTester.new(default_command_path, env('stepwise')) do |expected, result, msg|
+              cmd = ScriptTester.new(default_command_path, env_var('stepwise')) do |expected, result, msg|
                 case expected
                 when String
                   assert_output_equal(expected, result, msg)

data/lib/tap/test/subset_test.rb

@@ -101,9 +101,9 @@ module Tap
       # ENV or type is not specified in ENV.  
       def match_regexp?(type, str, default=true)
         return true if env_true?("ALL")
-        return default unless env(type)
+        return default unless env_var(type)
     
-        str =~ Regexp.new(env(type)) ? true : false
+        str =~ Regexp.new(env_var(type)) ? true : false
       end
 
       # Platform-specific test.  Useful for specifying test that should only 
@@ -188,8 +188,8 @@ module Tap
       def subset_test(type, skip=type[0..0].downcase)
         type = type.upcase
         type_test = "#{type}_TEST"
-        if run_subset?(type) || env(type_test)
-          if match_regexp?(type_test, method_name.to_s)
+        if run_subset?(type) || env_var(type_test)
+          if match_regexp?(type_test, name.to_s)
             yield
           else
             print skip
@@ -220,7 +220,7 @@ module Tap
       def benchmark_test(length=10, &block) 
         subset_test("BENCHMARK") do
           puts
-          puts method_name
+          puts name
           Benchmark.bm(length, &block)
         end
       end
@@ -243,7 +243,7 @@ module Tap
       # The block recieves ['avalue', 'bvalue', 'cvalue'].  
       def prompt_test(*keys, &block)
         subset_test("PROMPT", "p") do
-          puts "\n#{method_name} -- Enter values or 'skip'."
+          puts "\n#{name} -- Enter values or 'skip'."
   
           values = keys.collect do |key|
             print "#{key}: "

data/lib/tap/test/tap_test.rb

@@ -1,32 +1,8 @@
+require 'tap'
+
 module Tap
   module Test
 
-    # Used during check_audit to hold the sources and values of an audit
-    # in the correct order.  Oriented so that the next value to be checked
-    # is at the top of the stack.  Used internally.
-    class AuditStack # :nodoc:
-      attr_reader :test
-    
-      def initialize(test)
-        @test = test
-        @stack = []
-      end
-    
-      def load_audit(values)
-        [values._sources, values._values].transpose.reverse_each do |sv|
-          load(*sv)
-        end
-      end
-    
-      def load(source, value)
-        @stack.unshift [source, value]
-      end
-    
-      def next
-        @stack.shift
-      end
-    end
-
     # Tap-specific testing methods to help with testing Tasks, such as the
     # checking of audits and test-specific modification of application 
     # configuration.
@@ -40,7 +16,7 @@ module Tap
       attr_reader :app
       
       # Setup creates a test-method-specific application that is initialized
-      # to the method_root, and uses the directories and absolute paths from
+      # to the method_root, and uses the relative and absolute paths from
       # trs (the test root structure, see Tap::Test::FileTest). 
       #
       # Also makes sure Tap::App.instance returns the test method app.
@@ -50,153 +26,51 @@ module Tap
         Tap::App.instance = @app
       end
       
-      #
-      # audit test methods
-      #
-      
-      # Used to define expected audits in Tap::Test::TapTest#assert_audit_equal
-      class ExpAudit < Array
-      end
-      
-      # Used to define merged audit trails in Tap::Test::TapTest#assert_audit_equal
-      class ExpMerge < Array
-      end
-      
-      class Tracer
-        include Tap::Support::Executable
-
-        class << self
-          def intern(n, app, runlist)
-            Array.new(n) { |index| new(index, app, runlist) }
-          end
-        end
-
-        def initialize(index, app, runlist)
-          @index = index
-          @runlist = runlist
-
-          @app = app
-          @_method_name = :trace
-          @on_complete_block =nil
-          @dependencies = []
-          @batch = [self]
-        end
-
-        def concat(str, id)
-          "#{str} #{id}".strip
-        end
-
-        def trace(trace)
-          id = "#{@index}.#{batch_index}"
-          @runlist << id
-
-          case trace
-          when Array then trace.collect {|str| concat(str, id) }
-          when String then concat(trace, id)
-          else raise "cannot utilize trace: #{trace}"
-          end
-        end
-      end
-      
       # Asserts that an array of audits are all equal, basically feeding
       # each pair of audits to assert_audit_equal.
-      def assert_audits_equal(expected, audits)
-        error_msg = "expected <#{audits.length}> audits, but was <#{expected.length}>"
-        Utils.each_pair_with_index(expected, audits, error_msg) do |exp, audit, index|
-          assert_audit_equal(exp, audit, [index])
+      def assert_audits_equal(expected, audits, msg=nil, &block)
+        assert_equal expected.length, audits.length, "expected <#{expected.length}> audits, but was <#{audits.length}>"
+        Utils.each_pair_with_index(expected, audits) do |exp, audit, index|
+          assert_audit_equal(exp, audit, &block)
         end
       end
       
-      # Asserts that an audit is as expected.  The expected audit should
-      # be an ExpAudit (just a subclass of Array) that records the sources
-      # and the values at each step in the audit trail.  Proc objects can
-      # be provided in place of expected records that are hard or impossible 
-      # to provide directly; the Proc will be used to validate the actual
-      # record.  Merges must be marked in the ExpAudit using ExpMerge.
+      # Asserts that an audit trail matches the expected trail.  By default
+      # the expected trail should be composed of [key, value] arrays 
+      # representing each audit, but a block may be provided to collect other
+      # attributes.
       #
       # Simple assertion:
       #
-      #   a = Tap::Support::Audit.new
-      #   a._record(:a, 'a')
-      #   a._record(:b, 'b')
-      # 
-      #   e = ExpAudit[[:a, 'a'], [:b, 'b']]
-      #   assert_audit_equal(e, a)
-      # 
-      # Assertion validating a record with a Proc (any number of
-      # records can be validated with a Proc):
-      #
-      #   a = Tap::Support::Audit.new
-      #   a._record(:a, 'a')
-      #   a._record(:b, 'b')
+      #   a = Audit.new(:a, 'a')
+      #   b = Audit.new(:b, 'b', a)
       # 
-      #   e = ExpAudit[
-      #        lambda {|source, value| source == :a && value == 'a'},
-      #       [:b, 'b']]
-      #   assert_audit_equal(e, a)
+      #   e = [[:a, 'a'], [:b, 'b']]
+      #   assert_audit_equal(e, b)
       #
       # Assertion with merge:
       #
-      #   a = Tap::Support::Audit.new
-      #   a._record(:a, 'a')
-      #   a._record(:b, 'b')
+      #   a = Audit.new(:a, 'a')
+      #   b = Audit.new(:b, 'b', a)
       # 
-      #   b = Tap::Support::Audit.new
-      #   b._record(:c, 'c')
-      #   b._record(:d, 'd')
+      #   c = Audit.new(:c, 'c')
+      #   d = Audit.new(:d, 'd', c)
       # 
-      #   c = Tap::Support::Audit.merge(a,b)
-      #   c._record(:e, 'e')
-      #   c._record(:f, 'f')
+      #   e = Audit.new(:e, 'e')
+      #   f = Audit.new(:f, 'f', [b,d])
       # 
-      #   ea = ExpAudit[[:a, "a"], [:b, "b"]]
-      #   eb = ExpAudit[[:c, "c"], [:d, "d"]]
-      #   e = ExpAudit[ExpMerge[ea, eb], [:e, "e"], [:f, "f"]]
+      #   eb = [[:a, "a"], [:b, "b"]]
+      #   ed = [[:c, "c"], [:d, "d"]]
+      #   e =  [[eb, ed], [:e, "e"], [:f, "f"]]
       # 
       #   assert_audit_equal(e, c)
       #
-      # When assert_audit_equal fails, a string of indicies is provided
-      # to help locate which record was unequal.  For instance in the last
-      # example, say we used:
-      #
-      #   ea = ExpAudit[[:a, "a"], [:b, "FLUNK"]]
-      #   eb = ExpAudit[[:c, "c"], [:d, "d"]]
-      #   e = ExpAudit[ExpMerge[ea, eb], [:e, "e"], [:f, "f"]]
-      #
-      # The failure message will read something like 'unequal record 0:0:1' 
-      # indicating it was e[0][0][1] that failed.  Working through it, 
-      # remembering that ExpAudit and ExpMerge are just subclasses of 
-      # Array:
-      #
-      #   e              # => ExpAudit[ExpMerge[ea, eb], [:e, "e"], [:f, "f"]]
-      #   e[0]           # => ExpMerge[ea, eb]
-      #   e[0][0]        # => ExpAudit[[:a, "a"], [:b, "FLUNK"]]
-      #   e[0][0][1]     # => [:b, "FLUNK"]
-      #
-      def assert_audit_equal(expected, audit, nesting=[])
-        actual = audit._collect_records {|source, value| [source, value]}
-        assert_audit_records_equal(expected, actual, nesting)
+      def assert_audit_equal(expected, audit, msg=nil, &block)
+        block = lambda {|a| [a.key, a.value] } unless block
+        actual = audit.trail(&block)
+        assert_equal(expected, actual, msg)
       end
       
-      def assert_audit_records_equal(expected, actual, nesting=[])
-        assert_equal ExpAudit, expected.class
-        assert_equal expected.length, actual.length, "unequal number of records"
-        
-        expected.each_with_index do |exp_record, i|
-          case exp_record
-          when ExpMerge
-            flunk "empty merge #{(nesting + [i]).join(':')}" if exp_record.empty?
-            exp_record.each_with_index do |exp_audit, j|
-              assert_audit_records_equal(exp_audit, actual[i][j], nesting + [i,j]) 
-            end
-          when Proc
-            assert exp_record.call(*actual[i]), "unconfirmed record #{(nesting + [i]).join(':')}"
-          else
-            assert_equal exp_record, actual[i], "unequal record #{(nesting + [i]).join(':')}"
-          end
-        end
-      end
-
       # The configurations used to initialize self.app
       def app_config
         method_root.config.to_hash.merge(:quiet => true, :debug => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,15 +9,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-02 01:00:00 -06:00
-default_executable: tap
-dependencies: []
-
+date: 2009-02-17 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: configurable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 description: 
 email: simon.a.chiang@gmail.com
 executables: 
 - tap
-- rap
 extensions: []
 
 extra_rdoc_files: 
@@ -29,83 +37,55 @@ extra_rdoc_files:
 - doc/Syntax Reference
 - doc/Tutorial
 files: 
-- cgi/run.rb
 - cmd/console.rb
 - cmd/destroy.rb
 - cmd/generate.rb
 - cmd/manifest.rb
 - cmd/run.rb
-- doc/Tutorial
-- doc/Class Reference
-- doc/Command Reference
-- bin/rap
 - bin/tap
+- lib/tap.rb
 - lib/tap/app.rb
 - lib/tap/constants.rb
-- lib/tap/declarations.rb
 - lib/tap/env.rb
 - lib/tap/exe.rb
 - lib/tap/file_task.rb
+- lib/tap/generator/arguments.rb
 - lib/tap/generator/base.rb
 - lib/tap/generator/destroy.rb
 - lib/tap/generator/generate.rb
 - lib/tap/generator/generators/command/command_generator.rb
 - lib/tap/generator/generators/command/templates/command.erb
 - lib/tap/generator/generators/config/config_generator.rb
-- lib/tap/generator/generators/config/templates/doc.erb
-- lib/tap/generator/generators/config/templates/nodoc.erb
-- lib/tap/generator/generators/file_task/file_task_generator.rb
-- lib/tap/generator/generators/file_task/templates/file.txt
-- lib/tap/generator/generators/file_task/templates/result.yml
-- lib/tap/generator/generators/file_task/templates/task.erb
-- lib/tap/generator/generators/file_task/templates/test.erb
 - lib/tap/generator/generators/generator/generator_generator.rb
 - lib/tap/generator/generators/generator/templates/task.erb
+- lib/tap/generator/generators/generator/templates/test.erb
 - lib/tap/generator/generators/root/root_generator.rb
 - lib/tap/generator/generators/root/templates/README
 - lib/tap/generator/generators/root/templates/Rakefile
-- lib/tap/generator/generators/root/templates/tapfile
+- lib/tap/generator/generators/root/templates/Rapfile
 - lib/tap/generator/generators/root/templates/gemspec
 - lib/tap/generator/generators/root/templates/test/tap_test_helper.rb
-- lib/tap/generator/generators/root/templates/test/tap_test_suite.rb
 - lib/tap/generator/generators/task/task_generator.rb
 - lib/tap/generator/generators/task/templates/task.erb
 - lib/tap/generator/generators/task/templates/test.erb
 - lib/tap/generator/manifest.rb
-- lib/tap/patches/optparse/summarize.rb
+- lib/tap/generator/preview.rb
 - lib/tap/root.rb
+- lib/tap/spec.rb
 - lib/tap/support/aggregator.rb
-- lib/tap/support/assignments.rb
 - lib/tap/support/audit.rb
-- lib/tap/support/class_configuration.rb
-- lib/tap/support/combinator.rb
-- lib/tap/support/configurable.rb
-- lib/tap/support/configurable_class.rb
-- lib/tap/support/configuration.rb
 - lib/tap/support/constant.rb
 - lib/tap/support/constant_manifest.rb
 - lib/tap/support/dependencies.rb
 - lib/tap/support/dependency.rb
 - lib/tap/support/executable.rb
 - lib/tap/support/executable_queue.rb
-- lib/tap/support/gems/rake.rb
 - lib/tap/support/gems.rb
-- lib/tap/support/instance_configuration.rb
 - lib/tap/support/intern.rb
 - lib/tap/support/join.rb
 - lib/tap/support/joins.rb
-- lib/tap/support/joins/fork.rb
-- lib/tap/support/joins/merge.rb
-- lib/tap/support/joins/sequence.rb
 - lib/tap/support/joins/switch.rb
 - lib/tap/support/joins/sync_merge.rb
-- lib/tap/support/lazy_attributes.rb
-- lib/tap/support/lazydoc.rb
-- lib/tap/support/lazydoc/comment.rb
-- lib/tap/support/lazydoc/config.rb
-- lib/tap/support/lazydoc/definition.rb
-- lib/tap/support/lazydoc/document.rb
-- lib/tap/support/lazydoc/method.rb
 - lib/tap/support/manifest.rb
 - lib/tap/support/minimap.rb
 - lib/tap/support/node.rb
@@ -113,42 +93,41 @@ files:
 - lib/tap/support/schema.rb
 - lib/tap/support/shell_utils.rb
 - lib/tap/support/string_ext.rb
-- lib/tap/support/tdoc.rb
-- lib/tap/support/tdoc/tdoc_html_generator.rb
-- lib/tap/support/tdoc/tdoc_html_template.rb
 - lib/tap/support/templater.rb
-- lib/tap/support/validation.rb
 - lib/tap/support/versions.rb
 - lib/tap/task.rb
 - lib/tap/tasks/dump.rb
 - lib/tap/tasks/load.rb
-- lib/tap/tasks/rake.rb
+- lib/tap/test.rb
 - lib/tap/test/assertions.rb
 - lib/tap/test/env_vars.rb
 - lib/tap/test/extensions.rb
 - lib/tap/test/file_test.rb
 - lib/tap/test/file_test_class.rb
-- lib/tap/test/script_test.rb
 - lib/tap/test/regexp_escape.rb
+- lib/tap/test/script_test.rb
 - lib/tap/test/script_tester.rb
 - lib/tap/test/subset_test.rb
 - lib/tap/test/subset_test_class.rb
 - lib/tap/test/tap_test.rb
 - lib/tap/test/utils.rb
-- lib/tap/test.rb
-- lib/tap.rb
 - README
 - MIT-LICENSE
 - History
+- doc/Class Reference
+- doc/Command Reference
 - doc/Syntax Reference
+- doc/Tutorial
 has_rdoc: true
 homepage: http://tap.rubyforge.org
 post_install_message: 
 rdoc_options: 
-- --title
-- Tap - Task Application
 - --main
 - README
+- -S
+- -N
+- --title
+- Tap (Task Application)
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -166,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tap
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A framework for creating configurable, distributable tasks and workflows.