pocky 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608e94e135cd12c4340c3b9b1987a0c8af537784
-  data.tar.gz: b2a786abb2378189cfd332d9a751c019c7efe5bd
+  metadata.gz: de11dcff9a0765101df1f14137880873958a8049
+  data.tar.gz: 17ee8cd45457cf323bc2edc65fa97863798825ca
 SHA512:
-  metadata.gz: dacdbddb1d69b2920202123a43768b87329740b2a82758f84a44cdce37d613a4f102ca440754bffce504198cf40b6976bf5807046047286152b956952211c9ff
-  data.tar.gz: dfc30c35e7a3ba4223f76c55e4466ccf1172e3631affa7a9a0e67375194289d08f1416218541147265fde427078da3580becd1a52ec5f201eff0daa7184ce8ba
+  metadata.gz: 36777289020339a7899b4d830e7dea1b3d2b4c693df77c9419c9468e358cf068343a83d872ab99d41d6989c1961041c27e05d7cb8d7a25d591f0aa26fcc99f7a
+  data.tar.gz: d68f933f49969f5c375614aea01c8f40d7802a9a90cd2fac8d8f4c789bbacf217a98c547400883baaed98f0a971b83e3bc2cf83693d23c382b76b45be5a25e93

data/lib/pocky.rb

@@ -2,6 +2,7 @@
 
 require_relative 'pocky/version'
 require_relative 'pocky/ruby_file_size'
+require_relative 'pocky/package'
 require_relative 'pocky/packwerk'
 
 module Pocky

data/lib/pocky/package.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Pocky
+  class Package
+    attr_reader :name, :dependencies, :enforce_privacy, :deprecated_references
+
+    def initialize(name:, filename: nil)
+      @name = name
+      @filename = filename
+      @dependencies = yml['dependencies'] || []
+      @enforce_privacy = yml['enforce_privacy'] || false
+      @deprecated_references = {}
+    end
+
+    def add_deprecated_references(reference_filename)
+      @deprecated_references = YAML.load_file(reference_filename) || {}
+    end
+
+    private
+
+    def yml
+      @yml ||= begin
+        if @filename
+          YAML.load_file(@filename) || {}
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/pocky/packwerk.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'yaml'
 require 'ruby-graphviz'
 
 module Pocky
-  class InvalidRootPathError < StandardError
-  end
-
   class Packwerk
     DEPENDENCIES_FILENAME = 'package.yml'
     DEPRECATED_REFERENCES_FILENAME = 'deprecated_references.yml'
@@ -35,10 +31,9 @@ module Pocky
       @default_package = default_package
       @filename = filename
       @analyze_sizes = analyze_sizes
-
       @dpi = dpi.to_i
-      @deprecated_references = {}
-      @package_dependencies = {}
+
+      @packages = {}
       @nodes = {}
 
       @node_options = {
@@ -73,54 +68,57 @@ module Pocky
       if file_size < 10
         { fontsize: 26 }
       elsif file_size < 100
-        { fontsize: 26 * 4, margin: 0.2 }
+        { fontsize: 26 * 2, margin: 0.2 }
       elsif file_size < 1000
-        { fontsize: 26 * 8, margin: 0.4 }
+        { fontsize: 26 * 4, margin: 0.4 }
       elsif file_size < 10_000
-        { fontsize: 26 * 16, margin: 0.8 }
+        { fontsize: 26 * 8, margin: 0.8 }
       else
-        { fontsize: 26 * 32, margin: 1.0 }
+        { fontsize: 26 * 16, margin: 1.0 }
       end
     end
 
     def draw_node(package)
-      package_name = package_name_for_dependency(package)
-      path = package == '.' ? @root_path : @root_path.join(package)
+      package_name = package_name_for_dependency(package.name)
+      path = package.name == '.' ? @root_path : @root_path.join(package.name)
       file_size = @analyze_sizes ? RubyFileSize.compute(path.to_s) : 1
-      @graph.add_nodes(package_name, **@node_options.merge(node_overrides(file_size)))
+      node_label = "#{package_name}#{' (Þ)' if package.enforce_privacy}"
+
+      @graph.add_nodes(
+        package_name,
+        **@node_options.merge(
+          **node_overrides(file_size),
+          label: node_label
+        )
+      )
     end
 
     def build_directed_graph
       @graph = GraphViz.new(:G, type: :digraph, dpi: @dpi)
-      draw_dependencies
-      draw_deprecated_references
+      draw_packages
       @graph.output(png: @filename)
     end
 
-    def draw_dependencies
-      @package_dependencies.each do |package, file|
-        @nodes[package] ||= draw_node(package)
-        file.each do |provider|
-          @nodes[provider] ||= draw_node(provider)
+    def draw_packages
+      @packages.each do |_name, package|
+        @nodes[package.name] ||= draw_node(package)
+
+        package.dependencies.each do |dependency|
+          @nodes[dependency] ||= draw_node(@packages[dependency])
 
           @graph.add_edges(
-            @nodes[package],
-            @nodes[provider],
+            @nodes[package.name],
+            @nodes[dependency],
             **@dependency_edge_options
           )
         end
-      end
-    end
 
-    def draw_deprecated_references
-      @deprecated_references.each do |package, references|
-        @nodes[package] ||= draw_node(package)
-        references.each do |provider, invocations|
-          @nodes[provider] ||= draw_node(provider)
+        package.deprecated_references.each do |provider_name, invocations|
+          @nodes[provider_name] ||= draw_node(@packages[provider_name])
 
           @graph.add_edges(
-            @nodes[package],
-            @nodes[provider],
+            @nodes[package.name],
+            @nodes[provider_name],
             **@deprecated_references_edge_options.merge(
               penwidth: edge_width(invocations.length),
             ),
@@ -160,11 +158,8 @@ module Pocky
       return if dependencies_files.empty?
 
       dependencies_files.each do |filename|
-        package = parse_package_name(filename)
-        @package_dependencies[package] ||= begin
-          yml = YAML.load_file(filename) || {}
-          yml['dependencies'] || []
-        end
+        package_name = parse_package_name(filename)
+        @packages[package_name] ||= Pocky::Package.new(name: package_name, filename: filename)
       end
     end
 
@@ -172,14 +167,20 @@ module Pocky
       return if deprecated_references_files.empty?
 
       deprecated_references_files.each do |filename|
-        package = parse_package_name(filename)
-        @deprecated_references[package] ||= YAML.load_file(filename) || {}
+        package_name = parse_package_name(filename)
+        @packages[package_name] ||= Pocky::Package.new(name: package_name)
+        @packages[package_name].add_deprecated_references(filename)
+
+        # Walk the references to create referenced packages
+        @packages[package_name].deprecated_references.each do |provider_name, _violations|
+          @packages[provider_name] ||= Pocky::Package.new(name: provider_name)
+        end
       end
     end
 
     def parse_package_name(filename)
       name = File.dirname(filename).gsub(@root_path.to_s, '')
-      name == '' ? @default_package : name.gsub(/^\//, '')
+      name == '' ? '.' : name.gsub(/^\//, '')
     end
 
     def package_name_for_dependency(name)

data/lib/pocky/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pocky
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Quan Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
@@ -42,6 +42,7 @@ files:
 - bin/setup
 - lib/pocky.rb
 - lib/pocky/Rakefile
+- lib/pocky/package.rb
 - lib/pocky/packwerk.rb
 - lib/pocky/railtie.rb
 - lib/pocky/ruby_file_size.rb