bahuvrihi-tap 0.10.7 → 0.10.8

data/lib/tap/tasks/load.rb

@@ -7,18 +7,105 @@ module Tap
     # used as a gateway task to other tasks.
     #
     #   % tap run -- load FILEPATH --: [task]
-    #
-    class Load < Tap::Task
-
-      def process(input)
+    #
+    # Load can select items from Hash or Array objects using one or
+    # more keys when only a subset is desired.  By default items are
+    # selected using [].  For more flexible selection, use match.
+    # 
+    # Match converts each of the keys to a Regexp.  For hashes, all
+    # values with a matching key will be selected.  For arrays, any
+    # item matching a regexp will be selected.
+    #
+    # Use the flags to flatten, compact, sort (etc) results before
+    # passing them on to the next task.
+    class Load < Tap::Task
+      
+      config :match, false, :short => :m, &c.switch      # match keys
+      config :flatten, false, :short => :f, &c.switch    # flatten results
+      config :compact, false, :short => :c, &c.switch    # compact results
+      config :unique, false, :short => :u, &c.switch     # uniq results
+      config :sort, false, :short => :s, &c.switch       # sort results
+      #config :preview, false, :short => :p, &c.switch    # logs result
+      
+      # Loads the input as YAML and selects objects using keys.  Input may
+      # be an IO, StringIO, or a filepath.  If keys are empty, the loaded
+      # object is returned directly.
+      #
+      # ==== Key Selection
+      # Keys select items from the loaded object using [] (ie obj[key]).
+      # If match==true, the behavior is different; each string key is
+      # converted into a Regexp and then arrays select items that match
+      # key:
+      #
+      #   results = []
+      #   array.each {|i| results << i if i =~ key}
+      #
+      # While hashes select values where the key matches key:
+      #
+      #   results = []
+      #   hash.each_pair {|k,v| results << v if k =~ key}
+      #
+      # Other objects raise an error when match is true.  
+      #
+      # ==== Post Processing
+      # After loading/key selection, the results may be processed (in this
+      # order) using flatten, compact, unique, and sort, each performing as
+      # you would expect.  
+      # 
+      def process(input, *keys)
+        
+        # load the input
         obj = case input
-        when StringIO then YAML.load(input.read)
+        when StringIO, IO
+          YAML.load(input.read)
         else
           log :load, input
           YAML.load_file(input)
-        end
-        
-        obj.values.flatten
+        end
+        
+        # select results by key
+        results = case
+        when keys.empty? then obj
+        when match 
+          regexps = keys.collect {|key| Regexp.new(key.to_s) }
+          select_matching(obj, regexps)
+        else 
+          keys.collect do |key| 
+            index = key.kind_of?(String) ? YAML.load(key) : key
+            obj[index]
+          end
+        end
+        
+        # post-process results
+        results = results.flatten if flatten
+        results = results.compact if compact
+        results = results.uniq if unique
+        results = results.sort if sort
+        
+        #if preview
+          # should be a log or something
+          #puts results.inspect
+        #end
+        
+        results
+      end
+      
+      protected
+      
+      # selects items from obj which match one of the regexps.
+      def select_matching(obj, regexps) # :nodoc:
+        case obj
+        when Array
+          obj.select {|item| regexps.any? {|r| item =~ r} }
+        when Hash
+          results = []
+          obj.each_pair do |key, value|
+            results << value if regexps.any? {|r| key =~ r}
+          end
+          results
+        else
+          raise ArgumentError, "cannot match keys from a #{obj.class}"
+        end
       end
     end 
   end

data/lib/tap/test/extensions.rb

@@ -8,7 +8,8 @@ module Tap
     autoload(:FileTest, 'tap/test/file_test')
     autoload(:TapTest, 'tap/test/tap_test')
     autoload(:ScriptTest, 'tap/test/script_test')
-
+    autoload(:Utils, 'tap/test/utils')
+    
     module Extensions
       def acts_as_subset_test
         include Tap::Test::SubsetTest

data/lib/tap/test/script_tester.rb

@@ -16,6 +16,8 @@ module Tap
       
       attr_reader :stepwise, :run_block
       
+      NIL_VALIDATION = lambda {|*args|}
+      
       def initialize(command_path=nil, stepwise=false, &run_block)
         @command_path = command_path
         @commands = []
@@ -50,7 +52,7 @@ module Tap
       end
       
       def time(msg, command)
-        run([command, msg, nil, nil])
+        run([command, msg, nil, NIL_VALIDATION])
       end
       
       def check(msg, command, use_regexp_escapes=true, &validation)
@@ -75,6 +77,10 @@ module Tap
       
       def run(*commands)
         commands.each_with_index do |(cmd, msg, expected, validation), i|
+          unless expected || validation
+            raise ArgumentError, "no expectation or validation set for: #{cmd}"
+          end
+          
           start = Time.now
           result = capture_sh(cmd) {|ok, status, tempfile_path| }
           elapsed = Time.now - start

data/template/index.erb

@@ -1,42 +1,49 @@
+<% env_names = {} %>
+<% env.manifest(:envs, true).minimize.each do |name, environment| %>
+<%   env_names[environment] = name %>
+<% end %>
 <html>
 <head>
-	<title>Tap::Manifest</title>
+  <title>Tap::Manifest</title>
 </head>
 <body>
-	<h1><a href="<%= Tap::WEBSITE %>">Tap (<ins>T</ins>ask <ins>Ap</ins>plication) <%= Tap::VERSION %> </a></h1>
-
-<% server.manifest(:envs, true).minimize.each do |(env_key, env)|
-	 cgi_manifest = env.manifest(:cgis, true).minimize
-	 task_manifest = env.manifest(:tasks, true).minimize 
-	 next if cgi_manifest.empty? && task_manifest.empty? %>
-	<h2><%= env_key %></h2>
 
-	<% unless cgi_manifest.empty? %>
-	<ul>
-		<% cgi_manifest.each do |(cgi_key, path)| 
-			lazydoc = Tap::Support::Lazydoc[path] 
-			lazydoc.resolve
-			summary = lazydoc.default_attributes['summary']
-			%>	
-		<li><a href="<%= cgi_key %>"><%= cgi_key %></a>: <%= summary %></li>
-		<% end %>
-	</ul>
-	<% end %>
+<div id="branding">
+  <h1><a href="<%= Tap::WEBSITE %>">Tap (<ins>T</ins>ask <ins>Ap</ins>plication) <%= Tap::VERSION %> </a></h1>
+</div>
 
-	<% unless task_manifest.empty? %>
-	<ul>
-		<% task_manifest.each do |(task_key, const)| 
-			lazydoc = Tap::Support::Lazydoc[const.require_path] 
-			lazydoc.resolve
-			summary = lazydoc[const.name]['manifest']
-			summary = summary.subject if summary.kind_of?(Tap::Support::Comment)
-			%>	
-		<li><a href="run?task=<%= task_key %>"><%= const.name %></a> <%= summary %></li>
-		<% end %>
-	</ul>
-	<% end %>
+<div id="content_main">
+<dl id="envs" class="manifest">
+<% env.each do |current| %>
+  <dt class="key"><%= env_names[current] %> (<%= current.root.root %>)</dt>
+  <dd class="value">
+<%   manifest_keys = (Tap::Env.manifests.keys + current.manifests.keys).uniq %>
+<%   manifest_keys -= [:envs] %>
+<%   manifest_keys.each do |key| %>
+<%     manifest = current.manifest(key, true) %>
+<%     next if manifest.empty? %>
+    <dl id="manifests" class="manifest">
+    <dt class="key"><%= key %></dt>
+    <dd class="value">
+      <ol>
+<%     manifest.each do |(name, path)| %>
+<%       path = path.kind_of?(Tap::Support::Constant) ? path.require_path : path %>
+        <li><%= name %> (<%= current.root.relative_filepath(:root, path) || path %>)</li>
+<%     end %>
+      </ol>
+    </dd>
+    </dl>
+<%   end %>
+  </dd>
 <% end %>
+  </dl>
+</div>
+
+<div id="nav">
+  <ul>
+    <li><a href="index?refresh=true">Refresh</a></li>
+  </ul>
+</div>
 
-	<a href="index?refresh=true">Refresh</a>
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bahuvrihi-tap
 version: !ruby/object:Gem::Version 
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-10-09 00:00:00 -07:00
 default_executable: tap
 dependencies: []
 
@@ -24,9 +24,10 @@ extra_rdoc_files:
 - README
 - MIT-LICENSE
 - History
-- doc/Tutorial
 - doc/Class Reference
 - doc/Command Reference
+- doc/Syntax Reference
+- doc/Tutorial
 files: 
 - cgi/run.rb
 - cmd/console.rb
@@ -59,6 +60,8 @@ files:
 - 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/root/root_generator.rb
 - lib/tap/generator/generators/root/templates/README
 - lib/tap/generator/generators/root/templates/Rakefile
@@ -66,20 +69,12 @@ files:
 - 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/root/templates/test/tapfile_test.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/patches/rake/rake_test_loader.rb
-- lib/tap/patches/rake/testtask.rb
-- lib/tap/patches/ruby19/backtrace_filter.rb
-- lib/tap/patches/ruby19/parsedate.rb
 - lib/tap/root.rb
-- lib/tap/spec.rb
-- lib/tap/spec/adapter.rb
-- lib/tap/spec/inheritable_class_test_root.rb
 - lib/tap/support/aggregator.rb
 - lib/tap/support/assignments.rb
 - lib/tap/support/audit.rb
@@ -89,14 +84,16 @@ files:
 - lib/tap/support/configurable_class.rb
 - lib/tap/support/configuration.rb
 - lib/tap/support/constant.rb
-- lib/tap/support/constant_utils.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/rack.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
@@ -108,17 +105,19 @@ files:
 - 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
 - lib/tap/support/parser.rb
 - 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/summary.rb
 - lib/tap/support/templater.rb
 - lib/tap/support/validation.rb
 - lib/tap/support/versions.rb
@@ -146,6 +145,7 @@ files:
 - README
 - MIT-LICENSE
 - History
+- doc/Syntax Reference
 has_rdoc: true
 homepage: http://tap.rubyforge.org
 post_install_message: 

data/lib/tap/generator/generators/root/templates/test/tapfile_test.rb

@@ -1,15 +0,0 @@
-require File.dirname(__FILE__) + '/tap_test_helper.rb'
-require File.dirname(__FILE__) + '/../tapfile.rb'
-
-class TapfileTest < Test::Unit::TestCase
-  acts_as_tap_test
-  
-  def test_goodnight
-    task = Goodnight.new :message => "goodnight"
-    
-    # a simple test
-    assert_equal({:message  => 'goodnight'}, task.config)
-    assert_equal "goodnight moon", task.process("moon")
-  end
-  
-end

data/lib/tap/patches/rake/rake_test_loader.rb

@@ -1,8 +0,0 @@
-# this is the same code as in rake/rake_test_loader.rb
-# except it duplicates ARGV before iterating over it.
-#
-# This prevents an error in Ruby 1.9 when one of the 
-# loaded files attempts to modify ARGV.  In that case
-# you get an error like: 'can't modify array during 
-# iteration (RuntimeError)'
-ARGV.dup.each { |f| load f unless f =~ /^-/  }

data/lib/tap/patches/rake/testtask.rb

@@ -1,57 +0,0 @@
-# NO idea why this prevents an error with @ruby_opts=nil,
-# or even how @ruby_opts could be nil, on ruby 1.9 with
-# rake test and tdoc.  It does, though.
-require 'pp'
-
-module Rake # :nodoc:
-
-  class TestTask < TaskLib # :nodoc:
-    
-    # Patch for TestTask#define in 'rake\testtask.rb'
-    #
-    # This patch lets you specify Windows-style paths in lib 
-    # (ie with spaces and slashes) and to do something like:
-    #
-    #   Rake::TestTask.new(:test) do |t|
-    #     t.libs = $:  << 'lib'
-    #   end
-    #
-    # Using this patch you can specify additional load paths 
-    # for the test from the command line using --lib-dir
-    #
-    def define
-      lib_opt = @libs.collect {|f| "-I\"#{File.expand_path(f)}\""}.join(' ')
-      desc "Run tests" + (@name==:test ? "" : " for #{@name}")
-      task @name do
-        run_code = ''
-        RakeFileUtils.verbose(@verbose) do
-          run_code =
-            case @loader
-            when :direct
-              "-e 'ARGV.each{|f| load f}'"
-            when :testrb
-              "-S testrb #{fix}"
-            when :rake
-              rake_loader
-            end
-          @ruby_opts.unshift(lib_opt)
-          @ruby_opts.unshift( "-w" ) if @warning
-          ruby @ruby_opts.join(" ") +
-            " \"#{run_code}\" " +
-            file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
-            " #{option_list}"
-        end
-      end
-      self
-    end
-    
-    # Loads in the patched rake_test_loader to avoid the ARGV 
-    # modification error, which arises within TDoc.
-    #--
-    # May be out of date...
-    def rake_loader # :nodoc:
-      File.expand_path(File.join(File.dirname(__FILE__), 'rake_test_loader.rb'))
-    end
-  end
-  
-end

data/lib/tap/patches/ruby19/backtrace_filter.rb

@@ -1,51 +0,0 @@
-module Test
-  module Unit
-    module Util # :nodoc:
-      module BacktraceFilter # :nodoc:
-        
-        if method_defined?(:filter_backtrace)
-          alias :tap_original_filter_backtrace :filter_backtrace
-        end
-        
-        # This is a slightly-modified version of the default BacktraceFilter
-        # provided in the Ruby 1.9 distribution.  It solves the issue documented
-        # below, and hopefully will not be necessary when Ruby 1.9 is stable.
-        #
-        def filter_backtrace(backtrace, prefix=nil)
-          return ["No backtrace"] unless(backtrace)
-          split_p = if(prefix)
-            prefix.split(TESTUNIT_FILE_SEPARATORS)
-          else
-            TESTUNIT_PREFIX
-          end
-          match = proc do |e|
-            split_e = e.split(TESTUNIT_FILE_SEPARATORS)[0, split_p.size]
-            next false unless(split_e[0..-2] == split_p[0..-2])
-            split_e[-1].sub(TESTUNIT_RB_FILE, '') == split_p[-1]
-          end
-          
-          # The Ruby 1.9 issue is that sometimes backtrace is a String
-          # and String is no longer Enumerable (hence it doesn't respond
-          # respond to detect).  Arrayify to solve.
-          backtrace = [backtrace] unless backtrace.kind_of?(Array)
-          
-          return backtrace unless(backtrace.detect(&match))
-          found_prefix = false
-          new_backtrace = backtrace.reverse.reject do |e|
-            if(match[e])
-              found_prefix = true
-              true
-            elsif(found_prefix)
-              false
-            else
-              true
-            end
-          end.reverse
-          new_backtrace = (new_backtrace.empty? ? backtrace : new_backtrace)
-          new_backtrace = new_backtrace.reject(&match)
-          new_backtrace.empty? ? backtrace : new_backtrace
-        end
-      end
-    end
-  end
-end