teapot 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742147841aebb1df987a75d2ffefcb764d9d42f6faf5492bdd273c62a8e195ce
-  data.tar.gz: 11c7a76cfe57be54d9a5864b2e0d7eb821ab780c4128df78ca09e555599c7dca
+  metadata.gz: 6fb45edfbd49bfea6e78038ec74bd4473be5a2f716edd0391907acf66d5a740c
+  data.tar.gz: 61012b133dc05dbd9fd5e240964313f387592361e08394c2602c024606f65d48
 SHA512:
-  metadata.gz: '001587e6eca1be37e6697b2b603208afe8d5685b14a8364603325d9aa24af9c2af3a12effec6bf0f9513731cffd05d7ec76125333d3fa3fd9a76e9cf66467749'
-  data.tar.gz: 503bd6ed1aba820ce830b5e856468b9d990b179e2f2da32c7d1985a314f1e6ff48a54d8a0883a1352b7dd30380e51c951e2fdbf234d716926033700208f88b3a
+  metadata.gz: d1dfddcdc2485c1911367892d4be722a74c2aa2a5f2cc0943ad9b914896ec648b1276d8582cf4225f2ff864c8f8c7a5a9f1fff134c10bb1407abaae7c8ee933c
+  data.tar.gz: 39c8e42658208e0499fd22b0951e75218725622bcf83690b3290f230f1e5e7c710a6f0db1776036bd2b51b4108fc3ee9eef9b1ac8e65566385ba1677449204dd

data/lib/teapot/command/build.rb

@@ -20,6 +20,7 @@ module Teapot
 			options do
 				option "-j/-l/--limit <n>", "Limit the build to <n> concurrent processes.", type: Integer
 				option "-c/--continuous", "Run the build graph continually (experimental)."
+				option "--show-dependencies", "Show task dependencies for debugging."
 			end
 			
 			many :targets, "Build these targets, or use them to help the dependency resolution process."
@@ -40,8 +41,8 @@ module Teapot
 				chain = selection.chain
 				environment = context.configuration.environment
 				
-				controller = ::Build::Controller.new(limit: @options[:limit]) do |controller|
-					controller.add_chain(chain, self.argv, environment)
+				controller = ::Build::Controller.build(limit: @options[:limit]) do |builder|
+					builder.add_chain(chain, self.argv, environment)
 				end
 				
 				walker = nil
@@ -49,7 +50,7 @@ module Teapot
 				# We need to catch interrupt here, and exit with the correct exit code:
 				begin
 					controller.run do |walker|
-						# show_dependencies(walker)
+						show_dependencies(walker) if @options[:show_dependencies]
 						
 						# Only run once is asked:
 						unless @options[:continuous]

data/lib/teapot/command/visualize.rb

@@ -3,56 +3,174 @@
 # Released under the MIT License.
 # Copyright, 2017-2026, by Samuel Williams.
 
+require "samovar"
 require_relative "selection"
-require "graphviz"
+require "build/controller"
 
 module Teapot
 	module Command
-		# A command to visualize the dependency graph.
-		class Visualize < Selection
-			self.description = "Generate a picture of the dependency graph."
+		# A command to visualize dependency graphs.
+		class Visualize < Samovar::Command
+			self.description = "Generate visualizations of package and target dependencies."
 			
-			options do
-				option "-o/--output-path <path>", "The output path for the visualization.", default: "dependency.svg"
-				option "-d/--dependency-name <name>", "Show the partial chain for the given named dependency."
-			end
-			
-			# Get the dependency names to visualize.
-			# @returns [Array(String)] The dependency names.
-			def dependency_names
-				@targets || []
-			end
-			
-			# Get the specific dependency name to visualize.
-			# @returns [String | Nil] The dependency name.
-			def dependency_name
-				@options[:dependency_name]
+			# Visualize package-level dependencies.
+			class Packages < Selection
+				self.description = "Visualize package-level dependencies from configuration.require."
+				
+				options do
+					option "-o/--output-path <path>", "The output path for the visualization."
+					option "-d/--dependency-name <name>", "Show the partial chain for the given named dependency."
+				end
+				
+				# Get the specific dependency name to visualize.
+				# @returns [String | Nil] The dependency name.
+				def dependency_name
+					@options[:dependency_name]
+				end
+				
+				# Process and generate the package dependency visualization.
+				# @parameter selection [Select] The selection to visualize.
+				# @returns [String] The generated Mermaid diagram.
+				def process(selection)
+					chain = selection.chain
+					
+					if dependency_name
+						provider = selection.dependencies[dependency_name]
+						chain = chain.partial(provider)
+					end
+					
+					visualization = ::Build::Dependency::Visualization.new
+					diagram = visualization.generate(chain)
+					
+					if output_path = @options[:output_path]
+						File.write(output_path, diagram)
+					else
+						$stdout.puts diagram
+					end
+					
+					return diagram
+				end
 			end
 			
-			# Process and generate the visualization.
-			# @parameter selection [Select] The selection to visualize.
-			# @returns [Graphviz::Graph] The generated graph.
-			def process(selection)
-				context = selection.context
-				chain = selection.chain
+			# Visualize target-level dependencies.
+			class Targets < Selection
+				self.description = "Visualize target-level dependencies from target.depends."
 				
-				if dependency_name
-					provider = selection.dependencies[dependency_name]
+				options do
+					option "-o/--output-path <path>", "The output path for the visualization."
+				end
+				
+				# Process and generate the target dependency visualization.
+				# @parameter selection [Select] The selection to visualize.
+				# @returns [String] The generated Mermaid diagram.
+				def process(selection)
+					lines = ["flowchart LR"]
+					lines << ""
+					
+					# Build the graph from all targets in the selection
+					# The selection contains all targets loaded from packages
+					selection.targets.each do |name, target|
+						target.dependencies.each do |dependency|
+							dependency_name = dependency.name.to_s
+							
+							# Create edge from target to its dependency
+							if dependency.private?
+								lines << "    #{sanitize_id(name)}[#{name}] -.-> #{sanitize_id(dependency_name)}[#{dependency_name}]"
+							else
+								lines << "    #{sanitize_id(name)}[#{name}] --> #{sanitize_id(dependency_name)}[#{dependency_name}]"
+							end
+						end
+					end
+					
+					diagram = lines.join("\n")
 					
-					chain = chain.partial(provider)
+					if output_path = @options[:output_path]
+						File.write(output_path, diagram)
+					else
+						$stdout.puts diagram
+					end
+					
+					return diagram
 				end
 				
-				visualization = ::Build::Dependency::Visualization.new
+				private
 				
-				graph = visualization.generate(chain)
+				# Convert a name to a valid Mermaid node ID.
+				# @parameter name [String] The name to sanitize.
+				# @returns [String] A sanitized identifier safe for use in Mermaid diagrams.
+				def sanitize_id(name)
+					name.to_s.gsub(/[^a-zA-Z0-9_]/, "_")
+				end
+			end
+			
+			# Visualize file-level dependencies from the build graph.
+			class Files < Selection
+				self.description = "Visualize file-level dependencies by walking the build graph."
 				
-				if output_path = @options[:output_path]
-					Graphviz.output(graph, path: output_path, format: :svg)
-				else
-					$stdout.puts graph.to_dot
+				options do
+					option "-o/--output-path <path>", "The output path for the visualization."
 				end
 				
-				return graph
+				# Process and generate the file dependency visualization.
+				# @parameter selection [Select] The selection to visualize.
+				# @returns [String] The generated Mermaid diagram.
+				def process(selection)
+					require "build/graph/walker"
+					require "build/graph/visualization"
+					
+					context = selection.context
+					chain = selection.chain
+					environment = context.configuration.environment
+					
+					# Build the controller to get the root nodes
+					controller = ::Build::Controller.build(limit: 1) do |builder|
+						builder.add_chain(chain, [], environment)
+					end
+					
+					# Create a process group for task execution
+					group = ::Process::Group.new
+					
+					# Create a walker that traverses without building
+					walker = ::Build::Graph::Walker.new do |walker, node, parent_task = nil|
+						task_class = node.task_class(parent_task) || ::Build::Graph::Task
+						task = task_class.new(walker, node, group)
+						
+						# Use traverse instead of visit to skip building:
+						task.traverse
+					end
+					
+					# Populate the walker by traversing from the root nodes
+					walker.update(controller.nodes)
+					
+					# Generate the Mermaid diagram
+					visualization = ::Build::Graph::Visualization.new
+					diagram = visualization.generate(walker)
+					
+					if output_path = @options[:output_path]
+						File.write(output_path, diagram)
+					else
+						$stdout.puts diagram
+					end
+					
+					return diagram
+				end
+			end
+			
+			nested :command, {
+				"packages" => Packages,
+				"targets" => Targets,
+				"files" => Files,
+			}, default: "packages"
+			
+			# Delegate context to parent Top command.
+			# @returns [Context] The project context.
+			def context
+				parent.context
+			end
+			
+			# Execute the visualize command.
+			def call
+				@command.call
 			end
 		end
 	end

data/lib/teapot/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Teapot
-	VERSION = "3.6.1"
+	VERSION = "3.7.0"
 end

data/readme.md

@@ -25,6 +25,10 @@ Please see the [project documentation](https://ioquatix.github.io/teapot/) for m
 
 Please see the [project releases](https://ioquatix.github.io/teapot/releases/index) for all releases.
 
+### v3.7.0
+
+  - `teapot visualize` has two new sub-commands: `packages` and `targets`. The former visualizes the dependency graph of packages, while the latter visualizes the dependency graph of targets. Both sub-commands output Mermaid diagrams, which can be rendered using Mermaid Live Editor or other Mermaid-compatible tools.
+
 ### v3.6.0
 
   - Update dependencies.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v3.7.0
+
+  - `teapot visualize` has two new sub-commands: `packages` and `targets`. The former visualizes the dependency graph of packages, while the latter visualizes the dependency graph of targets. Both sub-commands output Mermaid diagrams, which can be rendered using Mermaid Live Editor or other Mermaid-compatible tools.
+
 ## v3.6.0
 
   - Update dependencies.

data.tar.gz.sig

@@ -1,2 +1,2 @@
-��L7�D��%jl$�Ω��"ϊYҟ��Wn~V�o�:�����9r�vE&i���.�Ue�\���D	�
-��%?�7�9Eѷx	�33��(\��K~y�!��`I�6����E��\$���|f���XO��Exq���곊(�9�!��i;R�N�*��…��.)c�+:�R�s�f�/#��)���1�V[�R�t����^�\
+CVfm��{˽�����b���Zq*3b!�s�_ߗ���_�
+]>���A�M��`a楿�S}:$�_�a*'=����+yO�3$|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: build-dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: build-environment
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: build-graph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: build-text
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Teapot is a tool for managing cross-platform builds.
 test_files: []