pocky 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bd82c4180bd9152f53dcf8dcfa2e0cdb54f93211f926823c62572b9c98c7bf
-  data.tar.gz: 759e6fe70c7981b6342957da759754833c275d086bf4c2b7caab6e4406cf6bf5
+  metadata.gz: 22de5def074e1cb08bee99280a266ea9ebcf29056ae4dd117f75682e2e3d3221
+  data.tar.gz: 7c8258dbf32e3c30099e7d3b4f7d5b7404c7d28348163b7b9a5f51671b490e2c
 SHA512:
-  metadata.gz: d7db906a22cfd1c05fca50101bc0f5c896c6d3ade27cb998a7ab0e6218094a420577a0bd59a67bc41c851007bd73590735b4251e6ed60cff79ef41532572e8c8
-  data.tar.gz: 2a8078b50d6d0f0fd46ae1269b18f2602d5f69487ac431400d122b4bcddf4415457cd2b695483eda803c3117f80a4b52d5c2c78221406fdbc156bae6b1530dcd
+  metadata.gz: e659f0fd8a2a3c0f4a6c9e0bc195ae7493a0b27d774996c533cedce3898a20d14d7f703a9c6f6715e290175c02435519ddfa486ca6ce506d5ac38d97017f7f80
+  data.tar.gz: a67332ec4f9dc8503b4267fef328a8d98eb0894bd90554867c3b6f299eba35a898f1e42560c190adf94e4748d182bf16b016fccf0636bb1b28c2e6e44edb4432

data/README.md

@@ -6,12 +6,11 @@ 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
   filename: 'packwerk-viz.png', # Name of output file
   dpi: 150                     # 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,11 @@ require 'yaml'
 require 'ruby-graphviz'
 
 module Pocky
+  class InvalidRootPathError < StandardError
+  end
+
   class Packwerk
+    REFERENCE_FILE_NAME = 'deprecated_references.yml'
     MAX_EDGE_WIDTH = 5
 
     def self.generate(params)
@@ -15,13 +19,13 @@ module Pocky
     def initialize(
       root_path:,
       default_package: 'Default',
-      package_prefix: '',
       filename: 'packwerk-viz.png',
       dpi: 150
     )
-      @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 = {}
@@ -29,7 +33,7 @@ module Pocky
     end
 
     def generate
-      load_package_dependencies
+      load_package_references
       build_directed_graph
     end
 
@@ -61,33 +65,35 @@ 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 package_references
+      @package_references ||= @root_paths.flat_map do |path|
+        Dir["#{path}/**/#{REFERENCE_FILE_NAME}"]
       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 load_package_references
+      if package_references.empty?
+        raise InvalidRootPathError, "Cannot find any #{REFERENCE_FILE_NAME} in provided root_path"
+      end
+
+      package_references.each do |filename|
+        package = parse_package_name(filename)
+        @deprecated_references[package] ||= YAML.load_file(filename) || {}
       end
     end
 
-    def deprecated_references_file_for(package)
-      File.join(@root_path, package, 'deprecated_references.yml')
+    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 = package_references.find do |ref|
+        ref.match(/#{name}\/#{REFERENCE_FILE_NAME}$/)
+      end
+
+      parse_package_name(reference_filename)
     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] 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.6.0"
+  VERSION = "1.7.0"
 end

metadata

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