Move #blame to Patch from Line

RepoGrams · Sep 10, 2014 · 27ed09e · 27ed09e
1 parent 064f42f
commit 27ed09e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 31 deletions.
diff --git a/lib/pronto/git/line.rb b/lib/pronto/git/line.rb
@@ -38,7 +38,7 @@ def commit_sha
 
       def commit_line
         @commit_line ||= begin
-          patches = repo.show_commit(commit_sha)
+          patches = patch.repo.show_commit(commit_sha)
 
           commit_patch = patches.find do |p|
             patch.new_file_full_path == p.new_file_full_path
@@ -60,15 +60,8 @@ def ==(other)
 
       private
 
-      def repo
-        patch.repo
-      end
-
       def blame
-        @blame ||= Rugged::Blame.new(repo.rugged, patch.delta.new_file[:path],
-                                     min_line: new_lineno, max_line: new_lineno,
-                                     track_copies_same_file: true,
-                                     track_copies_any_commit_copies: true)[0]
+        @blame ||= patch.blame(new_lineno)
       end
     end
   end

diff --git a/lib/pronto/git/patch.rb b/lib/pronto/git/patch.rb
@@ -19,6 +19,10 @@ def deletions
         patch.stat[1]
       end
 
+      def blame(lineno)
+        repo.blame(self, lineno)
+      end
+
       def lines
         @lines ||= begin
           patch.map do |hunk|

diff --git a/lib/pronto/git/repository.rb b/lib/pronto/git/repository.rb
@@ -32,8 +32,11 @@ def path
         @repo.path
       end
 
-      def rugged
-        @repo
+      def blame(patch, lineno)
+        Rugged::Blame.new(@repo, patch.delta.new_file[:path],
+                          min_line: lineno, max_line: lineno,
+                          track_copies_same_file: true,
+                          track_copies_any_commit_copies: true)[0]
       end
 
       private

diff --git a/spec/pronto/formatter/github_formattter_spec.rb b/spec/pronto/formatter/github_formattter_spec.rb
@@ -8,6 +8,7 @@ module Formatter
       describe '#format' do
         subject { github_formatter.format(messages, repository) }
         let(:messages) { [message, message] }
+        let(:repository) { Pronto::Git::Repository.new('.') }
         let(:message) { Message.new('path/to', line, :warning, 'crucial') }
         let(:line) { OpenStruct.new(new_lineno: 1) }
         before { line.stub(:commit_line).and_return(line) }

diff --git a/spec/pronto/git/line_spec.rb b/spec/pronto/git/line_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -10,10 +10,6 @@
   config.mock_with(:rspec) { |c| c.syntax = :should }
 end
 
-def repository
-  Pronto::Git::Repository.new('.')
-end
-
 def load_fixture(fixture_name)
   path = File.join(%w(spec support files), fixture_name)
   File.read(path).strip