Consolidate project into single GraphViz module

Changelog.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Changed package to consolidate everything into a single `GraphViz` module.
+  #18 by @mattt.
+
 ## [0.3.0] - 2021-03-29
 
 ### Changed

Package.swift

@@ -22,21 +22,9 @@ let package = Package(
         ]),
         .target(
             name: "GraphViz",
-            dependencies: ["Core", "DOT", "Builder", "Tools"]),
-        .target(
-            name: "Core",
-            dependencies: []),
-        .target(
-            name: "DOT",
-            dependencies: ["Core"]),
-        .target(
-            name: "Builder",
-            dependencies: ["Core"]),
-        .target(
-            name: "Tools",
-            dependencies: ["Core", "DOT", "Clibgraphviz"]),
+            dependencies: ["Clibgraphviz"]),
         .testTarget(
             name: "GraphVizTests",
-            dependencies: ["Core", "DOT", "Builder", "Tools"]),
+            dependencies: ["GraphViz"]),
     ]
 )

README.md

@@ -8,7 +8,7 @@ A Swift package for working with [GraphViz][graphviz].
 ## Requirements
 
 - Swift 5.2+
-- GraphViz _(only for rendering)_
+- GraphViz
 
 ## Usage
 
@@ -69,6 +69,18 @@ let graph = Graph(directed: true) {
 
 ## Installation
 
+### System Dependencies
+
+You can install GraphViz on your system by running the following command:
+
+```terminal
+# macOS
+$ brew install graphviz
+
+# Linux (Ubuntu)
+$ sudo apt-get install graphviz
+```
+
 ### Swift Package Manager
 
 Add the GraphViz package to your target dependencies in `Package.swift`:
@@ -96,19 +108,6 @@ targets: [
     dependencies: ["GraphViz"]),
 ```
 
-To render graphs to SVG, PNG, and other formats,
-you must have GraphViz executables (e.g. `dot`) installed on your system
-and accessible from `$PATH`.
-You can install GraphViz from the command line:
-
-```terminal
-# macOS
-$ brew install graphviz
-
-# Linux (Ubuntu)
-$ sudo apt-get install graphviz
-```
-
 ## License
 
 MIT

Sources/Builder/Extensions/Edge+Extensions.swift → Sources/GraphViz/Builder/Extensions/Edge+Extensions.swift

@@ -1,5 +1,3 @@
-import Core
-
 extension Edge {
     public subscript<T>(dynamicMember member: WritableKeyPath<Attributes, T>) -> (T) -> Self {
         get {

Sources/Builder/Extensions/Graph+Extensions.swift → Sources/GraphViz/Builder/Extensions/Graph+Extensions.swift

@@ -1,5 +1,3 @@
-import Core
-
 extension Graph {
     typealias Fragment = GraphBuilder.Fragment
 

Sources/Builder/Extensions/Node+Extensions.swift → Sources/GraphViz/Builder/Extensions/Node+Extensions.swift

@@ -1,5 +1,3 @@
-import Core
-
 extension Node {
     public subscript<T>(dynamicMember member: WritableKeyPath<Attributes, T>) -> (T) -> Self {
         get {

Sources/Builder/Extensions/Subgraph+Extensions.swift → Sources/GraphViz/Builder/Extensions/Subgraph+Extensions.swift

@@ -1,5 +1,3 @@
-import Core
-
 extension Subgraph {
     typealias Fragment = SubgraphBuilder.Fragment
 

Sources/Builder/GraphBuilder.swift → Sources/GraphViz/Builder/GraphBuilder.swift

@@ -1,5 +1,3 @@
-import Core
-
 public protocol GraphMember {}
 
 extension Subgraph: GraphMember {}

Sources/Builder/Operators/BackwardEdgeOperator.swift → Sources/GraphViz/Builder/Operators/BackwardEdgeOperator.swift

@@ -1,5 +1,3 @@
-import Core
-
 infix operator <-- : AdditionPrecedence
 
 extension Node {

Sources/Builder/Operators/BidirectionalEdgeOperator.swift → Sources/GraphViz/Builder/Operators/BidirectionalEdgeOperator.swift

@@ -1,5 +1,3 @@
-import Core
-
 infix operator <-> : AdditionPrecedence
 
 extension Node {

Sources/Builder/Operators/ForwardEdgeOperator.swift → Sources/GraphViz/Builder/Operators/ForwardEdgeOperator.swift

@@ -1,5 +1,3 @@
-import Core
-
 infix operator --> : AdditionPrecedence
 
 extension Node {

Sources/Builder/Operators/UndirectedEdgeOperator.swift → Sources/GraphViz/Builder/Operators/UndirectedEdgeOperator.swift

@@ -1,5 +1,3 @@
-import Core
-
 infix operator --- : AdditionPrecedence
 
 extension Node {

Sources/Builder/SubgraphBuilder.swift → Sources/GraphViz/Builder/SubgraphBuilder.swift

@@ -1,5 +1,3 @@
-import Core
-
 public protocol SubgraphMember {}
 
 extension Node: SubgraphMember {}

Sources/DOT/DOTEncoder.swift → Sources/GraphViz/DOT/DOTEncoder.swift

@@ -1,5 +1,3 @@
-import Core
-
 /// Creates DOT language representations of GraphViz graphs.
 ///
 /// For more information about the DOT language,

Sources/DOT/DOTRepresentable.swift → Sources/GraphViz/DOT/DOTRepresentable.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Core
 
 protocol DOTRepresentable {
     func representation(in graph: Graph) -> String?

Sources/Tools/Extensions/Graph+Rendering.swift → Sources/GraphViz/Tools/Extensions/Graph+Rendering.swift

@@ -1,8 +1,6 @@
 import Foundation
 import Dispatch
 
-import Core
-
 extension Graph {
     /**
      Renders the graph using the specified layout algorithm to the desired output format.

Sources/Tools/Renderer.swift → Sources/GraphViz/Tools/Renderer.swift

@@ -1,8 +1,6 @@
 import Foundation
 import Dispatch
 
-import Core
-import DOT
 import Clibgraphviz
 
 /**

Tests/GraphVizTests/AttributesTest.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import Core
+@testable import GraphViz
 
 final class AttributesTests: XCTestCase {
     func testGraphAttributesCompleteness() {

Tests/GraphVizTests/EdgeTests.swift

@@ -1,6 +1,5 @@
 import XCTest
-import Core
-@testable import DOT
+@testable import GraphViz
 
 final class EdgeTests: XCTestCase {
     let encoder = DOTEncoder()

Tests/GraphVizTests/GraphBuilderTests.swift

@@ -1,7 +1,5 @@
 import XCTest
-import Core
-import DOT
-@testable import Builder
+@testable import GraphViz
 
 // Workaround for "error: ambiguous reference to member '-->'" on Swift 5.1
 #if swift(>=5.2)

Tests/GraphVizTests/GraphTests.swift

@@ -1,6 +1,5 @@
 import XCTest
-import Core
-import DOT
+@testable import GraphViz
 
 final class GraphTests: XCTestCase {
     let encoder = DOTEncoder()

Tests/GraphVizTests/NodeTests.swift

@@ -1,6 +1,5 @@
 import XCTest
-import Core
-@testable import DOT
+@testable import GraphViz
 
 final class NodeTests: XCTestCase {
     let encoder = DOTEncoder()

Tests/GraphVizTests/RenderingTests.swift

@@ -1,7 +1,5 @@
 import XCTest
-@testable import Core
-@testable import DOT
-@testable import Tools
+@testable import GraphViz
 
 final class RenderingTests: XCTestCase {
     let encoder = DOTEncoder()

Tests/GraphVizTests/SubgraphBuilderTests.swift

@@ -1,7 +1,5 @@
 import XCTest
-import Core
-@testable import DOT
-@testable import Builder
+@testable import GraphViz
 
 // Workaround for "error: ambiguous reference to member '-->'" on Swift 5.1
 #if swift(>=5.2)

Tests/GraphVizTests/SubgraphTests.swift

@@ -1,6 +1,5 @@
 import XCTest
-import Core
-@testable import DOT
+@testable import GraphViz
 
 final class SubgraphTests: XCTestCase {
     let encoder = DOTEncoder()