extract-repo 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f84b4fa63a5dddf61e6d52afe17a9c875a468fd2bd0b91019fffff133219c65
-  data.tar.gz: f49854352455955e76c522221d3e9c9577f2186a75ee5143b989fe87e406150c
+  metadata.gz: bf525d3153a759cfa0582560060b37be8b551273a4fb125093a32d532f387d4b
+  data.tar.gz: b6e33042ed4152c1ca152dd2d74ebecd3e272c22cde971f2f2566f660b6783e7
 SHA512:
-  metadata.gz: 210a960c88fe44a7a597771ac27fbfd7ba7ea68a0d9b6ad9972e35b4a3ffc0055d99c88ff96e817f4c6aaa2d17530b9e6b9f0a2543c8d4008b5d2362061f9808
-  data.tar.gz: df7822a2442e563fb77cacf14514fd7d535daae879111b76df942960d40acd4e783ccef24fe787c8e972e93c4a1cac4d5fdaef19f918b0bac624e513cf80c072
+  metadata.gz: 263f94e63ae97a463544f3f88423f3721a76f70a49de3ccf48bdd6e21a53f0e7f7ede96a742eeb3ca6d1bf4dceee5b89ea8139ff121cf087d83fad884b47b31d
+  data.tar.gz: e460e830b312a465f4857a2c0437a0080d32e23445c5a3dc337b6b3a05de609d4a5919319b4790ebd27438627bbb35ddf12971a7d9c76ac5f4fcf7c3dfd3eceb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.0.13] - 2025-05-08
+
+- Prevent infinite loops when a file had been renamed and later named back to its original name
+
 ## [0.0.12] - 2025-05-07
 
 - Avoid loading pry/pry-byebug if not needed

data/lib/extract_repo.rb

@@ -132,16 +132,14 @@ class ExtractRepo < Foobara::Command
             similarity = similarity.match(/^R0*(\d+)$/)[1].to_i
 
             if similarity >= 80
-              renames[to_path] = from_path
+              renames[to_path] ||= []
+              renames[to_path] << from_path
             end
           end
         end
 
-        loop do
-          file_path = renames[file_path]
-          break unless file_path
-
-          file_paths << file_path
+        determine_historic_paths_for_file(file_path, renames).each do |path|
+          file_paths << path
         end
       end
     end
@@ -149,6 +147,20 @@ class ExtractRepo < Foobara::Command
     normalize_file_paths
   end
 
+  def determine_historic_paths_for_file(file_path, renames, seen = Set.new)
+    return [] if seen.include?(file_path)
+
+    seen << file_path
+
+    file_paths = renames[file_path]
+
+    return [] unless file_paths
+
+    file_paths + file_paths.map do |path|
+      determine_historic_paths_for_file(path, renames, seen)
+    end.flatten
+  end
+
   def normalize_file_paths
     file_paths.sort!
     file_paths.uniq!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: extract-repo
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-05-08 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara