tap-test 0.2.0 → 0.3.0

data/History

@@ -1,3 +1,7 @@
+== 0.3.0 / 2009-12-05
+
+Updates for Tap-0.19.0
+
 == 0.2.0 / 2009-06-17
 
 Updates for Tap-0.18.0

data/MIT-LICENSE

@@ -1,22 +1,21 @@
 Copyright (c) 2009, Regents of the University of Colorado.
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+Copyright (c) 2009, Simon Chiang.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README

@@ -18,7 +18,6 @@ test modules into other test frameworks.
 documentation, development, and bug tracking.
 
 * Website[http://tap.rubyforge.org] 
-* Lighthouse[http://bahuvrihi.lighthouseapp.com/projects/9908-tap-task-application/tickets]
 * Github[http://github.com/bahuvrihi/tap/tree/master] 
 * {Google Group}[http://groups.google.com/group/ruby-on-tap]
 
@@ -111,13 +110,11 @@ Sets up Tap::App.instance for testing tasks.
 
 == Installation
 
-Tap-Test is available as a gem on RubyForge[http://rubyforge.org/projects/tap].  Use:
+Tap-Test is available as a gem on Gemcutter[http://gemcutter.org/gems/tap-test].
 
   % gem install tap-test
   
 == Info
 
-Copyright (c) 2009, Regents of the University of Colorado.
-Developer:: {Simon Chiang}[http://bahuvrihi.wordpress.com], {Biomolecular Structure Program}[http://biomol.uchsc.edu/], {Hansen Lab}[http://hsc-proteomics.uchsc.edu/hansenlab/] 
-Support:: CU Denver School of Medicine Deans Academic Enrichment Fund
+Developer:: {Simon Chiang}[http://bahuvrihi.wordpress.com]
 License:: {MIT-Style}[link:files/MIT-LICENSE.html]

data/lib/tap/test.rb

@@ -38,6 +38,11 @@ module Tap
       include Tap::Test::FileTest
       
       options[:root] ||= test_root_dir
+      
+      if options.has_key?(:cleanup_dirs)
+        self.cleanup_dirs = options.delete(:cleanup_dirs)
+      end
+      
       self.class_test_root = Tap::Root.new(options)
     end
     

data/lib/tap/test/shell_test.rb

@@ -1,22 +1,5 @@
-if RUBY_PLATFORM =~ /mswin32/
-  begin
-    require 'rubygems'
-    require 'win32/open3'
-  rescue(LoadError)
-    puts %q{
-Tap:Test::ShellTest requires the win32-open3 gem on Windows.
-Use this command and try again:
-
-  % gem install win32-open3
-
-}
-    raise
-  end
-else
-  require 'open3'
-end
-
 require 'tap/test/shell_test/class_methods'
+require 'tap/test/shell_test/regexp_escape'
 
 module Tap
   module Test
@@ -67,19 +50,25 @@ module Tap
       # setup in an including module.
       def setup
         super
-        @shell_test_notification = false
+        @notify_method_name = true
       end
       
       # Returns true if the ENV variable 'VERBOSE' is true.  When verbose,
       # ShellTest prints the expanded commands of sh_test to $stdout.
       def verbose?
-        ENV['VERBOSE'] == 'true'
+        verbose = ENV['VERBOSE']
+        verbose && verbose =~ /^true$/i ? true : false
       end
       
       # Returns true if the ENV variable 'QUIET' is true.  When quiet,
       # ShellTest does not print any extra information to $stdout.
+      #
+      # If 'VERBOSE' and 'QUIET' are both set, verbose wins.
       def quiet?
-        ENV['QUIET'] == 'true'
+        return false if verbose?
+        
+        quiet = ENV['QUIET']
+        quiet && quiet =~ /^true$/i ? true : false
       end
       
       # Sets the specified ENV variables for the duration of the block.
@@ -115,11 +104,30 @@ module Tap
       #
       #   % gem install win32-open3 
       # 
-      def sh(cmd)
-        Open3.popen3(cmd) do |i,o,s|
-          yield(i,o,s) if block_given?
-          return o.read
+      def sh(cmd, options={})
+        if @notify_method_name && !quiet?
+          @notify_method_name = false
+          puts
+          puts method_name 
+        end
+        
+        original_cmd = cmd
+        if cmd_pattern = options[:cmd_pattern]
+          cmd = cmd.sub(cmd_pattern, options[:cmd].to_s)
+        end
+        
+        start = Time.now
+        result = with_env(options[:env], options[:replace_env]) do
+          IO.popen(cmd) do |io|
+            yield(io) if block_given?
+            io.read
+          end
         end
+        
+        finish = Time.now
+        elapsed = "%.3f" % [finish-start]
+        puts "  (#{elapsed}s) #{verbose? ? cmd : original_cmd}" unless quiet?
+        result
       end
       
       # Peforms a shell test.  Shell tests execute the command and yield the
@@ -171,29 +179,24 @@ module Tap
       def sh_test(cmd, options={})
         options = sh_test_options.merge(options)
         
-        unless quiet? || @shell_test_notification
-          @shell_test_notification = true
-          puts
-          puts method_name 
-        end
+        cmd, expected = cmd.lstrip.split(/^/, 2)
+        cmd.strip!
+        result = sh(cmd, options)
         
-        cmd, expected = cmd.lstrip.split(/\r?\n/, 2)
-        original_cmd = cmd
-        
-        if cmd_pattern = options[:cmd_pattern]
-          cmd = cmd.sub(cmd_pattern, options[:cmd].to_s)
-        end
+        assert_equal(expected, result, cmd) if expected
+        yield(result) if block_given?
+        result
+      end
+      
+      def sh_match(cmd, *regexps)
         
-        start = Time.now
-        result = with_env(options[:env], options[:replace_env]) do
-          sh(cmd)
+        options = regexps.last.kind_of?(Hash) ? regexps.pop : {}
+        options = sh_test_options.merge(options)
+        result = sh(cmd, options)
+
+        regexps.each do |regexp|
+          assert_match regexp, result, cmd
         end
-        finish = Time.now
-        
-        elapsed = "%.3f" % [finish-start]
-        puts "  (#{elapsed}s) #{verbose? ? cmd : original_cmd}" unless quiet?
-        
-        assert_equal(expected, result, cmd) if expected
         yield(result) if block_given?
         result
       end
@@ -203,6 +206,51 @@ module Tap
       def sh_test_options
         self.class.sh_test_options
       end
+      
+      def assert_output_equal(a, b, msg=nil)
+        a = a[1..-1] if a[0] == ?\n
+        if a == b
+          assert true
+        else
+          flunk %Q{
+#{msg}
+==================== expected output ====================
+#{whitespace_escape(a)}
+======================== but was ========================
+#{whitespace_escape(b)}
+=========================================================
+}
+        end
+      end
+
+      def assert_alike(a, b, msg=nil)
+        if b =~ a
+          assert true
+        else
+          flunk %Q{
+#{msg}
+================= expected output like ==================
+#{whitespace_escape(a)}
+======================== but was ========================
+#{whitespace_escape(b)}
+=========================================================
+}
+        end
+      end
+      
+      private
+      
+      def whitespace_escape(str)
+        str.to_s.gsub(/\s/) do |match|
+          case match
+          when "\n" then "\\n\n"
+          when "\t" then "\\t"
+          when "\r" then "\\r"
+          when "\f" then "\\f"
+          else match
+          end
+        end
+      end
     end
   end
 end

data/lib/tap/test/shell_test/class_methods.rb

@@ -9,7 +9,10 @@ module Tap
         
         # Returns a hash of the default sh_test options.
         def sh_test_options
-          @sh_test_options ||= {}
+          @sh_test_options ||= {
+            :cmd_pattern => '% ',
+            :cmd => '2>&1 '
+          }
         end
 
         private

data/lib/tap/test/shell_test/regexp_escape.rb

@@ -0,0 +1,88 @@
+module Tap
+  module Test
+    module ShellTest
+      # RegexpEscape is a subclass of regexp that escapes all but the text in a
+      # special escape sequence.  This allows the creation of complex regexps
+      # to match, for instance, console output.
+      #
+      # The RegexpEscape.escape (or equivalently the quote) method does the
+      # work; all regexp-active characters are escaped except for characters
+      # enclosed by ':.' and '.:' delimiters.
+      #
+      #   RegexpEscape.escape('reg[exp]+ chars. are(quoted)')       # => 'reg\[exp\]\+\ chars\.\ are\(quoted\)'
+      #   RegexpEscape.escape('these are not: :.a(b*)c.:')          # => 'these\ are\ not:\ a(b*)c'
+      #
+      # In addition, all-period regexps are automatically upgraded to '.*?';
+      # use the '.{n}' notation to specify n arbitrary characters.
+      #
+      #   RegexpEscape.escape('_:..:_:...:_:....:')        # => '_.*?_.*?_.*?'
+      #   RegexpEscape.escape(':..{1}.:')                  # => '.{1}'
+      #
+      # RegexpEscape instances are initialized using the escaped input string
+      # and return the original string upon to_s.
+      #
+      #   str = %q{
+      #   a multiline
+      #   :...:
+      #   example}
+      #   r = RegexpEscape.new(str)
+      #
+      #   r =~ %q{
+      #   a multiline
+      #   matching
+      #   example}  # => true
+      #
+      #   r !~ %q{
+      #   a failing multiline
+      #   example}  # => true
+      #
+      #   r.to_s    # => str
+      #
+      class RegexpEscape < Regexp
+      
+        # matches the escape sequence
+        ESCAPE_SEQUENCE = /:\..*?\.:/
+      
+        class << self
+      
+          # Escapes regexp-active characters in str, except for character
+          # delimited by ':.' and '.:'.  See the class description for
+          # details.
+          def escape(str)
+            substituents = []
+            str.scan(ESCAPE_SEQUENCE) do
+              regexp_str = $&[2...-2]
+              regexp_str = ".*?" if regexp_str =~ /^\.*$/
+              substituents << regexp_str
+            end
+            substituents << ""
+
+            splits = str.split(ESCAPE_SEQUENCE).collect do |split|
+              super(split)
+            end
+            splits << "" if splits.empty?
+          
+            splits.zip(substituents).to_a.flatten.join
+          end
+        
+          # Same as escape.
+          def quote(str)
+            escape(str)
+          end
+        end
+      
+        # Generates a new RegexpEscape by escaping the str, using the same
+        # options as Regexp.
+        def initialize(str, *options)
+          super(RegexpEscape.escape(str), *options)
+          @original_str = str
+        end
+      
+        # Returns the original string for self
+        def to_s
+          @original_str
+        end
+      end
+    end
+  end
+end

data/lib/tap/test/subset_test.rb

@@ -173,7 +173,7 @@ module Tap
       #
       def subset_test(type, skip=type[0..0].downcase)
         type = type.upcase
-        if run_subset?(type) || ENV[type]
+        if run_subset?(type) || ENV["#{type}_TEST"]
           if match_regexp?("#{type}_TEST", name.to_s)
             yield
           else

data/lib/tap/test/tap_test.rb

@@ -3,18 +3,26 @@ require 'tap/app'
 module Tap
   module Test
     
-    # Simply sets up and tears down Tap::App.instance so that tests that
-    # instantiate classes will not inadvertently smush over into one another.
+    # Sets up and tears down Tap::App.instance.  This prevents tests that modify
+    # either from inadvertently conflicting with one another.
     module TapTest
       
       # The test specific app
       attr_reader :app
-
+      
       def setup
         super
-        @app = Tap::App.instance = Tap::App.new(:debug => true, :quiet => true)
+        Tap::App.instance = @app = Tap::App.new(app_config)
       end
-
+      
+      def env_config
+        {:gems => :none, :root => @method_root || Dir.pwd}
+      end
+      
+      def app_config
+        {:debug => true, :quiet => true, :env => Tap::Env.new(env_config)}
+      end
+      
       def teardown
         Tap::App.instance = nil
         super

data/lib/tap/test/version.rb

@@ -0,0 +1,9 @@
+module Tap
+  module Test
+    MAJOR = 0
+    MINOR = 3
+    TINY = 0
+
+    VERSION="#{MAJOR}.#{MINOR}.#{TINY}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap-test
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -06:00
+date: 2009-12-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.0
+        version: 0.19.0
     version: 
 description: 
 email: simon.a.chiang@gmail.com
@@ -38,17 +38,21 @@ files:
 - lib/tap/test/file_test/class_methods.rb
 - lib/tap/test/shell_test.rb
 - lib/tap/test/shell_test/class_methods.rb
+- lib/tap/test/shell_test/regexp_escape.rb
 - lib/tap/test/subset_test.rb
 - lib/tap/test/subset_test/class_methods.rb
 - lib/tap/test/tap_test.rb
 - lib/tap/test/unit.rb
 - lib/tap/test/utils.rb
+- lib/tap/test/version.rb
 - tap.yml
 - History
 - README
 - MIT-LICENSE
 has_rdoc: true
 homepage: http://tap.rubyforge.org/tap-test/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -74,9 +78,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tap
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Test modules for Tap
 test_files: []