package_protections 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f503d714980699ad618258d74bb41489328aedce9e8201bfc7e1a5a086e0bdf9
-  data.tar.gz: d3cc2f5d197322d29dff1b794f889bc74b2a79e431e8bf7b70ec1d4e81cfabd4
+  metadata.gz: 6797406abd58b1f207223519e6351b0c26ee54c7c79d7400f74400b71a16e556
+  data.tar.gz: e7a583cebe8634d730f665c31aaee955d6d1d2b83e5322a07c0d1c1f917abda1
 SHA512:
-  metadata.gz: 6198bc334e103a52eeac5110fab05a21a72b6ed22f33b7ef455b23cb6cbb93fea9ed0b9f2a9ff122ad80ddc587d21fdbb7b7398ed6aef94ad9ad5470666932da
-  data.tar.gz: c1fd8d5e56cd37b29304dd467effef8a8cb062ed059ffa434cfff6a4c1300a191612042457139b8715737b7b2a732b44b2d2a0b1c961e934773ae9e4da093544
+  metadata.gz: f40cb6189fc8d3b4364fce64e2933f929af1ad35a2a956cc9cea4ff46042cf2719379e0e8f8e6e82e1df68dcf1cf07a3326733c68e55bfe50a2d1914a9a3b34b
+  data.tar.gz: ff10108a8577060d176820a74a939da8897bc566117a9f68e5c6f7c832cbd7047448a216913972bb7b47801c524dddd088c10a6f55a750b60ffd2b915a6d0764

data/lib/package_protections/private/configuration.rb

@@ -35,8 +35,6 @@ module PackageProtections
 
       sig { returns(T::Array[ProtectionInterface]) }
       def default_protections
-        require 'rubocop/cop/package_protections'
-
         [
           Private::OutgoingDependencyProtection.new,
           Private::IncomingPrivacyProtection.new,

data/lib/package_protections/private.rb

@@ -117,6 +117,9 @@ module PackageProtections
       @protected_packages_indexed_by_name = nil
       @private_cop_config = nil
       PackageProtections.config.bust_cache!
+      # This comes explicitly after `PackageProtections.config.bust_cache!` because
+      # otherwise `PackageProtections.config` will attempt to reload the client configuratoin.
+      @loaded_client_configuration = false
     end
 
     sig { params(identifier: Identifier).returns(T::Hash[T.untyped, T.untyped]) }
@@ -150,6 +153,8 @@ module PackageProtections
       excludes = T.let(Set.new, T::Set[String])
 
       Private.rubocop_todo_ymls.each do |todo_yml|
+        next if !todo_yml
+
         config = todo_yml[rule]
         next if config.nil?
 
@@ -161,6 +166,16 @@ module PackageProtections
 
       excludes
     end
+
+    sig { void }
+    def self.load_client_configuration
+      @loaded_client_configuration ||= T.let(false, T.nilable(T::Boolean))
+      return if @loaded_client_configuration
+
+      @loaded_client_configuration = true
+      client_configuration = Pathname.pwd.join('config/package_protections.rb')
+      require client_configuration.to_s if client_configuration.exist?
+    end
   end
 
   private_constant :Private

data/lib/package_protections.rb

@@ -1,23 +1,20 @@
 # frozen_string_literal: true
 
 # typed: strict
-
 require 'sorbet-runtime'
-
 require 'open3'
 require 'set'
 require 'parse_packwerk'
+require 'rubocop'
+require 'rubocop-sorbet'
 
-require 'zeitwerk'
-loader = T.unsafe(Zeitwerk::Loader).for_gem
-loader.ignore("#{__dir__}/rubocop")
-loader.setup
-
+#
 # Welcome to PackageProtections!
 # See https://github.com/rubyatscale/package_protections#readme for more info
 #
 # This file is a reference for the available API to `package_protections`, but all implementation details are private
 # (which is why we delegate to `Private` for the actual implementation).
+#
 module PackageProtections
   extend T::Sig
 
@@ -30,6 +27,18 @@ module PackageProtections
   # This is currently the only handled exception that `PackageProtections` will throw.
   class IncorrectPublicApiUsageError < StandardError; end
 
+  require 'package_protections/offense'
+  require 'package_protections/violation_behavior'
+  require 'package_protections/protected_package'
+  require 'package_protections/per_file_violation'
+  require 'package_protections/protection_interface'
+  require 'package_protections/rubocop_protection_interface'
+  require 'package_protections/private'
+
+  # Implementation of rubocop-based protections
+  require 'rubocop/cop/package_protections/namespaced_under_package_name'
+  require 'rubocop/cop/package_protections/typed_public_api'
+
   class << self
     extend T::Sig
 
@@ -46,6 +55,7 @@ module PackageProtections
 
   sig { returns(Private::Configuration) }
   def self.config
+    Private.load_client_configuration
     @config = T.let(@config, T.nilable(Private::Configuration))
     @config ||= Private::Configuration.new
   end
@@ -119,7 +129,3 @@ module PackageProtections
     RubocopProtectionInterface.bust_rubocop_todo_yml_cache
   end
 end
-
-if defined?(Rubocop)
-  require 'rubocop/cop/package_protections'
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: package_protections
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +191,6 @@ files:
 - lib/package_protections/rspec/support.rb
 - lib/package_protections/rubocop_protection_interface.rb
 - lib/package_protections/violation_behavior.rb
-- lib/rubocop/cop/package_protections.rb
 - lib/rubocop/cop/package_protections/namespaced_under_package_name.rb
 - lib/rubocop/cop/package_protections/namespaced_under_package_name/desired_zeitwerk_api.rb
 - lib/rubocop/cop/package_protections/typed_public_api.rb

data/lib/rubocop/cop/package_protections.rb

@@ -1,13 +0,0 @@
-require 'rubocop'
-require 'rubocop-sorbet'
-
-module RuboCop
-  module Cop
-    module PackageProtections
-      autoload :NamespacedUnderPackageName, 'rubocop/cop/package_protections/namespaced_under_package_name'
-      autoload :TypedPublicApi, 'rubocop/cop/package_protections/typed_public_api'
-    end
-  end
-end
-
-# Implementation of rubocop-based protections