use_packs 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c91cf31b0f2e560b5ea797df175fc15d5480057d622c93a26a6b6dd6dc470f8
-  data.tar.gz: cd7ff3e14cc6a67df490ece991ae2779fef0b88493c9f1bebe67b539c90e4da4
+  metadata.gz: edbbbd952d5fb5bf816ed8fb6b00602294b56eb69066711f538f0f8814468835
+  data.tar.gz: ee055d83a864cf30dad3010a852e5c354d5efc2c0c08e841ebe8c7ce928226ec
 SHA512:
-  metadata.gz: 5be0a6fb61d223c991afd30b55baaaf74035cf7d0e66953dd4d10732fd7a8e2cfc4cadc2b4a6bdc6fee88440e041e53c89f478c3005b0701c6915760d2d2f95b
-  data.tar.gz: 251134796f9054ab9ed1b1d3ebab9c6c33ec74302510c1cbd81f7628cb427e3e88be321e130d44ae3f0aa85a37f1cb252d3edbabee12c0b9803c834e1c907ff9
+  metadata.gz: adb834a9132aeebe36016a423b51ac7103f72a9ee7262f1bf8b5ac7c6447e31f0088e4d331e6fbbbf923a043c6696993455cd7ad21cca445784cea29bfc9bc5b
+  data.tar.gz: 6adc850cc9d58a0f12c2eb7f6cae80f7d871d1beb725ff14c64198c0647865042bd0bf9bd0169cb50033e0bfe8f8e854662c7ae1ac4793ebfd4e1adebc5922b2

data/README.md

@@ -70,9 +70,6 @@ Make sure there are no spaces between the comma-separated list of paths of direc
 ## Run bin/packwerk update-todo
 `bin/packs update`
 
-## Regenerate packs/*/package_rubocop_todo.yml for one or more packs
-`bin/packs regenerate_rubocop_todo [ packs/my_pack packs/my_other_pack ]`
-
 ## Get info about size and violations for packs
 `bin/packs get_info [ packs/my_pack packs/my_other_pack ]`
 

data/lib/use_packs/cli.rb

@@ -123,12 +123,6 @@ module UsePacks
       system('bin/packwerk update-todo')
     end
 
-    desc 'regenerate_rubocop_todo [ packs/my_pack packs/my_other_pack ]', "Regenerate packs/*/#{RuboCop::Packs::PACK_LEVEL_RUBOCOP_TODO_YML} for one or more packs"
-    sig { params(pack_names: String).void }
-    def regenerate_rubocop_todo(*pack_names)
-      RuboCop::Packs.regenerate_todo(packs: parse_pack_names(pack_names))
-    end
-
     desc 'get_info [ packs/my_pack packs/my_other_pack ]', 'Get info about size and violations for packs'
     sig { params(pack_names: String).void }
     def get_info(*pack_names)

data/lib/use_packs/private/interactive_cli.rb

@@ -18,7 +18,6 @@ require 'use_packs/private/interactive_cli/use_cases/rename'
 require 'use_packs/private/interactive_cli/use_cases/check'
 require 'use_packs/private/interactive_cli/use_cases/update'
 require 'use_packs/private/interactive_cli/use_cases/validate'
-require 'use_packs/private/interactive_cli/use_cases/regenerate_rubocop_todo'
 require 'use_packs/private/interactive_cli/use_cases/lint_package_yml_files'
 require 'use_packs/private/interactive_cli/use_cases/visualize'
 

data/lib/use_packs/private.rb

@@ -366,7 +366,7 @@ 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
@@ -379,7 +379,7 @@ module UsePacks
         end
 
         package = ParsePackwerk::Package.new(
-          enforce_dependencies: should_enforce_dependenceies,
+          enforce_dependencies: should_enforce_dependencies || false,
           enforce_privacy: enforce_privacy,
           dependencies: [],
           metadata: {},
@@ -388,8 +388,6 @@ module UsePacks
         )
 
         ParsePackwerk.write_package_yml!(package)
-        pack = Packs.find(package.name)
-        RuboCop::Packs.set_default_rubocop_yml(packs: [pack].compact)
 
         current_contents = package.yml.read
         new_contents = current_contents.gsub('MyTeam', 'MyTeam # specify your team here, or delete this key if this package is not owned by one team')
@@ -558,11 +556,41 @@ module UsePacks
     end
 
     sig { params(packs: T::Array[Packs::Pack]).void }
-    def self.visualize(packs: Packs.all)
-      packwerk_packages = packs.map do |pack|
-        T.must(ParsePackwerk.find(pack.name))
+    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
-      VisualizePackwerk.package_graph!(packwerk_packages)
+    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)
+      VisualizePackwerk.package_graph!(packs)
     end
 
     sig { returns(String) }

data/lib/use_packs/rubocop_post_processor.rb

@@ -20,52 +20,6 @@ module UsePacks
           replace_with: relative_path_to_destination
         )
       end
-
-      if file_move_operation.origin_pack.name != ParsePackwerk::ROOT_PACKAGE_NAME && file_move_operation.destination_pack.name != ParsePackwerk::ROOT_PACKAGE_NAME
-        origin_rubocop_todo = file_move_operation.origin_pack.directory.join(RuboCop::Packs::PACK_LEVEL_RUBOCOP_TODO_YML)
-        # If there were TODOs for this file in the origin pack's pack-based rubocop, we want to move it to the destination
-        if origin_rubocop_todo.exist?
-          loaded_origin_rubocop_todo = YAML.load_file(origin_rubocop_todo)
-          new_origin_rubocop_todo = loaded_origin_rubocop_todo.dup
-
-          loaded_origin_rubocop_todo.each do |cop_name, cop_config|
-            next unless cop_config['Exclude'].include?(relative_path_to_origin.to_s)
-
-            new_origin_rubocop_todo[cop_name]['Exclude'] = cop_config['Exclude'] - [relative_path_to_origin.to_s]
-            origin_rubocop_todo.write(YAML.dump(new_origin_rubocop_todo))
-
-            destination_rubocop_todo = file_move_operation.destination_pack.directory.join(RuboCop::Packs::PACK_LEVEL_RUBOCOP_TODO_YML)
-            if destination_rubocop_todo.exist?
-              new_destination_rubocop_todo = YAML.load_file(destination_rubocop_todo).dup
-            else
-              new_destination_rubocop_todo = {}
-            end
-
-            new_destination_rubocop_todo[cop_name] ||= { 'Exclude' => [] }
-
-            new_destination_rubocop_todo[cop_name]['Exclude'] += [relative_path_to_destination.to_s]
-            destination_rubocop_todo.write(YAML.dump(new_destination_rubocop_todo))
-          end
-        end
-      end
-    end
-
-    sig { params(file_move_operations: T::Array[Private::FileMoveOperation]).void }
-    def after_move_files!(file_move_operations)
-      return unless rubocop_enabled?
-
-      # There could also be no TODOs for this file, but moving it produced TODOs. This could happen if:
-      # 1) The origin pack did not enforce a rubocop, such as typed public APIs
-      # 2) The file satisfied the cop in the origin pack, such as the Packs/RootNamespaceIsPackName, but the desired
-      # namespace changed once the file was moved to a different pack.
-      files = []
-      file_move_operations.each do |file_move_operation|
-        if file_move_operation.destination_pathname.exist?
-          files << file_move_operation.destination_pathname.to_s
-        end
-      end
-
-      RuboCop::Packs.regenerate_todo(files: files)
     end
 
     sig { returns(T::Boolean) }

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.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_ownership
@@ -326,7 +326,6 @@ files:
 - lib/use_packs/private/interactive_cli/use_cases/move.rb
 - lib/use_packs/private/interactive_cli/use_cases/move_to_parent.rb
 - lib/use_packs/private/interactive_cli/use_cases/query.rb
-- lib/use_packs/private/interactive_cli/use_cases/regenerate_rubocop_todo.rb
 - lib/use_packs/private/interactive_cli/use_cases/rename.rb
 - lib/use_packs/private/interactive_cli/use_cases/update.rb
 - lib/use_packs/private/interactive_cli/use_cases/validate.rb

data/lib/use_packs/private/interactive_cli/use_cases/regenerate_rubocop_todo.rb

@@ -1,26 +0,0 @@
-# typed: strict
-
-module UsePacks
-  module Private
-    module InteractiveCli
-      module UseCases
-        class RegenerateRubocopTodo
-          extend T::Sig
-          extend T::Helpers
-          include Interface
-
-          sig { override.params(prompt: TTY::Prompt).void }
-          def perform!(prompt)
-            packs = PackSelector.single_or_all_pack_multi_select(prompt, question_text: "Please select the packs you want to regenerate `#{RuboCop::Packs::PACK_LEVEL_RUBOCOP_TODO_YML}` for")
-            RuboCop::Packs.regenerate_todo(packs: packs)
-          end
-
-          sig { override.returns(String) }
-          def user_facing_name
-            "Regenerate packs/*/#{RuboCop::Packs::PACK_LEVEL_RUBOCOP_TODO_YML} for one or more packs"
-          end
-        end
-      end
-    end
-  end
-end