pocky 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a33d7a33b47a8ec7b5763188f1670934db2b63df6e16409371ec10456a06ff98
-  data.tar.gz: afe4ed9619ec1d6843fb23a92fde8ef89349650fec21abc2e584cccdd7ba9096
+  metadata.gz: ab45111779ec64a861557a7efeb7fefb02a255e0aa34ab791b8ae747475e7614
+  data.tar.gz: e9b23a9174780956f67ab1db2746050e94649b7a56243b8a201598e18cb49181
 SHA512:
-  metadata.gz: 2469169116f8afcebfd1fd41e05b6a74526c37e4abcdd78b94feae73867773fcc277192a6e8ea89ac57f35ce4608d9ec657e4b7309e59875bd11b0eb40b6bfa3
-  data.tar.gz: 6ef340611027d6ffea6044c1f03576d5b78ea1b70b2d852a9a1784c99d66d644abd07c4c71ccf58f9edeb98b7dbe42c3cb7eb2867afcc5fdf1a0ed60b692ded2
+  metadata.gz: 29bcf083442dfe4e2267b8475fcc872a90161f6ee9a0bc4321fec130acfaad2598557ebd2084ef106ea41887a9d86de9e35c36e2c73b74690c2b4bd1f567a3ca
+  data.tar.gz: c843b24dcc15b025d7426821abfd58da27dcfdef877752e75c53b6750dce4783a618ba7a1df0125658888c6b1c688ef8fe1cd35b82a5fab522e25d754ebde013

data/README.md

@@ -10,9 +10,9 @@ 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
+  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
 )
 ```
 

data/lib/pocky/packwerk.rb

@@ -8,7 +8,8 @@ module Pocky
   end
 
   class Packwerk
-    REFERENCE_FILE_NAME = 'deprecated_references.yml'
+    DEPENDENCIES_FILENAME = 'package.yml'
+    DEPRECATED_REFERENCES_FILENAME = 'deprecated_references.yml'
     MAX_EDGE_WIDTH = 5
 
     def self.generate(params)
@@ -18,9 +19,9 @@ module Pocky
     private_class_method :new
     def initialize(
       root_path:,
-      default_package: 'Default',
+      default_package: 'app',
       filename: 'packwerk-viz.png',
-      dpi: 150
+      dpi: 100
     )
       @root_paths = [*root_path]
       raise InvalidRootPathError, 'root_path is required' if @root_paths.empty?
@@ -29,33 +30,54 @@ module Pocky
       @filename = filename
       @dpi = dpi.to_i
       @deprecated_references = {}
+      @package_dependencies = {}
       @nodes = {}
     end
 
     def generate
-      load_package_references
+      load_dependencies
+      load_deprecated_references
       build_directed_graph
     end
 
     private
 
     def build_directed_graph
-      graph = GraphViz.new(:G, type: :digraph, dpi: @dpi)
+      @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)
+
+          @graph.add_edges(
+            @nodes[package],
+            @nodes[provider_package]
+          )
+        end
+      end
+    end
+
+    def draw_deprecated_references
       @deprecated_references.each do |package, references|
-        @nodes[package] ||= graph.add_nodes(package)
-        references.each do |provider, dependencies|
+        @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)
+          @nodes[provider_package] ||= @graph.add_nodes(provider_package)
 
-          graph.add_edges(
+          @graph.add_edges(
             @nodes[package],
             @nodes[provider_package],
-            penwidth: edge_width(dependencies.length)
+            pendwidth: edge_width(invocations.length)
           )
         end
       end
-
-      graph.output(png: @filename)
     end
 
     def edge_width(count)
@@ -65,18 +87,31 @@ module Pocky
       ].min
     end
 
-    def package_references
-      @package_references ||= @root_paths.flat_map do |path|
-        Dir["#{path}/**/#{REFERENCE_FILE_NAME}"]
+    def deprecated_references_files
+      @deprecated_references_files ||= @root_paths.flat_map do |path|
+        Dir["#{path}/**/#{DEPRECATED_REFERENCES_FILENAME}"]
       end
     end
 
-    def load_package_references
-      if package_references.empty?
-        raise InvalidRootPathError, "Cannot find any #{REFERENCE_FILE_NAME} in provided root_path"
+    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 load_deprecated_references
+      return if deprecated_references_files.empty?
 
-      package_references.each do |filename|
+      deprecated_references_files.each do |filename|
         package = parse_package_name(filename)
         @deprecated_references[package] ||= YAML.load_file(filename) || {}
       end
@@ -89,7 +124,7 @@ module Pocky
     def package_name_for_dependency(name)
       return @default_package if name == '.'
 
-      reference_filename = package_references.find do |ref|
+      reference_filename = deprecated_references.find do |ref|
         ref.match(/#{name}\/#{REFERENCE_FILE_NAME}$/)
       end
 

data/lib/pocky/version.rb

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

metadata

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