extract-repo 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5ea6956dc3a02f797894c47d0eaea989ce46d0dcaa355c5e16ef0111719b88
-  data.tar.gz: c03ba66bd8348e32dc8bdc1dc35fd2adb60e9914b87207af01481b2585a54adf
+  metadata.gz: bf525d3153a759cfa0582560060b37be8b551273a4fb125093a32d532f387d4b
+  data.tar.gz: b6e33042ed4152c1ca152dd2d74ebecd3e272c22cde971f2f2566f660b6783e7
 SHA512:
-  metadata.gz: 68931f1e4f076a9f2f810b78725092f05b97748c5a602c4d07174350dcd3dc69090b2525f134c55426b50c8e284a1cc3ae28f0497746a0d9019718b80c98579b
-  data.tar.gz: 554b2bc2b3cfa2de1568d7b581f630b9445431c30159bc8c6ccc6b6975fb624dcca937600f56455cdf79607d5740a07f527b06e34a2052d79783b97d6f9e8635
+  metadata.gz: 263f94e63ae97a463544f3f88423f3721a76f70a49de3ccf48bdd6e21a53f0e7f7ede96a742eeb3ca6d1bf4dceee5b89ea8139ff121cf087d83fad884b47b31d
+  data.tar.gz: e460e830b312a465f4857a2c0437a0080d32e23445c5a3dc337b6b3a05de609d4a5919319b4790ebd27438627bbb35ddf12971a7d9c76ac5f4fcf7c3dfd3eceb

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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
+
 ## [0.0.11] - 2025-04-23
 
 - Fix problem that was including irrelevant file renames in the final git history

data/README.md

@@ -1,12 +1,19 @@
-# Usage
+# extract-repo
+
+Extracts files from one repository into a new repository, preserving complete git history of the extracted files.
+
+## Usage
 
 Pass the repo to extract code from and a list of directories/files to extract from that repo.
 
 ```
-$ ./bin/extract-repo git@github.com:org/repo.git some_file.rb some/directory/to/extract/
+$ ./bin/extract-repo  some_file.rb some/directory/to/extract/
+extract-repo --delete-extracted --repo-url-or-path git@github.com:org/repo.git --output-path new/repo/path --paths some/dir some/file.ext some/other/dir 
 ```
 
-Results will wind up in ~/tmp/extract/
+Results will wind up in `~/tmp/extract/` if you don't specify an `--output-path`
+
+`--delete-extracted` will delete any files in the source repo that you extracted to the new repo.
 
 ## License
 

data/boot/start.rb

@@ -6,8 +6,3 @@ if File.exist?("#{__dir__}/../Gemfile")
   ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
   require "bundler/setup"
 end
-
-if %w[development test].include?(ENV["FOOBARA_ENV"])
-  require "pry"
-  require "pry-byebug"
-end

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.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Extract code from one repository into a new repository, preserving history
   of the extracted files.