taski 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46cb1222487f928c10241827374311ed65541773bd1cd6d40d8fd2e6ea8af64e
-  data.tar.gz: c16aad068cef227130a8051fd71c8847845212dc3f990ae706b2d1b10104a9d6
+  metadata.gz: 537249ee49e056c8841cc1c4d4061eccf7be201b3690a197af8d5a5b65939173
+  data.tar.gz: f012517341ea31b2e36f4a87e51ab199cb24d70d7ba10519653a2d290c78dcaf
 SHA512:
-  metadata.gz: a37a616b526c7c67811286e2c50dd5319c9ce98779f4edf495f6337c214c9f0915b46694f4b8edfd5a8a6b7f66ce9fb9d946ffd36cf0be2f2a4991452875a765
-  data.tar.gz: ff577241138a18dcf8018c4c0c68ea8137301e33bfa6b31d58e564862eeb8f520a9120c755aa0c6acf61b5c1f18b71bb728dd785627ee278c3c6eee08d31dc30
+  metadata.gz: e15871fa35cf862eae794b823ab760adcd1ca1156cb23b0d27d705e8c5fb0ddfa3f2dd17859f7d238a6f0e9dbf558bedf5148330ffbf239a7291f3c99b037e07
+  data.tar.gz: d1ca33867403c337c2d1638acae3a2fd47ca77a707e7df2b6076d8c22c8d289ceae73ba6e4f1f30d413c784c30f999d60648a270c3b49a398e3144d85fd63837

data/lib/taski/section.rb

@@ -9,6 +9,13 @@ module Taski
       def interfaces(*interface_methods)
         exports(*interface_methods)
       end
+
+      # Section does not have static dependencies for execution.
+      # The impl method is called at runtime to determine the actual implementation.
+      # Static dependencies (impl candidates) are only used for tree display and circular detection.
+      def cached_dependencies
+        Set.new
+      end
     end
 
     def run

data/lib/taski/static_analysis/analyzer.rb

@@ -6,8 +6,17 @@ require_relative "visitor"
 module Taski
   module StaticAnalysis
     class Analyzer
+      # Analyzes a task class and returns its static dependencies.
+      # For Task: dependencies detected from run method (SomeTask.method calls)
+      # For Section: impl candidates detected from impl method (constants returned)
+      #
+      # Static dependencies are used for:
+      # - Tree display visualization
+      # - Circular dependency detection
+      # - Task execution (for Task only; Section resolves impl at runtime)
+      #
       # @param task_class [Class] The task class to analyze
-      # @return [Set<Class>] Set of task classes that are dependencies
+      # @return [Set<Class>] Set of task classes that are static dependencies
       def self.analyze(task_class)
         target_method = target_method_for(task_class)
         source_location = extract_method_location(task_class, target_method)

data/lib/taski/static_analysis/visitor.rb

@@ -7,6 +7,8 @@ module Taski
     class Visitor < Prism::Visitor
       attr_reader :dependencies
 
+      # @param target_task_class [Class] The task class to analyze
+      # @param target_method [Symbol] The method name to analyze (:run or :impl)
       def initialize(target_task_class, target_method = :run)
         super()
         @target_task_class = target_task_class
@@ -40,12 +42,14 @@ module Taski
       end
 
       def visit_constant_read_node(node)
-        detect_return_constant(node) if @in_target_method && @target_method == :impl
+        # For Section.impl, detect constants as impl candidates (static dependencies)
+        detect_impl_candidate(node) if in_impl_method?
         super
       end
 
       def visit_constant_path_node(node)
-        detect_return_constant(node) if @in_target_method && @target_method == :impl
+        # For Section.impl, detect constants as impl candidates (static dependencies)
+        detect_impl_candidate(node) if in_impl_method?
         super
       end
 
@@ -66,6 +70,15 @@ module Taski
         node.slice
       end
 
+      def in_impl_method?
+        @in_target_method && @target_method == :impl
+      end
+
+      def detect_impl_candidate(node)
+        constant_name = node.slice
+        resolve_and_add_dependency(constant_name)
+      end
+
       def detect_task_dependency(node)
         return unless node.receiver
 
@@ -73,11 +86,6 @@ module Taski
         resolve_and_add_dependency(constant_name) if constant_name
       end
 
-      def detect_return_constant(node)
-        constant_name = node.slice
-        resolve_and_add_dependency(constant_name)
-      end
-
       def extract_receiver_constant(receiver)
         case receiver
         when Prism::ConstantReadNode, Prism::ConstantPathNode

data/lib/taski/task.rb

@@ -71,7 +71,7 @@ module Taski
       end
 
       def tree
-        build_tree(self, "", Set.new, false)
+        build_tree(self, "", {}, false)
       end
 
       private
@@ -86,28 +86,41 @@ module Taski
         name: "\e[1m"        # bold
       }.freeze
 
-      def build_tree(task_class, prefix, visited, is_impl)
+      def build_tree(task_class, prefix, task_index_map, is_impl, ancestors = Set.new)
         type_label = colored_type_label(task_class)
         impl_prefix = is_impl ? "#{COLORS[:impl]}[impl]#{COLORS[:reset]} " : ""
+        task_number = get_task_number(task_class, task_index_map)
         name = "#{COLORS[:name]}#{task_class.name}#{COLORS[:reset]}"
-        result = "#{impl_prefix}#{name} #{type_label}\n"
-        return result if visited.include?(task_class)
 
-        visited.add(task_class)
-        dependencies = task_class.cached_dependencies.to_a
+        # Detect circular reference
+        if ancestors.include?(task_class)
+          circular_marker = "#{COLORS[:impl]}(circular)#{COLORS[:reset]}"
+          return "#{impl_prefix}#{task_number} #{name} #{type_label} #{circular_marker}\n"
+        end
+
+        result = "#{impl_prefix}#{task_number} #{name} #{type_label}\n"
+
+        # Register task number if not already registered
+        task_index_map[task_class] = task_index_map.size + 1 unless task_index_map.key?(task_class)
+
+        # Add to ancestors for circular detection
+        new_ancestors = ancestors + [task_class]
+
+        # Use static analysis to include Section.impl candidates for visualization
+        dependencies = StaticAnalysis::Analyzer.analyze(task_class).to_a
         is_section = section_class?(task_class)
 
         dependencies.each_with_index do |dep, index|
           is_last = (index == dependencies.size - 1)
-          result += format_dependency_branch(dep, prefix, is_last, visited, is_section)
+          result += format_dependency_branch(dep, prefix, is_last, task_index_map, is_section, new_ancestors)
         end
 
         result
       end
 
-      def format_dependency_branch(dep, prefix, is_last, visited, is_impl)
+      def format_dependency_branch(dep, prefix, is_last, task_index_map, is_impl, ancestors)
         connector, extension = tree_connector_chars(is_last)
-        dep_tree = build_tree(dep, "#{prefix}#{extension}", visited, is_impl)
+        dep_tree = build_tree(dep, "#{prefix}#{extension}", task_index_map, is_impl, ancestors)
 
         result = "#{prefix}#{COLORS[:tree]}#{connector}#{COLORS[:reset]}"
         lines = dep_tree.lines
@@ -124,6 +137,11 @@ module Taski
         end
       end
 
+      def get_task_number(task_class, task_index_map)
+        number = task_index_map[task_class] || (task_index_map.size + 1)
+        "#{COLORS[:tree]}[#{number}]#{COLORS[:reset]}"
+      end
+
       def colored_type_label(klass)
         if section_class?(klass)
           "#{COLORS[:section]}(Section)#{COLORS[:reset]}"

data/lib/taski/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Taski
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taski
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - ahogappa