danger-packwerk 0.2.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e6b4d9d18458e1ac591a9679d82f6ec6840e8f7b971792134610270a1697777
-  data.tar.gz: c8a1833019c24d48d8c5c5d55d36d1730a88f33effa0b10bdc63d7c7d470d70e
+  metadata.gz: ed0f4ec91fc454370224df9823a43b198bbb3172fa996ac426975bf28d5e5cd8
+  data.tar.gz: '0398f5c8ed12c82a0ed23b32e055463bac58a9797800c5aac1f115afa8bf811a'
 SHA512:
-  metadata.gz: e4268804f4def280f10829d6c7832401f26cd1952ca72f92bf3cff9322f188ad03907711c9c3ee6798c852fd8e73f7b6bc1af0ce57a9adc94cf211f7565372b6
-  data.tar.gz: a70daaaa5deca67092e24f5e4923909371f143cdb82081e7c068f4668cfb205290b870448aa9634fb3c74612c11fad28bcd387b1d61c215e8401e3a06abcc207
+  metadata.gz: 1b20096b8a326a153832e24d73ddf4beab32220c65b035d44ca6ac2baa8f0bb043bcacba294e710c1000934d936410f59f61a7547fe304edd094cfb26f32fbc0
+  data.tar.gz: e1948eab25e12d87c03ef56054c8a981ca6e92ded648f05b0c38b28495d12ac5808cf6c453949f4f3d453ae79862bf5acb740e974f1146fac383144d41d59469

data/lib/danger-packwerk/basic_reference_offense.rb

@@ -37,12 +37,15 @@ module DangerPackwerk
     const :class_name, String
     const :file, String
     const :to_package_name, String
+    const :from_package_name, String
     const :type, String
     const :file_location, Location
 
     sig { params(deprecated_references_yml: String).returns(T::Array[BasicReferenceOffense]) }
     def self.from(deprecated_references_yml)
       deprecated_references_yml_pathname = Pathname.new(deprecated_references_yml)
+
+      from_package_name = T.must(ParsePackwerk.package_from_path(deprecated_references_yml_pathname)).name
       violations = Private::DeprecatedReferences.from(deprecated_references_yml_pathname).violations
 
       # See the larger comment below for more information on why we need this information.
@@ -106,7 +109,8 @@ module DangerPackwerk
             file: file,
             to_package_name: violation.to_package_name,
             type: violation.type,
-            file_location: file_location
+            file_location: file_location,
+            from_package_name: from_package_name
           )
         end
       end

data/lib/danger-packwerk/danger_deprecated_references_yml_changes.rb

@@ -45,7 +45,14 @@ module DangerPackwerk
 
       current_comment_count = 0
 
-      violation_diff.added_violations.group_by(&:class_name).each do |_class_name, violations|
+      # The format for git.renamed_files is a T::Array[{after: "some/path/new", before: "some/path/old"}]
+      renamed_files = git.renamed_files.map { |before_after_file| before_after_file[:after] }
+
+      violations_to_comment_on = violation_diff.added_violations.reject do |violation|
+        renamed_files.include?(violation.file)
+      end
+
+      violations_to_comment_on.group_by(&:class_name).each do |_class_name, violations|
         break if current_comment_count >= max_comments
 
         location = T.must(violations.first).file_location

data/lib/danger-packwerk/danger_packwerk.rb

@@ -3,6 +3,7 @@
 
 require 'danger'
 require 'packwerk'
+require 'parse_packwerk'
 require 'sorbet-runtime'
 require 'danger-packwerk/packwerk_wrapper'
 
@@ -23,13 +24,23 @@ module DangerPackwerk
     DEFAULT_FAIL = false
     DEFAULT_FAILURE_MESSAGE = 'Packwerk violations were detected! Please resolve them to unblock the build.'
 
+    class CommentGroupingStrategy < ::T::Enum
+      enums do
+        PerConstantPerLocation = new
+        PerConstantPerPack = new
+      end
+    end
+
+    PerConstantPerPackGrouping = CommentGroupingStrategy::PerConstantPerPack
+
     sig do
       params(
         max_comments: Integer,
         offenses_formatter: OffensesFormatter,
         fail_build: T::Boolean,
         failure_message: String,
-        on_failure: OnFailure
+        on_failure: OnFailure,
+        grouping_strategy: CommentGroupingStrategy
       ).void
     end
     def check(
@@ -37,7 +48,8 @@ module DangerPackwerk
       offenses_formatter: DEFAULT_OFFENSES_FORMATTER,
       fail_build: DEFAULT_FAIL,
       failure_message: DEFAULT_FAILURE_MESSAGE,
-      on_failure: DEFAULT_ON_FAILURE
+      on_failure: DEFAULT_ON_FAILURE,
+      grouping_strategy: CommentGroupingStrategy::PerConstantPerLocation
     )
       # This is important because by default, Danger will leave a concantenated list of all its messages if it can't find a commentable place in the
       # diff to leave its message. This is an especially bad UX because it will be a huge wall of text not connected to the source of the issue.
@@ -75,11 +87,21 @@ module DangerPackwerk
       # We group by the constant name, line number, and reference path. Any offenses with these same values should only differ on what type of violation
       # they are (privacy or dependency). We put privacy and dependency violation messages in the same comment since they would occur on the same line.
       packwerk_reference_offenses.group_by do |packwerk_reference_offense|
-        [
-          packwerk_reference_offense.reference.constant.name,
-          packwerk_reference_offense.location.line,
-          packwerk_reference_offense.reference.relative_path
-        ]
+        case grouping_strategy
+        when CommentGroupingStrategy::PerConstantPerLocation
+          [
+            packwerk_reference_offense.reference.constant.name,
+            packwerk_reference_offense.location.line,
+            packwerk_reference_offense.reference.relative_path
+          ]
+        when CommentGroupingStrategy::PerConstantPerPack
+          [
+            packwerk_reference_offense.reference.constant.name,
+            ParsePackwerk.package_from_path(packwerk_reference_offense.reference.relative_path)
+          ]
+        else
+          T.absurd(grouping_strategy)
+        end
       end.each do |_group, unique_packwerk_reference_offenses|
         break if current_comment_count >= max_comments
 

data/lib/danger-packwerk/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module DangerPackwerk
-  VERSION = '0.2.3'
+  VERSION = '0.5.0'
 end

data/sorbet/rbi/gems/parse_packwerk@0.12.0.rbi

@@ -0,0 +1,146 @@
+# typed: true
+
+# DO NOT EDIT MANUALLY
+# This is an autogenerated file for types exported from the `parse_packwerk` gem.
+# Please instead update this file by running `bin/tapioca gem parse_packwerk`.
+
+module ParsePackwerk
+  class << self
+    sig { returns(T::Array[::ParsePackwerk::Package]) }
+    def all; end
+
+    sig { void }
+    def bust_cache!; end
+
+    sig { params(name: ::String).returns(T.nilable(::ParsePackwerk::Package)) }
+    def find(name); end
+
+    sig { params(file_path: T.any(::Pathname, ::String)).returns(T.nilable(::ParsePackwerk::Package)) }
+    def package_from_path(file_path); end
+
+    sig { params(package: ::ParsePackwerk::Package).void }
+    def write_package_yml!(package); end
+
+    sig { returns(::ParsePackwerk::Configuration) }
+    def yml; end
+
+    private
+
+    sig { returns(T::Hash[::String, ::ParsePackwerk::Package]) }
+    def packages_by_name; end
+  end
+end
+
+class ParsePackwerk::Configuration < ::T::Struct
+  const :exclude, T::Array[::String]
+  const :package_paths, T::Array[::String]
+
+  class << self
+    sig { params(config_hash: T::Hash[T.untyped, T.untyped]).returns(T::Array[::String]) }
+    def excludes(config_hash); end
+
+    sig { returns(::ParsePackwerk::Configuration) }
+    def fetch; end
+
+    def inherited(s); end
+
+    sig { params(config_hash: T::Hash[T.untyped, T.untyped]).returns(T::Array[::String]) }
+    def package_paths(config_hash); end
+  end
+end
+
+ParsePackwerk::DEFAULT_EXCLUDE_GLOBS = T.let(T.unsafe(nil), Array)
+ParsePackwerk::DEFAULT_PACKAGE_PATHS = T.let(T.unsafe(nil), Array)
+ParsePackwerk::DEPENDENCIES = T.let(T.unsafe(nil), String)
+ParsePackwerk::DEPRECATED_REFERENCES_YML_NAME = T.let(T.unsafe(nil), String)
+
+class ParsePackwerk::DeprecatedReferences < ::T::Struct
+  const :pathname, ::Pathname
+  const :violations, T::Array[::ParsePackwerk::Violation]
+
+  class << self
+    sig { params(package: ::ParsePackwerk::Package).returns(::ParsePackwerk::DeprecatedReferences) }
+    def for(package); end
+
+    sig { params(pathname: ::Pathname).returns(::ParsePackwerk::DeprecatedReferences) }
+    def from(pathname); end
+
+    def inherited(s); end
+  end
+end
+
+ParsePackwerk::ENFORCE_DEPENDENCIES = T.let(T.unsafe(nil), String)
+ParsePackwerk::ENFORCE_PRIVACY = T.let(T.unsafe(nil), String)
+ParsePackwerk::METADATA = T.let(T.unsafe(nil), String)
+ParsePackwerk::MetadataYmlType = T.type_alias { T::Hash[T.untyped, T.untyped] }
+
+class ParsePackwerk::MissingConfiguration < ::StandardError
+  sig { params(packwerk_file_name: ::Pathname).void }
+  def initialize(packwerk_file_name); end
+end
+
+ParsePackwerk::PACKAGE_YML_NAME = T.let(T.unsafe(nil), String)
+ParsePackwerk::PACKWERK_YML_NAME = T.let(T.unsafe(nil), String)
+
+class ParsePackwerk::Package < ::T::Struct
+  const :dependencies, T::Array[::String]
+  const :enforce_dependencies, T::Boolean
+  const :enforce_privacy, T::Boolean
+  const :metadata, T::Hash[T.untyped, T.untyped]
+  const :name, ::String
+
+  sig { returns(::Pathname) }
+  def directory; end
+
+  sig { returns(T::Boolean) }
+  def enforces_dependencies?; end
+
+  sig { returns(T::Boolean) }
+  def enforces_privacy?; end
+
+  sig { returns(::Pathname) }
+  def yml; end
+
+  class << self
+    sig { params(pathname: ::Pathname).returns(::ParsePackwerk::Package) }
+    def from(pathname); end
+
+    def inherited(s); end
+  end
+end
+
+class ParsePackwerk::PackageSet
+  class << self
+    sig do
+      params(
+        package_pathspec: T::Array[::String],
+        exclude_pathspec: T::Array[::String]
+      ).returns(T::Array[::ParsePackwerk::Package])
+    end
+    def from(package_pathspec:, exclude_pathspec:); end
+
+    private
+
+    sig { params(globs: T::Array[::String], path: ::Pathname).returns(T::Boolean) }
+    def exclude_path?(globs, path); end
+  end
+end
+
+ParsePackwerk::ROOT_PACKAGE_NAME = T.let(T.unsafe(nil), String)
+
+class ParsePackwerk::Violation < ::T::Struct
+  const :class_name, ::String
+  const :files, T::Array[::String]
+  const :to_package_name, ::String
+  const :type, ::String
+
+  sig { returns(T::Boolean) }
+  def dependency?; end
+
+  sig { returns(T::Boolean) }
+  def privacy?; end
+
+  class << self
+    def inherited(s); end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-packwerk
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parse_packwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -186,15 +200,16 @@ files:
 - sorbet/config
 - sorbet/rbi/gems/danger@8.5.0.rbi
 - sorbet/rbi/gems/packwerk@1.3.2.rbi
+- sorbet/rbi/gems/parse_packwerk@0.12.0.rbi
 - sorbet/rbi/todo.rbi
 - sorbet/tapioca/require.rb
-homepage: https://github.com/bigrails/danger-packwerk
+homepage: https://github.com/rubyatscale/danger-packwerk
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/bigrails/danger-packwerk
-  source_code_uri: https://github.com/bigrails/danger-packwerk
-  changelog_uri: https://github.com/bigrails/danger-packwerk/releases
+  homepage_uri: https://github.com/rubyatscale/danger-packwerk
+  source_code_uri: https://github.com/rubyatscale/danger-packwerk
+  changelog_uri: https://github.com/rubyatscale/danger-packwerk/releases
   allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []