pocky 1.5.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4006410ded2bda58a3ada5f5a9efc3e70059ec1258116a871386cc253eccfd10
-  data.tar.gz: 75315c43f9f04e9c2808dad7b762121cf5d68ce63833e2e89f07a025b91843b4
+  metadata.gz: ab45111779ec64a861557a7efeb7fefb02a255e0aa34ab791b8ae747475e7614
+  data.tar.gz: e9b23a9174780956f67ab1db2746050e94649b7a56243b8a201598e18cb49181
 SHA512:
-  metadata.gz: ce4e7c98a283881bba3c321b708a7f6488c7e230ac76ffcbeab54781f4b0ddc627d48b5bacf1a371a4b78b9fc164748c88a52266dce817652d954b1292effedc
-  data.tar.gz: ba80fe686f39a68a8c6dfc7b7129a195d6d0361182cef7f2b96a2e39fed70315dcb1eba1c6a70a2ecd34c502bb6f83b4b8b16da428436f46aab18853a7741bc4
+  metadata.gz: 29bcf083442dfe4e2267b8475fcc872a90161f6ee9a0bc4321fec130acfaad2598557ebd2084ef106ea41887a9d86de9e35c36e2c73b74690c2b4bd1f567a3ca
+  data.tar.gz: c843b24dcc15b025d7426821abfd58da27dcfdef877752e75c53b6750dce4783a618ba7a1df0125658888c6b1c688ef8fe1cd35b82a5fab522e25d754ebde013

data/README.md

@@ -6,14 +6,13 @@ Pocky generates dependency graphs for your packwerk packages. The gem is named a
 
 ## Usage
 
-Invoke from irb or code
+Invoke from irb or code, only `root_path` is required.
 ```ruby
 Pocky::Packwerk.generate(
   root_path: 'path/to/app/packages',
-  default_package: 'Default',    # The default package listed as "." in deprecated_references.yml
-  package_prefix: 'app/packages',     # this is for matching package names listed in deprecated_references.yml
+  default_package: 'app',       # The default package listed as "." in deprecated_references.yml
   filename: 'packwerk-viz.png', # Name of output file
-  dpi: 150                     # Output file resolution
+  dpi: 100                      # Output file resolution
 )
 ```
 
@@ -21,11 +20,27 @@ Pocky::Packwerk.generate(
 
 Note that the the bold edges indicate heavier dependencies.
 
-Invoke as a rake task
+Invoke as a rake task:
 
+    $ rake pocky:generate"[path/to/app/packages,Monolith,packages.png,100]"
+
+
+#### `root_path` as an array
+`root_path` can also be an array in case your packages are organized in multiple directories. Alternatively, you can also provide paths to individual packages to generate more focused graphs for your package subsystems.
+
+```ruby
+Pocky::Packwerk.generate(
+  root_path: [
+    'path/to/app/packages/a',
+    'path/to/app/packages/z',
+  ]
+)
 ```
-rake pocky:generate[path/to/app/packages,Default,app/packages,packwerk-viz.png,150]
-```
+
+Generate the same graph using the rake task:
+
+    $ rake pocky:generate"[path/to/app/packages/a path/to/app/packages/z]"
+
 
 ## Installation
 
@@ -51,7 +66,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pocky.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mquan/pocky.
 
 ## License
 

data/lib/pocky/packwerk.rb

@@ -4,7 +4,12 @@ require 'yaml'
 require 'ruby-graphviz'
 
 module Pocky
+  class InvalidRootPathError < StandardError
+  end
+
   class Packwerk
+    DEPENDENCIES_FILENAME = 'package.yml'
+    DEPRECATED_REFERENCES_FILENAME = 'deprecated_references.yml'
     MAX_EDGE_WIDTH = 5
 
     def self.generate(params)
@@ -14,44 +19,65 @@ module Pocky
     private_class_method :new
     def initialize(
       root_path:,
-      default_package: 'Default',
-      package_prefix: '',
+      default_package: 'app',
       filename: 'packwerk-viz.png',
-      dpi: 150
+      dpi: 100
     )
-      @root_path = root_path
+      @root_paths = [*root_path]
+      raise InvalidRootPathError, 'root_path is required' if @root_paths.empty?
+
       @default_package = default_package
-      @package_prefix = package_prefix
       @filename = filename
       @dpi = dpi.to_i
       @deprecated_references = {}
+      @package_dependencies = {}
       @nodes = {}
     end
 
     def generate
-      load_package_dependencies
+      load_dependencies
+      load_deprecated_references
       build_directed_graph
     end
 
     private
 
     def build_directed_graph
-      graph = GraphViz.new(:G, type: :digraph, dpi: @dpi)
-      @deprecated_references.each do |package, references|
-        @nodes[package] ||= graph.add_nodes(package)
-        references.each do |provider, dependencies|
+      @graph = GraphViz.new(:G, type: :digraph, dpi: @dpi)
+      draw_dependencies
+      draw_deprecated_references
+      @graph.output(png: @filename)
+    end
+
+    def draw_dependencies
+      @package_dependencies.each do |package, file|
+        @nodes[package] ||= @graph.add_nodes(package)
+        file['dependencies'].each do |provider|
           provider_package = package_name_for_dependency(provider)
-          @nodes[provider_package] ||= graph.add_nodes(provider_package)
+          @nodes[provider_package] ||= @graph.add_nodes(provider_package)
 
-          graph.add_edges(
-            @nodes[provider_package],
+          @graph.add_edges(
             @nodes[package],
-            penwidth: edge_width(dependencies.length)
+            @nodes[provider_package]
           )
         end
       end
+    end
 
-      graph.output(png: @filename)
+    def draw_deprecated_references
+      @deprecated_references.each do |package, references|
+        @nodes[package] ||= @graph.add_nodes(package)
+        references.each do |provider, invocations|
+          provider_package = package_name_for_dependency(provider)
+          @nodes[provider_package] ||= @graph.add_nodes(provider_package)
+
+          @graph.add_edges(
+            @nodes[package],
+            @nodes[provider_package],
+            pendwidth: edge_width(invocations.length)
+          )
+        end
+      end
     end
 
     def edge_width(count)
@@ -61,33 +87,52 @@ module Pocky
       ].min
     end
 
-    def load_package_dependencies
-      Dir.each_child(@root_path) do |elem|
-        if Dir.exist?(File.join(@root_path, elem))
-          load_deprecated_references_for_package(elem)
-        end
+    def deprecated_references_files
+      @deprecated_references_files ||= @root_paths.flat_map do |path|
+        Dir["#{path}/**/#{DEPRECATED_REFERENCES_FILENAME}"]
       end
     end
 
-    def load_deprecated_references_for_package(package)
-      @deprecated_references[package] ||= begin
-        filename = deprecated_references_file_for(package)
-        if File.exist?(filename)
-          YAML.load_file(filename) || {}
-        else
-          {}
-        end
+    def dependencies_files
+      @dependencies_files ||= @root_paths.flat_map do |path|
+        Dir["#{path}/**/#{DEPENDENCIES_FILENAME}"]
+      end
+    end
+
+    def load_dependencies
+      return if dependencies_files.empty?
+
+      dependencies_files.each do |filename|
+        package = parse_package_name(filename)
+        @package_dependencies[package] ||= YAML.load_file(filename) || {}
       end
     end
 
-    def deprecated_references_file_for(package)
-      File.join(@root_path, package, 'deprecated_references.yml')
+    def load_deprecated_references
+      return if deprecated_references_files.empty?
+
+      deprecated_references_files.each do |filename|
+        package = parse_package_name(filename)
+        @deprecated_references[package] ||= YAML.load_file(filename) || {}
+      end
+    end
+
+    def parse_package_name(filename)
+      File.basename(File.dirname(filename))
     end
 
     def package_name_for_dependency(name)
       return @default_package if name == '.'
 
-      name.gsub(@package_prefix, '').gsub(/^\//, '')
+      reference_filename = deprecated_references.find do |ref|
+        ref.match(/#{name}\/#{REFERENCE_FILE_NAME}$/)
+      end
+
+      if reference_filename
+        parse_package_name(reference_filename)
+      else
+        name
+      end
     end
   end
 end

data/lib/pocky/tasks/generate.rake

@@ -2,7 +2,9 @@ require 'pocky'
 
 namespace :pocky do
   desc 'Generate dependency graph for packwerk packages'
-  task :generate, [:root_path, :default_package, :package_prefix, :filename, :dpi]: :environment do |_task, args|
-    Pocky::Packwerk.generate(args)
+  task :generate, [:root_path, :default_package, :filename, :dpi] do |_task, args|
+    Pocky::Packwerk.generate(args.merge(
+      root_path: arg[:root_path].split(/\s+/)
+    ))
   end
 end

data/lib/pocky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pocky
-  VERSION = "1.5.0"
+  VERSION = "1.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pocky
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Quan Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz