package_protections 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0906fd78fb0cee92c4e34663c700eda94ba7e050636cda905a8fe184e115efb1'
-  data.tar.gz: c28f5248b823d626875dc5f7ac5ee33b7a533fbb000d0f6f67e439b7aec102cd
+  metadata.gz: 7b99c93d81087956b947c89fbede35844a2c973f20e2bee3c8f474383ff99a88
+  data.tar.gz: 64ad87cf10597e5fceeefa315dd3e665f7a684ac36db30c206012c15c2a0f3f2
 SHA512:
-  metadata.gz: '00937a5119e9589c7ea323c76df2c7ed5feb3334356a99b7cb0308f469ba7af53e1cea358a74736aaf49238e5885741ffdfd54b52fc15316023cacf170bd16d4'
-  data.tar.gz: '0972c6fab2b22557de1d9e64efe882747c8088d2653869b6fad65f2a7144e012b61c3b15634c450ea375eb646cfe80f3d1bfbfd722342130a912e896eae1f6f4'
+  metadata.gz: 9a5a70b90e8ecf6a00e8b22db867e6cec3a83ba34a8fa6f18b45449c96f3eb9fd248c80f9a047d9462e2976d233c8f6b29957837feef224a94d8ce93e008a55d
+  data.tar.gz: 500e49a77a3ee17aa2c4cb05edf2806e37010b5168ebb9cf1a13e1addbb5db5eb11c0caaa82f4a10451dbf96d304c7e010400b19ba7240b920b29a4c93780a90

data/lib/package_protections/private.rb

@@ -88,27 +88,6 @@ module PackageProtections
       end
     end
 
-    sig do
-      params(
-        package_names: T::Array[String],
-        all_packages: T::Array[ParsePackwerk::Package]
-      ).returns(T::Array[ParsePackwerk::Package])
-    end
-    def self.packages_for_names(package_names, all_packages)
-      all_packages_indexed_by_name = {}
-      all_packages.each { |package| all_packages_indexed_by_name[package.name] = package }
-
-      package_names.map do |package_name|
-        clean_pack_name = package_name.gsub(%r{/$}, '')
-        package = all_packages_indexed_by_name[clean_pack_name]
-        if package.nil?
-          raise "Sorry, we couldn't find a package with name #{package_name}. Here are all of the package names we know about: #{all_packages.map(&:name).sort.inspect}"
-        end
-
-        package
-      end
-    end
-
     sig { params(root_pathname: Pathname).returns(String) }
     def self.rubocop_yml(root_pathname:)
       protected_packages = Dir.chdir(root_pathname) { all_protected_packages }

data/lib/package_protections.rb

@@ -116,16 +116,6 @@ module PackageProtections
     Private.private_cop_config(identifier)
   end
 
-  sig do
-    params(
-      package_names: T::Array[String],
-      all_packages: T::Array[ParsePackwerk::Package]
-    ).returns(T::Array[ParsePackwerk::Package])
-  end
-  def self.packages_for_names(package_names, all_packages)
-    Private.packages_for_names(package_names, all_packages)
-  end
-
   sig { void }
   def self.bust_cache!
     Private.bust_cache!

data/lib/rubocop/cop/package_protections/namespaced_under_package_name.rb

@@ -20,9 +20,7 @@ module RuboCop
           # This cop only works for files in `app`
           return if !relative_filename.include?('app/')
 
-          match = relative_filename.match(%r{((#{::PackageProtections::EXPECTED_PACK_DIRECTORIES.join("|")})/.*?)/})
-          package_name = match && match[1]
-
+          package_name = ParsePackwerk.package_from_path(relative_filename)&.name
           return if package_name.nil?
 
           return if relative_filepath.extname != '.rb'
@@ -105,7 +103,11 @@ module RuboCop
 
             # The reason for this is precondition is the `MultipleNamespacesProtection` assumes this to work properly.
             # To remove this precondition, we need to modify `MultipleNamespacesProtection` to be more generalized!
-            if ::PackageProtections::EXPECTED_PACK_DIRECTORIES.include?(Pathname.new(package.name).dirname.to_s) || package.name == ParsePackwerk::ROOT_PACKAGE_NAME
+            is_root_package = package.name == ParsePackwerk::ROOT_PACKAGE_NAME
+            in_allowed_directory = ::PackageProtections::EXPECTED_PACK_DIRECTORIES.any? do |expected_package_directory|
+              package.directory.to_s.start_with?(expected_package_directory)
+            end
+            if in_allowed_directory || is_root_package
               nil
             else
               "Package #{package.name} must be located in one of #{::PackageProtections::EXPECTED_PACK_DIRECTORIES.join(', ')} (or be the root) to use this protection"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: package_protections
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport