use_packs 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb20cd9cb35a011b3acb88be1b604f9057d7328d9d0c15b096490afa5f69a3e
-  data.tar.gz: 1501aefe2f6e0f4050c5f514cbcdeae591252102b6b06c45c417ff8a7e0b616f
+  metadata.gz: 1e5ff298c66cd0240894575bbcd27229d27370a946f59578c21f650de6fbb699
+  data.tar.gz: 8863e9d1fd26bbbe3fa512b06f3338e05d0de0d552febd207989d229f07f76c6
 SHA512:
-  metadata.gz: a70a73019026886d08e0eadc22bf96cc2e27ca3d2f6213dd0f7f5996335f11bd0986de2ddf6874f772c8edc55e437c3750e854768a45d495528738ead07e0cf7
-  data.tar.gz: 3c93acc23b81dc09d3cdc8ce225f5db095d4887f6f9b231a9bddf8dc32457aa302ac87fea155b25ba9c81c0855fa535e8ed5cabbb67ea270c6cea1c50c91c1f0
+  metadata.gz: aa284550c2ffe844c552568ec06985b5d8bf95ebab863b7ceafbad9b28b84604eec045fc9ea56c9c0c73608507406c20eed4c1d1cd932b3c05855eb963eb7359
+  data.tar.gz: 8a186d4871ea6860535dba32a427d9a62c09b0bb92597d168a009d8c49def298877ac5437d7b979f9818b671ffa31dee806c738f7c7afe759734eb5d96347d44

data/lib/use_packs/private.rb

@@ -366,25 +366,25 @@ module UsePacks
 
       existing_package = ParsePackwerk.all.find { |p| p.name == pack_name }
       if existing_package.nil?
-        should_enforce_dependenceies = enforce_dependencies.nil? ? UsePacks.config.enforce_dependencies : enforce_dependencies
+        should_enforce_dependencies = enforce_dependencies.nil? ? UsePacks.config.enforce_dependencies : enforce_dependencies
 
         # TODO: This should probably be `if defined?(CodeOwnership) && CodeOwnership.configured?`
         # but we'll need to add an API to CodeOwnership to do this
         if Pathname.new('config/code_ownership.yml').exist?
-          metadata = {
+          config = {
             'owner' => team.nil? ? 'MyTeam' : team.name
           }
         else
-          metadata = {}
+          config = {}
         end
 
         package = ParsePackwerk::Package.new(
-          enforce_dependencies: should_enforce_dependenceies,
+          enforce_dependencies: should_enforce_dependencies || false,
           enforce_privacy: enforce_privacy,
           dependencies: [],
-          metadata: metadata,
+          metadata: {},
           name: pack_name,
-          config: {}
+          config: config
         )
 
         ParsePackwerk.write_package_yml!(package)
@@ -557,6 +557,39 @@ module UsePacks
       end
     end
 
+    sig { params(packs: T::Array[Packs::Pack]).void }
+    def self.lint_package_yml_files!(packs)
+      packs.each do |p|
+        packwerk_package = ParsePackwerk.find(p.name)
+        next if packwerk_package.nil?
+
+        new_metadata = packwerk_package.metadata
+        new_config = packwerk_package.config
+
+        # Move metadata owner key to top-level
+        existing_owner = new_config['owner'] || new_metadata.delete('owner')
+        new_config['owner'] = existing_owner if !existing_owner.nil?
+
+        if new_metadata.empty?
+          new_config.delete('metadata')
+        end
+
+        new_package = packwerk_package.with(
+          config: new_config,
+          metadata: new_metadata,
+          dependencies: packwerk_package.dependencies.uniq.sort
+        )
+
+        ParsePackwerk.write_package_yml!(new_package)
+      end
+    end
+
+    sig { params(config: T::Hash[T.anything, T.anything]).returns(T::Hash[T.anything, T.anything]) }
+    def self.sort_keys(config)
+      sort_order = ParsePackwerk.key_sort_order
+      config.to_a.sort_by { |key, _value| T.unsafe(sort_order).index(key) }.to_h
+    end
+
     sig { params(packs: T::Array[Packs::Pack]).void }
     def self.visualize(packs: Packs.all)
       packwerk_packages = packs.map do |pack|

data/lib/use_packs.rb

@@ -253,19 +253,6 @@ module UsePacks
 
   sig { params(packs: T::Array[Packs::Pack]).void }
   def self.lint_package_yml_files!(packs)
-    packs.each do |p|
-      packwerk_package = ParsePackwerk.find(p.name)
-      next if packwerk_package.nil?
-
-      new_package = ParsePackwerk::Package.new(
-        name: packwerk_package.name,
-        enforce_privacy: packwerk_package.enforce_privacy,
-        enforce_dependencies: packwerk_package.enforce_dependencies,
-        dependencies: packwerk_package.dependencies.uniq.sort,
-        metadata: packwerk_package.metadata,
-        config: packwerk_package.config
-      )
-      ParsePackwerk.write_package_yml!(new_package)
-    end
+    Private.lint_package_yml_files!(packs)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: use_packs
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_ownership
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.33.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement