Refactor commit retrieval logic to use Models::Commit.find_or_create_from_repo

Author: andrew

lib/git/pkgs/commands/diff.rb

@@ -29,8 +29,8 @@ def run
           error "Could not resolve '#{from_ref}'" unless from_sha
           error "Could not resolve '#{to_ref}'" unless to_sha
 
-          from_commit = find_or_create_commit(repo, from_sha)
-          to_commit = find_or_create_commit(repo, to_sha)
+          from_commit = Models::Commit.find_or_create_from_repo(repo, from_sha)
+          to_commit = Models::Commit.find_or_create_from_repo(repo, to_sha)
 
           error "Commit '#{from_sha[0..7]}' not found" unless from_commit
           error "Commit '#{to_sha[0..7]}' not found" unless to_commit
@@ -98,27 +98,6 @@ def output_text(from_commit, to_commit, changes)
           puts "Summary: #{added_count} #{removed_count} #{modified_count}"
         end
 
-        def find_or_create_commit(repo, sha)
-          commit = Models::Commit.find_by(sha: sha) ||
-                   Models::Commit.where("sha LIKE ?", "#{sha}%").first
-          return commit if commit
-
-          # Lazily insert commit if it exists in git but not in database
-          rugged_commit = repo.lookup(sha)
-          return nil unless rugged_commit
-
-          Models::Commit.create!(
-            sha: rugged_commit.oid,
-            message: rugged_commit.message,
-            author_name: rugged_commit.author[:name],
-            author_email: rugged_commit.author[:email],
-            committed_at: rugged_commit.time,
-            has_dependency_changes: false
-          )
-        rescue Rugged::OdbError
-          nil
-        end
-
         def parse_options
           options = {}
 

lib/git/pkgs/commands/history.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "time"
-
 module Git
   module Pkgs
     module Commands
@@ -159,11 +157,6 @@ def parse_options
           options
         end
 
-        def parse_time(str)
-          Time.parse(str)
-        rescue ArgumentError
-          error "Invalid date format: #{str}"
-        end
       end
     end
   end

lib/git/pkgs/commands/log.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "time"
-
 module Git
   module Pkgs
     module Commands
@@ -102,12 +100,6 @@ def output_json(commits)
           puts JSON.pretty_generate(data)
         end
 
-        def parse_time(str)
-          Time.parse(str)
-        rescue ArgumentError
-          error "Invalid date format: #{str}"
-        end
-
         def parse_options
           options = {}
 

lib/git/pkgs/commands/show.rb

@@ -22,7 +22,7 @@ def run
           sha = repo.rev_parse(ref)
           error "Could not resolve '#{ref}'" unless sha
 
-          commit = find_or_create_commit(repo, sha)
+          commit = Models::Commit.find_or_create_from_repo(repo, sha)
           error "Commit '#{sha[0..7]}' not found" unless commit
 
           changes = Models::DependencyChange
@@ -107,26 +107,6 @@ def output_json(commit, changes)
           puts JSON.pretty_generate(data)
         end
 
-        def find_or_create_commit(repo, sha)
-          commit = Models::Commit.find_by(sha: sha) ||
-                   Models::Commit.where("sha LIKE ?", "#{sha}%").first
-          return commit if commit
-
-          rugged_commit = repo.lookup(sha)
-          return nil unless rugged_commit
-
-          Models::Commit.create!(
-            sha: rugged_commit.oid,
-            message: rugged_commit.message,
-            author_name: rugged_commit.author[:name],
-            author_email: rugged_commit.author[:email],
-            committed_at: rugged_commit.time,
-            has_dependency_changes: false
-          )
-        rescue Rugged::OdbError
-          nil
-        end
-
         def parse_options
           options = {}
 

lib/git/pkgs/commands/stats.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "time"
-
 module Git
   module Pkgs
     module Commands
@@ -199,12 +197,6 @@ def output_by_author_text(counts)
           end
         end
 
-        def parse_time(str)
-          Time.parse(str)
-        rescue ArgumentError
-          error "Invalid date format: #{str}"
-        end
-
         def parse_options
           options = {}
 

lib/git/pkgs/models/commit.rb

@@ -20,6 +20,25 @@ def self.find_or_create_from_rugged(rugged_commit)
           end
         end
 
+        def self.find_or_create_from_repo(repo, sha)
+          commit = find_by(sha: sha) || where("sha LIKE ?", "#{sha}%").first
+          return commit if commit
+
+          rugged_commit = repo.lookup(sha)
+          return nil unless rugged_commit
+
+          create!(
+            sha: rugged_commit.oid,
+            message: rugged_commit.message,
+            author_name: rugged_commit.author[:name],
+            author_email: rugged_commit.author[:email],
+            committed_at: rugged_commit.time,
+            has_dependency_changes: false
+          )
+        rescue Rugged::OdbError
+          nil
+        end
+
         def short_sha
           sha[0, 7]
         end

lib/git/pkgs/output.rb

@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
 require "json"
+require "time"
 require_relative "pager"
 
 module Git
   module Pkgs
     module Output
       include Pager
+
+      def parse_time(str)
+        Time.parse(str)
+      rescue ArgumentError
+        error "Invalid date format: #{str}"
+      end
       # Print error message and exit with code 1.
       # Use for user errors (bad input, invalid refs) and system errors (db missing).
       # When format is :json, outputs JSON to stdout; otherwise outputs text to stderr.

test/git/pkgs/test_cli.rb

@@ -70,7 +70,7 @@ def teardown
     cleanup_test_repo
   end
 
-  def test_find_or_create_commit_finds_existing_commit
+  def test_find_or_create_from_repo_finds_existing_commit
     repo = Git::Pkgs::Repository.new(@test_dir)
     sha = repo.head_sha
 
@@ -83,34 +83,31 @@ def test_find_or_create_commit_finds_existing_commit
       committed_at: Time.now
     )
 
-    diff = Git::Pkgs::Commands::Diff.new([])
-    result = diff.send(:find_or_create_commit, repo, sha)
+    result = Git::Pkgs::Models::Commit.find_or_create_from_repo(repo, sha)
 
     assert result
     assert_equal sha, result.sha
   end
 
-  def test_find_or_create_commit_creates_missing_commit
+  def test_find_or_create_from_repo_creates_missing_commit
     repo = Git::Pkgs::Repository.new(@test_dir)
     sha = repo.head_sha
 
     # Commit doesn't exist in database yet
     assert_nil Git::Pkgs::Models::Commit.find_by(sha: sha)
 
-    diff = Git::Pkgs::Commands::Diff.new([])
-    result = diff.send(:find_or_create_commit, repo, sha)
+    result = Git::Pkgs::Models::Commit.find_or_create_from_repo(repo, sha)
 
     assert result
     assert_equal sha, result.sha
     # Verify it was persisted
     assert Git::Pkgs::Models::Commit.find_by(sha: sha)
   end
 
-  def test_find_or_create_commit_returns_nil_for_invalid_sha
+  def test_find_or_create_from_repo_returns_nil_for_invalid_sha
     repo = Git::Pkgs::Repository.new(@test_dir)
 
-    diff = Git::Pkgs::Commands::Diff.new([])
-    result = diff.send(:find_or_create_commit, repo, "0000000000000000000000000000000000000000")
+    result = Git::Pkgs::Models::Commit.find_or_create_from_repo(repo, "0000000000000000000000000000000000000000")
 
     assert_nil result
   end