extract-repo 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557339120e6b4827fe0283731b74abf3466ca706a376496aacab6bfdfd004b52
-  data.tar.gz: e29e7133f566f40cf7637f0017ad68fd091079dd0f8635832f20beacfb3a5c58
+  metadata.gz: 8d5ea6956dc3a02f797894c47d0eaea989ce46d0dcaa355c5e16ef0111719b88
+  data.tar.gz: c03ba66bd8348e32dc8bdc1dc35fd2adb60e9914b87207af01481b2585a54adf
 SHA512:
-  metadata.gz: 37fedadcff384c41c447b2cd2a28cd7ca4da621978899d01c8859b9db4ce758ed600b410bd0609c9b626551367143d0d913e28bf789174d93e2195174d97e6a7
-  data.tar.gz: 702b4446a2b45d8ec36c903669131192fab9c7358c3af66388c302c223acaf8b32ca50c6e1c1c17fede64db726767a64245cd71f881861f3b4026c2ad96c97a5
+  metadata.gz: 68931f1e4f076a9f2f810b78725092f05b97748c5a602c4d07174350dcd3dc69090b2525f134c55426b50c8e284a1cc3ae28f0497746a0d9019718b80c98579b
+  data.tar.gz: 554b2bc2b3cfa2de1568d7b581f630b9445431c30159bc8c6ccc6b6975fb624dcca937600f56455cdf79607d5740a07f527b06e34a2052d79783b97d6f9e8635

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.11] - 2025-04-23
+
+- Fix problem that was including irrelevant file renames in the final git history
+
+## [0.0.10] - 2025-04-15
+
+- Remove pry as a required dependency
+
 ## [0.0.9] - 2025-01-07
 
 - Bump Ruby to 3.4.1

data/boot/start.rb

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

data/lib/extract_repo.rb

@@ -1,4 +1,3 @@
-require "pry"
 require "uri"
 require "English"
 
@@ -6,11 +5,14 @@ require "foobara/all"
 
 # TODO: allow extracting from a local repo and default to that repo as "."
 class ExtractRepo < Foobara::Command
+  description "Extracts directories/files of your choosing from one repo to another"
+
   inputs do
-    repo_url :string, :required
-    paths [:string], :required
-    output_path :string, default: "#{Dir.home}/tmp/extract"
-    delete_extracted :boolean, default: false
+    repo_url_or_path :string, :required, "The source repository to extract from. Can be a URL or a local directory"
+    paths [:string], :required, "Paths to each directory/file to extract"
+    output_path :string, default: "#{Dir.home}/tmp/extract",
+                         description: "Where to create a new repo and move the extracted files to"
+    delete_extracted :boolean, default: false, description: "Delete the extracted files from the source repository"
   end
 
   attr_accessor :file_paths, :absolute_repo_path
@@ -33,9 +35,9 @@ class ExtractRepo < Foobara::Command
 
   def determine_absolute_repo_path
     self.absolute_repo_path = if local_repository?
-                                File.absolute_path(repo_url)
+                                File.absolute_path(repo_url_or_path)
                               else
-                                repo_url
+                                repo_url_or_path
                               end
   end
 
@@ -56,7 +58,7 @@ class ExtractRepo < Foobara::Command
   end
 
   def local_repository?
-    !URI.parse(repo_url).scheme
+    !URI.parse(repo_url_or_path).scheme
   end
 
   def remove_origin
@@ -114,10 +116,32 @@ class ExtractRepo < Foobara::Command
   def determine_historic_paths
     chdir output_path do
       file_paths.dup.each do |file_path|
-        historic_paths = sh "git log --follow --name-only --pretty=format: -- \"#{file_path}\""
+        renames = {}
+
+        relevant_sha1s = sh "git log --follow --pretty=format:%H -- \"#{file_path}\""
+        relevant_sha1s = relevant_sha1s.strip.split("\n")
+
+        relevant_sha1s.each do |sha1|
+          status_lines = sh "git diff-tree -M --no-commit-id --name-status -r #{sha1}"
+          status_lines = status_lines.strip.split("\n")
+
+          status_lines.each do |status_line|
+            next unless status_line.start_with?("R")
+
+            similarity, from_path, to_path = status_line.split("\t")
+            similarity = similarity.match(/^R0*(\d+)$/)[1].to_i
+
+            if similarity >= 80
+              renames[to_path] = from_path
+            end
+          end
+        end
+
+        loop do
+          file_path = renames[file_path]
+          break unless file_path
 
-        historic_paths.split("\n").each do |historic_path|
-          file_paths << historic_path
+          file_paths << file_path
         end
       end
     end

metadata

@@ -1,42 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: extract-repo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.102
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.102
 - !ruby/object:Gem::Dependency
   name: foobara-sh-cli-connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 email:
 - azimux@gmail.com
 executables:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Extract code from one repository into a new repository, preserving history
   of the extracted files.