bahuvrihi-tap 0.10.3 → 0.10.4

data/lib/tap/support/templater.rb

@@ -65,7 +65,7 @@ module Tap
       	#   {'key' => 'value'}.to_yaml           # => "--- \nkey: value\n"
       	#   yamlize {'key' => 'value'}           # => "key: value"
         def yamlize(object)
-        	object.to_yaml[5...-1]
+          object == nil ? "~" : object.to_yaml[4...-1].strip
         end
         
         # Nest the return of the block in the nesting lines.

data/lib/tap/task.rb

@@ -179,6 +179,8 @@ module Tap
         super
       end
       
+      # Returns an instance of self; the instance is a kind of 'global'
+      # instance used in class-level dependencies.  See depends_on.
       def instance
         @instance ||= new
       end
@@ -216,8 +218,7 @@ module Tap
         #
         # Register documentation
         #
-        
-        const_name = current == Object ? subclass_const : "#{current}::#{subclass_const}"
+        const_name = subclass.to_s
         caller.each_with_index do |line, index|
           case line
           when /\/tap\/support\/declarations.rb/ then next
@@ -334,6 +335,9 @@ module Tap
         Tap::Support::Templater.new(DEFAULT_HELP_TEMPLATE, :task_class => self).build
       end
       
+      # Sets a class-level dependency.  When task class B depends_on another task 
+      # class A, instances of B are initialized to depend on A.instance, with the
+      # specified arguments.  Returns self.
       def depends_on(dependency_class, *args)
         unless dependency_class.respond_to?(:instance)
           raise ArgumentError, "dependency_class does not respond to instance: #{dependency_class}"
@@ -349,6 +353,7 @@ module Tap
 
         define_method(name) do
           index = Support::Executable.index(dependency_class.instance, args)
+          Support::Executable.resolve([index])
           Support::Executable.results[index]._current
         end
         
@@ -394,8 +399,8 @@ module Tap
       end
       
       def define_dependencies(dependencies)
-        dependencies.each do |name, dependency_class, *args|
-          dependency(name, dependency_class, *args)
+        dependencies.each do |name, dependency_class, args|
+          dependency(name, dependency_class, *(args ? args : []))
         end if dependencies
       end
       
@@ -435,7 +440,6 @@ module Tap
       @task_block = (task_block == nil ? default_task_block : task_block)
       
       @_method_name = :execute
-      @multithread = false
       @on_complete_block = nil
       @dependencies = []
       
@@ -468,9 +472,39 @@ module Tap
       app.queue.enq(self, inputs)
     end
 
-    batch_function :enq, :multithread=
+    batch_function :enq
     batch_function(:on_complete) {}
     
+    # Convenience method, equivalent to:
+    #   self.app.sequence([self] + tasks)
+    def sequence(*tasks)
+      app.sequence([self] + tasks)
+    end
+    
+    # Convenience method, equivalent to:
+    #   self.app.fork(self, targets)
+    def fork(*targets)
+      app.fork(self, targets)
+    end
+    
+    # Convenience method, equivalent to:
+    #   self.app.merge(self, sources)
+    def merge(*sources)
+      app.merge(self, sources)
+    end
+    
+    # Convenience method, equivalent to:
+    #   self.app.sync_merge(self, sources)
+    def sync_merge(*sources)
+      app.sync_merge(self, sources)
+    end
+    
+    # Convenience method, equivalent to:
+    #   self.app.switch(self, targets, &block)
+    def switch(*targets, &block)
+      app.switch(self, targets, &block)
+    end
+
     # Executes self with the given inputs.  Execute provides hooks for subclasses
     # to insert standard execution code: before_execute, on_execute_error,
     # and after_execute.  Override any/all of these methods as needed.
@@ -549,6 +583,12 @@ module Tap
       name.to_s
     end
     
+    # Provides an abbreviated version of the default inspect, with only
+    # the task class, object_id, name, and configurations listed.
+    def inspect
+      "#<#{self.class.to_s}:#{object_id} #{name} #{config.to_hash.inspect} >"
+    end
+    
     protected
     
     # Hook to set a default task block.  By default, nil.

data/lib/tap/test/tap_methods.rb

@@ -148,6 +148,7 @@ module Tap
         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

data/template/index.erb

@@ -28,7 +28,8 @@
 		<% task_manifest.each do |(task_key, const)| 
 			lazydoc = Tap::Support::Lazydoc[const.require_path] 
 			lazydoc.resolve
-			summary = lazydoc[const.name]['manifest'].subject
+			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 %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bahuvrihi-tap
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors: 
 - Simon Chiang
@@ -70,6 +70,7 @@ 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/rake/rake_test_loader.rb
 - lib/tap/patches/rake/testtask.rb
 - lib/tap/patches/ruby19/backtrace_filter.rb
@@ -86,6 +87,7 @@ files:
 - 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/command_line.rb
 - lib/tap/support/comment.rb
 - lib/tap/support/configurable.rb
@@ -94,6 +96,7 @@ files:
 - lib/tap/support/constant.rb
 - lib/tap/support/constant_utils.rb
 - lib/tap/support/declarations.rb
+- lib/tap/support/dependable.rb
 - lib/tap/support/executable.rb
 - lib/tap/support/executable_queue.rb
 - lib/tap/support/gems/rake.rb
@@ -104,9 +107,7 @@ files:
 - lib/tap/support/lazydoc.rb
 - lib/tap/support/manifest.rb
 - lib/tap/support/parsers/base.rb
-- lib/tap/support/parsers/command_line.rb
 - lib/tap/support/parsers/server.rb
-- lib/tap/support/run_error.rb
 - lib/tap/support/shell_utils.rb
 - lib/tap/support/tdoc.rb
 - lib/tap/support/tdoc/tdoc_html_generator.rb

data/lib/tap/support/parsers/command_line.rb

@@ -1,90 +0,0 @@
-require 'tap/support/parsers/base'
-
-module Tap
-  module Support
-    module Parsers
-      class CommandLine < Base
-        class << self
-          def parse_sequence(str, count=0)
-             seq = []
-             seq << count if str[0] == ?:
-             str.split(/:+/).each do |n| 
-               seq << n.to_i unless n.empty?
-             end
-             seq << count + 1 if str[-1] == ?:
-             [seq.shift, seq]
-          end
-          
-          def pairs_regexp(l, r)
-            /\A--(\d*)#{Regexp.escape(l)}([\d,]*)#{Regexp.escape(r)}\z/
-          end
-          
-          def parse_pairs(lead, str, count=0)
-             bracket = []
-             str.split(/,+/).each do |n| 
-               bracket << n.to_i unless n.empty?
-             end
-
-             [lead.empty? ? count : lead.to_i, bracket]
-          end
-        end
-        
-        ROUND = /\A--(\+(\d+)|\+*)\z/
-        SEQUENCE = /\A--(\d*(:\d*)+)\z/
-        FORK = pairs_regexp("[", "]")
-        MERGE = pairs_regexp("{", "}")
-        SYNC_MERGE = pairs_regexp("(", ")")
-        INVALID =  /\A--(\z|[^A-Za-z])/
-        
-        def initialize(argv)
-          @sequences = []
-          @forks = []
-          @merges = []
-          @sync_merges = []
-          
-          current = []
-          current_round = []
-          @argvs = []
-          @rounds = [current_round]
-          
-          argv.each do |arg|
-            unless arg =~ INVALID
-              current << arg
-              next
-            end
-            
-            # for peformance split to match
-            # most arguments just once.
-            unless current.empty?
-              current_round << @argvs.length
-              @argvs << current
-              current = []
-            end
-
-            case arg
-            when ROUND
-              current_round = (@rounds[$2 ? $2.to_i : $1.length] ||= [])
-            when SEQUENCE
-              @sequences << CommandLine.parse_sequence($1, @argvs.length-1)
-            when FORK
-              @forks << CommandLine.parse_pairs($1, $2, @argvs.length-1)
-            when MERGE
-              @merges << CommandLine.parse_pairs($1, $2, @argvs.length-1)
-            when SYNC_MERGE
-              @sync_merges << CommandLine.parse_pairs($1, $2, @argvs.length-1)
-            else 
-              raise ArgumentError, "invalid argument: #{arg}"
-            end
-          end
-          
-          unless current.empty?
-            current_round << @argvs.length
-            @argvs << current
-          end
-          @rounds.delete_if {|round| round.nil? || round.empty? }
-        end
-        
-      end
-    end
-  end
-end

data/lib/tap/support/run_error.rb

@@ -1,39 +0,0 @@
-module Tap
-  module Support
-    # Raised when an exception is raised during App#run.  All errors generated during
-    # termination are collected into the RunError.
-    class RunError < RuntimeError
-      attr_reader :errors
-  
-      def initialize(errors)
-        @errors = errors
-        @backtrace = nil
-      end
-      
-      #The join of all the error messages.
-      def message
-        lines = []
-        errors.each_with_index do |error, i| 
-          lines << "\nRunError [#{i}] #{error.class} #{error.message}"
-        end
-        lines.join + "\n"
-      end
-      
-      #The join of all the error backtraces.
-      def backtrace
-        # backtrace gets called every time RunError is re-raised, leading to multiple
-        # repeats of the error backtraces.  This ensures the additional backtrace 
-        # information is only added once.
-        return @backtrace unless @backtrace == nil
-        return nil unless @backtrace = super
-        
-        errors.each_with_index do |error, i| 
-          @backtrace [-1] += "\n\n---------------------- RunError [#{i}] ----------------------\n#{error.class} #{error.message}"
-          @backtrace.concat(error.backtrace ||  ["missing backtrace"])
-        end
-        @backtrace
-      end
-    
-    end
-  end
-end