bahuvrihi-tap 0.10.6 → 0.10.7

data/lib/tap/test/script_test.rb

@@ -0,0 +1,46 @@
+require 'tap/test/assertions'
+require 'tap/test/script_tester'
+require 'tap/test/subset_test'
+
+module Tap
+  module Test
+    module ScriptTest
+      
+      def self.included(base)
+        super
+        base.send(:include, Tap::Test::SubsetTest)
+        base.send(:include, Tap::Test::Assertions) 
+      end
+      
+      def default_command_path
+        nil
+      end
+      
+      def script_test(test_dir=method_root.root)
+        subset_test("SCRIPT", "s") do
+          Tap::Root.chdir(test_dir, true) do  
+            Utils.with_argv do
+              puts "\n# == #{method_name}"
+
+              cmd = ScriptTester.new(default_command_path, env('stepwise')) do |expected, result, msg|
+                case expected
+                when String
+                  assert_output_equal(expected, result, msg)
+                when Regexp
+                  assert_alike(expected, result, msg)
+                end
+              end
+              
+              yield(cmd)
+            end
+          end
+        end
+      end
+      
+    end
+  end
+end
+
+
+
+

data/lib/tap/test/script_tester.rb

@@ -0,0 +1,109 @@
+require 'tap/support/shell_utils'
+require 'tap/test/regexp_escape'
+
+module Tap
+  module Test
+
+    class ScriptTester
+      include Tap::Support::ShellUtils
+      
+      # The command path for self, returned by to_s
+      attr_accessor :command_path
+      
+      # An array of (command, message, expected, validation)
+      # entries, representing the accumulated test commands.
+      attr_reader :commands
+      
+      attr_reader :stepwise, :run_block
+      
+      def initialize(command_path=nil, stepwise=false, &run_block)
+        @command_path = command_path
+        @commands = []
+        @stepwise = stepwise
+        @run_block = run_block
+      end
+      
+      # Splits the input string, collecting single-line commands
+      # and expected results.  Nil will be used as the expected
+      # result if the result is whitespace, or not present.
+      #
+      #   cmd = ScriptTest.new
+      #   cmd.split %Q{
+      #   % command one
+      #   expected text for command one
+      #   % command two
+      #   % command three
+      #   expected text for command three
+      #   }  
+      #   # => [
+      #   # ["command one", "expected text for command one\n"],
+      #   # ["command two", nil],
+      #   # ["command three", "expected text for command three\n"]] 
+      #
+      def split(str)
+        str.split(/^%\s*/).collect do |s| 
+          next(nil) if s.strip.empty?
+          command, expected = s.split(/\n/, 2)
+          expected = nil if expected && expected.strip.empty?
+          [command.strip, expected]
+        end.compact
+      end
+      
+      def time(msg, command)
+        run([command, msg, nil, nil])
+      end
+      
+      def check(msg, command, use_regexp_escapes=true, &validation)
+        new_commands = split(command)
+        commands = new_commands.collect do |cmd, expected|
+          expected = RegexpEscape.new(expected) if expected && use_regexp_escapes
+          [cmd, msg, expected, validation]
+        end
+        
+        run(*commands)
+      end
+
+      def match(msg, command, regexp=nil, &validation)
+        new_commands = split(command)
+        commands = new_commands.collect do |cmd, expected|
+          raise "expected text specified in match command" unless expected == nil
+          [cmd, msg, regexp, validation]
+        end
+        
+        run(*commands)
+      end
+      
+      def run(*commands)
+        commands.each_with_index do |(cmd, msg, expected, validation), i|
+          start = Time.now
+          result = capture_sh(cmd) {|ok, status, tempfile_path| }
+          elapsed = Time.now - start
+          
+          cmd_msg = commands.length > 1 ? "#{msg} (#{i})" : msg
+          run_block.call(expected, result, %Q{#{cmd_msg}\n% #{cmd}}) if expected
+          validation.call(result) if validation
+
+          if stepwise
+            print %Q{
+------------------------------------
+%s
+> %s
+%s
+Time Elapsed: %.3fs} % [cmd_msg, cmd, result, elapsed]
+
+            print "\nContinue? (y/n): "
+            break if gets.strip =~ /^no?$/i
+          else
+            puts "%.3fs : %s" % [elapsed, cmd_msg]
+          end
+        end
+      end
+    
+      # Returns the command path.
+      def to_s
+        command_path
+      end
+
+    end
+  end
+end

data/lib/tap/test/{subset_methods.rb → subset_test.rb}

@@ -1,10 +1,10 @@
 require 'benchmark'
-require 'tap/test/subset_methods_class'
+require 'tap/test/subset_test_class'
 
 module Tap
   module Test
     
-    # SubsetMethods provides methods to conditionally run tests, or to skip a 
+    # SubsetTest provides methods to conditionally run tests, or to skip a 
     # test suite entirely.
     # 
     #   require 'tap/test'
@@ -26,7 +26,7 @@ module Tap
     # to be skipped.
     # 
     #   class RunOnlyAFewTest < Test::Unit::TestCase
-    #     include SubsetMethods
+    #     include SubsetTest
     # 
     #     def test_runs_all_the_time
     #       assert true
@@ -64,7 +64,7 @@ module Tap
     #   % tap run test EXTENDED=true
     #   % rap test BENCHMARK=true
     #
-    # In so far as SubsetMethods is concerned, the environment variables are 
+    # In so far as SubsetTest is concerned, the environment variables are 
     # case-insensitive.  As in the example, additional ENV-based tests can be 
     # defined using the subset_test method. To run all tests that get switched 
     # using an ENV variable, set ALL=true.  
@@ -76,13 +76,13 @@ module Tap
     #   % rap test all=true
     #
     # See {Test::Unit::TestCase}[link:classes/Test/Unit/TestCase.html] and
-    # SubsetMethodsClass for more information.
-    module SubsetMethods
+    # SubsetTestClass for more information.
+    module SubsetTest
       include Tap::Test::EnvVars
       
       def self.included(base)
         super
-        base.extend SubsetMethodsClass
+        base.extend SubsetTestClass
       end
       
       # Returns true if the specified conditions are satisfied.
@@ -113,7 +113,7 @@ module Tap
       #     platform_test('mswin') { ... }
       #   end
       #
-      # See SubsetMethodsClass#match_platform? for matching details.
+      # See SubsetTestClass#match_platform? for matching details.
       def platform_test(*platforms)
         if self.class.match_platform?(*platforms)
           yield
@@ -137,7 +137,7 @@ module Tap
       #     condition_test {  # does not run }
       #   end
       #
-      # See SubsetMethodsClass#condition for more details.
+      # See SubsetTestClass#condition for more details.
       def condition_test(*condition_names)
         if self.class.unsatisfied_conditions(*condition_names).empty?
           yield

data/lib/tap/test/{subset_methods_class.rb → subset_test_class.rb}

@@ -3,25 +3,25 @@ require 'tap/test/env_vars'
 module Tap
   module Test
     
-    # Class methods extending tests which include SubsetMethods.
-    module SubsetMethodsClass
+    # Class methods extending tests which include SubsetTest.
+    module SubsetTestClass
       include Tap::Test::EnvVars
       
       # Passes conditions to subclass
-      def inherited(subclass) # :nodoc:
+      def inherited(child) # :nodoc:
         super
-        subclass_conditions = conditions.inject({}) do |memo, (key, value)|
-          memo.update(key => (value.dup rescue value))
-        end
-        subclass.instance_variable_set(:@conditions, subclass_conditions)
-        subclass.instance_variable_set(:@run_test_suite, nil)
-        subclass.instance_variable_set(:@skip_messages, [])
+        dup = {}
+        conditions.each_pair {|key, value| dup[key] = value.dup }
+        child.instance_variable_set(:@conditions, dup)
       end
       
-      # A hash of [name, [msg, condition_block]] pairs defined by condition.
-      def conditions
-        @conditions ||= {}
+      # Initialize conditions.
+      def self.extended(base) # :nodoc:
+        base.instance_variable_set(:@conditions, {})
       end
+      
+      # A hash of [name, [msg, condition_block]] pairs defined by condition.
+      attr_reader :conditions
     
       # Defines a condition block and associated message.  
       # Raises an error if no condition block is given.
@@ -37,8 +37,16 @@ module Tap
       #   satisfied?(:is_true)              # => true
       #   satisfied?(:is_true, :is_false)   # => false
       #
-      def satisfied?(*names)
-        unsatisfied_conditions(*names).empty?
+      # Yields the name and message for each unsatisfied condition to the
+      # block, if given.
+      def satisfied?(*names) # :yields: name-of-unsatisfied-condition, msg
+        unsatisfied = unsatisfied_conditions(*names)
+        
+        unsatisfied.each do |name| 
+          yield(name, condition[name][0])
+        end if block_given?
+          
+        unsatisfied.empty?
       end
         
       # Returns an array of the unsatified conditions.  Raises 

data/lib/tap/test/{tap_methods.rb → tap_test.rb}

@@ -33,15 +33,15 @@ module Tap
     #
     # === Class Methods
     # 
-    # See {Test::Unit::TestCase}[link:classes/Test/Unit/TestCase.html] for documentation of the class methods added by TapMethods.
-    module TapMethods
+    # See {Test::Unit::TestCase}[link:classes/Test/Unit/TestCase.html] for documentation of the class methods added by TapTest.
+    module TapTest
       
       # Returns the test-method-specific application.
       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
-      # trs (the test root structure, see Tap::Test::FileMethods). 
+      # trs (the test root structure, see Tap::Test::FileTest). 
       #
       # Also makes sure Tap::App.instance returns the test method app.
       def setup
@@ -54,18 +54,55 @@ module Tap
       # audit test methods
       #
       
-      # Used to define expected audits in Tap::Test::TapMethods#assert_audit_equal
+      # 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::TapMethods#assert_audit_equal
+      # 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)
-        Utils.each_pair_with_index(expected, audits) do |exp, audit, index|
+        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])
         end
       end

data/lib/tap/test/utils.rb

@@ -164,11 +164,14 @@ module Tap
       end
 
       # Same as each_pair but yields the index of the entries as well.
-      def each_pair_with_index(a, b, &block) # :yields: entry_a, entry_b, index
+      def each_pair_with_index(a, b, error_msg=nil, &block) # :yields: entry_a, entry_b, index
         a = [a] unless a.kind_of?(Array)
         b = [b] unless b.kind_of?(Array)
-
-        raise ArgumentError, "The input arrays must have an equal number of entries." unless a.length == b.length
+        
+        unless a.length == b.length
+          raise ArgumentError, (error_msg || "The input arrays must have an equal number of entries.")
+        end
+        
         0.upto(a.length-1) do |index|
           yield(a[index], b[index], index)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bahuvrihi-tap
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors: 
 - Simon Chiang
@@ -28,9 +28,6 @@ extra_rdoc_files:
 - doc/Class Reference
 - doc/Command Reference
 files: 
-- README
-- MIT-LICENSE
-- History
 - cgi/run.rb
 - cmd/console.rb
 - cmd/destroy.rb
@@ -45,6 +42,7 @@ files:
 - bin/tap
 - 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
@@ -73,7 +71,6 @@ files:
 - lib/tap/generator/generators/task/templates/task.erb
 - lib/tap/generator/generators/task/templates/test.erb
 - lib/tap/generator/manifest.rb
-- lib/tap/parser.rb
 - lib/tap/patches/optparse/summarize.rb
 - lib/tap/patches/rake/rake_test_loader.rb
 - lib/tap/patches/rake/testtask.rb
@@ -82,14 +79,10 @@ files:
 - lib/tap/root.rb
 - lib/tap/spec.rb
 - lib/tap/spec/adapter.rb
-- lib/tap/spec/file_methods.rb
-- lib/tap/spec/file_methods_class.rb
-- lib/tap/spec/subset_methods.rb
+- lib/tap/spec/inheritable_class_test_root.rb
 - lib/tap/support/aggregator.rb
 - lib/tap/support/assignments.rb
 - lib/tap/support/audit.rb
-- lib/tap/support/batchable.rb
-- lib/tap/support/batchable_class.rb
 - lib/tap/support/class_configuration.rb
 - lib/tap/support/combinator.rb
 - lib/tap/support/configurable.rb
@@ -97,24 +90,30 @@ files:
 - lib/tap/support/configuration.rb
 - lib/tap/support/constant.rb
 - lib/tap/support/constant_utils.rb
-- lib/tap/support/declarations.rb
-- lib/tap/support/dependable.rb
+- lib/tap/support/dependencies.rb
 - lib/tap/support/executable.rb
 - lib/tap/support/executable_queue.rb
 - lib/tap/support/gems/rake.rb
 - lib/tap/support/gems/rack.rb
 - lib/tap/support/gems.rb
 - lib/tap/support/instance_configuration.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/declaration.rb
 - lib/tap/support/lazydoc/document.rb
 - lib/tap/support/lazydoc/method.rb
 - lib/tap/support/manifest.rb
-- lib/tap/support/parsers/base.rb
-- lib/tap/support/parsers/server.rb
+- lib/tap/support/node.rb
+- lib/tap/support/parser.rb
+- lib/tap/support/schema.rb
 - lib/tap/support/shell_utils.rb
 - lib/tap/support/tdoc.rb
 - lib/tap/support/tdoc/tdoc_html_generator.rb
@@ -127,22 +126,26 @@ files:
 - lib/tap/tasks/dump.rb
 - lib/tap/tasks/load.rb
 - lib/tap/tasks/rake.rb
+- lib/tap/test/assertions.rb
 - lib/tap/test/env_vars.rb
-- lib/tap/test/file_methods.rb
-- lib/tap/test/file_methods_class.rb
-- lib/tap/test/script_methods.rb
-- lib/tap/test/script_methods/regexp_escape.rb
-- lib/tap/test/script_methods/script_test.rb
-- lib/tap/test/subset_methods.rb
-- lib/tap/test/subset_methods_class.rb
-- lib/tap/test/tap_methods.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_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/workflow.rb
 - lib/tap.rb
 - template/404.erb
 - template/index.erb
 - vendor/url_encoded_pair_parser.rb
+- README
+- MIT-LICENSE
+- History
 has_rdoc: true
 homepage: http://tap.rubyforge.org
 post_install_message: