use_packwerk 0.51.1 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285e57f72e02b4ef6389a90efce2c9513028a72b9e5b1d9c9b0cbcf10c2c0c4b
-  data.tar.gz: b3c901d0fbab3054bb30e1db668aca9833a4829d36d3e6ffc2555981d9d79fe0
+  metadata.gz: 546e7007cad88d3e42ed331cbb5aa054a880d4c11724786a394bc8fde8f7085a
+  data.tar.gz: ef02e6ce782b74c8537b838f9d2d7d61991b0197fd28f9e6e6fb6d9ff0a6247e
 SHA512:
-  metadata.gz: 1a2fb745ee2c0f89e16f01d7793f86c4b8e2043a4fa7c3120c58d25651d6481d3b577f5208a75a8075de767796388f420bcabb78bd25a54cb30c3ece0858a68f
-  data.tar.gz: cfa9a6db6615a488928182c1f0aec82a572a27f92b140580cb3656df404a0e9071e9f03ae7ad7e42d146de87641604281b4e4979d2601fa76fc67dc2ef4a671b
+  metadata.gz: db8a175fa8ddcf0e4fe54cb57d5215ea9786ed7a67a0318f2e3377ce06f959ed48bd07f7501c861f73881d1ee460aac7d053e954efc08792d502b320bbd6c990
+  data.tar.gz: f0817b39a8e600723ab17fe6d8caaae2d279c074608f861f971db2efcafc24cffaccbff6e2f5b9715c6db6e277e6c670c6fe8425a1bb0f312690323dc9ac42d5

data/lib/use_packwerk/private/file_move_operation.rb

@@ -16,37 +16,37 @@ module UsePackwerk
 
       sig { params(origin_pathname: Pathname, new_package_root: Pathname).returns(Pathname) }
       def self.destination_pathname_for_package_move(origin_pathname, new_package_root)
-        parts = origin_pathname.to_s.split('/')
-        toplevel_directory = parts[0]
+        origin_pack = T.must(ParsePackwerk.package_from_path(origin_pathname))
 
-        case toplevel_directory.to_s
-        # This allows us to move files from monolith to packs
-        when 'app', 'spec', 'lib'
+        new_implementation = nil
+        if origin_pack.name == ParsePackwerk::ROOT_PACKAGE_NAME
           new_package_root.join(origin_pathname).cleanpath
-        # This allows us to move files from packs to packs
-        when *PERMITTED_PACK_LOCATIONS # parts looks like ['packs', 'organisms', 'app', 'services', 'bird_like', 'eagle.rb']
-          new_package_root.join(T.must(parts[2..]).join('/')).cleanpath
         else
-          raise StandardError.new("Don't know how to find destination path for #{origin_pathname.inspect}")
+          Pathname.new(origin_pathname.to_s.gsub(origin_pack.name, new_package_root.to_s)).cleanpath
         end
       end
 
       sig { params(origin_pathname: Pathname).returns(Pathname) }
       def self.destination_pathname_for_new_public_api(origin_pathname)
-        parts = origin_pathname.to_s.split('/')
-        toplevel_directory = Pathname.new(parts[0])
 
-        case toplevel_directory.to_s
-        # This allows us to make API in the monolith public
-        when 'app', 'spec'
-          toplevel_directory.join('public').join(T.must(parts[2..]).join('/')).cleanpath
-        # This allows us to make API in existing packs public
-        when *PERMITTED_PACK_LOCATIONS # parts looks like ['packs', 'organisms', 'app', 'services', 'bird_like', 'eagle.rb']
-          pack_name = Pathname.new(parts[1])
-          toplevel_directory.join(pack_name).join('app/public').join(T.must(parts[4..]).join('/')).cleanpath
+        origin_pack = T.must(ParsePackwerk.package_from_path(origin_pathname))
+        if origin_pack.name == ParsePackwerk::ROOT_PACKAGE_NAME
+          filepath_without_pack_name = origin_pathname.to_s
         else
-          raise StandardError.new("Don't know how to find destination path for #{origin_pathname.inspect}")
+          filepath_without_pack_name = origin_pathname.to_s.gsub("#{origin_pack.name}/", '')
         end
+
+        # We join the pack name with the rest of the path...
+        path_parts = filepath_without_pack_name.split("/")
+        Pathname.new(origin_pack.name).join(
+          # ... keeping the "app" or "spec"
+          T.must(path_parts[0]),
+          # ... substituting "controllers," "services," etc. with "public"
+          'public',
+          # ... then the rest is the same
+          T.must(path_parts[2..]).join("/")
+        # and we take the cleanpath so `./app/...` becomes `app/...`
+        ).cleanpath
       end
 
       sig { returns(FileMoveOperation) }

data/lib/use_packwerk/private.rb

@@ -197,19 +197,7 @@ module UsePackwerk
 
 
           file_move_operations = file_paths.map do |path|
-            parts = path.to_s.split('/')
-            first_part_of_path = T.must(parts[0])
-
-            if Pathname.new(first_part_of_path).dirname.join(ParsePackwerk::PACKAGE_YML_NAME).exist?
-              package_location = Pathname.new('.')
-            elsif PERMITTED_PACK_LOCATIONS.include?(first_part_of_path)
-              package_location = Pathname.new(first_part_of_path).join(T.must(parts[1]))
-            else
-              raise StandardError.new('Can only make files in the monolith or in existing packs public')
-            end
-
-            package = ParsePackwerk::Package.from(package_location.join(ParsePackwerk::PACKAGE_YML_NAME))
-
+            package = T.must(ParsePackwerk.package_from_path(path))
             origin_pathname = Pathname.new(path).cleanpath
 
             FileMoveOperation.new(
@@ -427,6 +415,7 @@ module UsePackwerk
 
     sig { params(original_package: ParsePackwerk::Package).returns(ParsePackwerk::Package) }
     def self.rewrite_package_with_original_packwerk_values(original_package)
+      ParsePackwerk.bust_cache!
       package_with_protection_defaults = T.must(ParsePackwerk.all.find { |package| package.name == original_package.name })
       # PackageProtections also sets `enforce_privacy` and `enforce_dependency` to be true, so we set these back down to their original values
       package = ParsePackwerk::Package.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: use_packwerk
 version: !ruby/object:Gem::Version
-  version: 0.51.1
+  version: 0.52.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize