git_spelunk 0.4.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1b01cdc9019c68eea06ac6c29c082825ca79fe38
-  data.tar.gz: 3b735af021fb4cc09e22ee3f27658094bf87c70f
+SHA256:
+  metadata.gz: ee9a524ce1012243516ff781bc7ab085710b9201b1fa0781745a97727a5c4a13
+  data.tar.gz: ce58f6b2738fa29f294e2c7ef0ee59ced41c642be2ea5f538eb91a4864feec50
 SHA512:
-  metadata.gz: 977b086900391210e36e91eda889a68c9327ca0e84cab598dcc51ca071658f30163ac797f650e096fbd2e410e25f767d5a9b2cf13d24b53a912b9f1ccffc5a8a
-  data.tar.gz: 30d809b6d384b71491be31d48501f435ad2de9f8dd61cbdba87ca4ac80c7e016a7e5f832cd565316ae7d99724d289d01aa593293d99ac47683322612bbb38421
+  metadata.gz: ffb7863801c8fcadc0ded69633bc09f5da9f5859bab2a935aa9b80dba7721720e4549d09737f62b203c6e256dd20b801303f45fdb2fc8ea976625972af24b13c
+  data.tar.gz: c81a7be76968ed1830a9cbe17918daae13d2ac6105d0c694014da575276aeae996eb33ce68d8ed22d04539c8178d6f31fe9b9891f6256258184990dc46ab4310

data/bin/git-spelunk

@@ -25,8 +25,8 @@ end
 
 options = parse_options(ARGV)
 
-raise "No filename specified. You must provide a file to blame-on." if ARGV.size == 0
-raise "Too many arguments" if ARGV.size > 1
+abort "No filename specified. You must provide a file to blame-on." if ARGV.size == 0
+abort "Too many arguments" if ARGV.size > 1
 
 file = ARGV[0]
 

data/lib/git_spelunk/blame.rb

@@ -1,7 +1,23 @@
+require 'open3'
+
 module GitSpelunk
   BlameLine = Struct.new(:line_number, :old_line_number, :sha, :commit, :filename, :content)
   class EmptyBlame < StandardError ; end
-  class Blame < Grit::Blame
+  class Blame
+    def initialize(repo, file, sha)
+      @lines = nil
+      @repo = repo
+      @file = file
+      @sha = sha
+    end
+    
+    def lines
+      return @lines if @lines
+      cmd = ["git", "--git-dir", @repo.path, "blame", "--porcelain", @sha, "--", @file]
+      output, err, status = Open3.capture3(*cmd)
+      @lines ||= process_raw_blame(output)
+    end
+
     def process_raw_blame(output)
       lines = []
       commits = {}
@@ -17,8 +33,7 @@ module GitSpelunk
 
         sha, old_lineno, lineno = sha_split[0], sha_split[1].to_i, sha_split[2].to_i
 
-        # indicate we need to fetch this sha in the bulk-fetch
-        commits[sha] = nil
+        commits[sha] ||= @repo.lookup(sha)
 
         if rest =~ /^filename (.*)$/
           commit_file_map[sha] = $1
@@ -28,16 +43,9 @@ module GitSpelunk
         { :data => data, :sha => sha, :filename => commit_file_map[sha], :old_line_number => old_lineno, :line_number => lineno }
       end
 
-
-      # load all commits in single call
-      @repo.batch(*commits.keys).each do |commit|
-        commits[commit.id] = commit
-      end
-
-      @lines = lines.map do |hash|
+      lines.map do |hash|
         GitSpelunk::BlameLine.new(hash[:line_number], hash[:old_line_number], hash[:sha], commits[hash[:sha]], hash[:filename], hash[:data])
       end
     end
   end
 end
-

data/lib/git_spelunk/file_context.rb

@@ -1,4 +1,4 @@
-require 'grit'
+require 'rugged'
 require 'fileutils'
 require 'git_spelunk/blame'
 
@@ -12,12 +12,10 @@ module GitSpelunk
       @line_number = options[:line_number] || 1
 
       @repo = options.fetch(:repo) do
-        repo_directory = find_repo_from_file(file)
-        @file = File.expand_path(file).sub(%r{^#{repo_directory}/}, '')
-        Grit::Repo.new(repo_directory)
+        find_repo_from_file(file)
       end
 
-      @file ||= options.fetch(:file)
+      @file = File.expand_path(file).sub(@repo.workdir, '')
       @commit_cache = {}
     end
 
@@ -32,18 +30,7 @@ module GitSpelunk
     end
 
     def find_repo_from_file(file)
-      file = './' + file unless file.start_with?('/')
-      targets = File.expand_path(file).split('/')
-      targets.pop
-      while !File.directory?(targets.join("/") + "/.git")
-        targets.pop
-      end
-
-      if targets.empty?
-        nil
-      else
-        targets.join("/")
-      end
+      Rugged::Repository.discover(file)
     end
 
     def get_blame
@@ -58,15 +45,17 @@ module GitSpelunk
       get_blame
       commit = blame_line.commit
       return nil unless commit
-
-      author_info = commit.author_string.split(" ")
-      tz = author_info.pop
-      utc = Time.at(author_info.pop.to_i)
-      [
-        "commit " + commit.id,
-        "Author: " + author_info.join(" "),
-        "Date: " + utc.to_s
-      ].join("\n") + "\n\n" + "     " + commit.short_message
+      author = commit.author
+
+      author_info = "%s %s" % [author[:name], author[:email]]
+      short_message = commit.message.split("\n").find { |x| !x.strip.empty? } || ''
+      utc = author[:time]
+      {
+        commit: commit.oid,
+        author: author_info,
+        date: author[:time].to_s,
+        message: commit.message
+      }
     end
   end
 end

data/lib/git_spelunk/offset.rb

@@ -33,17 +33,16 @@
 
 
 module GitSpelunk
-  require 'grit'
-
   class Offset
-    attr_reader :repo, :file_name, :sha, :chunks
+    attr_reader :repo, :file_name, :sha, :hunks
 
     def initialize(repo, file_name, sha, line_number)
       @repo = repo
       @file_name = file_name
       @sha = sha
       @line_number = line_number
-      @parent = @repo.commits(@sha)[0].parents[0]
+      @commit = @repo.lookup(@sha)
+      @parent = @commit.parents[0]
       true
     end
 
@@ -51,9 +50,13 @@ module GitSpelunk
     class Chunk
       attr_reader :minus_offset, :minus_length, :plus_offset, :plus_length, :lines
 
-      def initialize(data)
-        @minus_offset, @minus_length, @plus_offset, @plus_length = *extract_stats(data[0])
-        @lines = data[1..-1]
+      def initialize(hunk)
+        @minus_offset = hunk.old_start
+        @minus_length = hunk.old_lines
+        @plus_offset = hunk.new_start
+        @plus_length = hunk.new_lines
+
+        @lines = hunk.lines
       end
 
       def has_line?(line_number)
@@ -66,7 +69,7 @@ module GitSpelunk
         end
 
         def type
-          data.first[0]
+          data.first.line_origin
         end
 
         def size
@@ -79,6 +82,7 @@ module GitSpelunk
       end
 
       def find_parent_line_number(target)
+        return 1 if target == 1 
         # separate in blocks of lines with the same prefix
 
         old_line_number = minus_offset
@@ -86,16 +90,15 @@ module GitSpelunk
 
         blocks = []
         lines.each do |l|
-          next if l =~ /\/
           last_block = blocks.last
 
-          if last_block.nil? || last_block.type != l[0]
+          if last_block.nil? || last_block.type != l.line_origin
             blocks << LineBlock.new(old_line_number, l)
           else
             last_block << l
           end
 
-          if l[0] == "+" || l[0] == " "
+          if l.line_origin == :context || l.line_origin == :addition
             if new_line_number == target
               # important: we don't finish building the structure.
               break
@@ -104,7 +107,7 @@ module GitSpelunk
             new_line_number += 1
           end
 
-          if l[0] == "-" || l[0] == " "
+          if l.line_origin == :deletion || l.line_origin == :context
             old_line_number += 1
           end
         end
@@ -112,7 +115,7 @@ module GitSpelunk
         addition_block = blocks.pop
         last_old_block = blocks.last
 
-        if last_old_block.type == " "
+        if last_old_block.type == :context
           # if the previous context existed in both, just go to the end of that.
           last_old_block.offset + (last_old_block.size - 1)
         else
@@ -120,37 +123,14 @@ module GitSpelunk
           last_old_block.offset + [addition_block.size - 1, last_old_block.size].min
         end
       end
-
-      private
-
-      def extract_stats(l)
-        #@@ -1,355 +1,355 @@
-        l.scan(STATS_PATTERN).first.map(&:to_i)
-      end
-
-      def old_has?(line)
-        # Src line will either have a "+" or will be an unchanged line
-        line[0] == '-' || line[0] == " "
-      end
-
-      def new_has?(line)
-        # Src line will either have a "-" or will be an unchanged line
-        line[0] == '+' || line[0] == " "
-      end
     end
 
-    def chunks
-      @chunks ||= begin
-        diffs = @repo.diff(@parent.id, @sha, @file_name)
-        return nil if diffs.empty?
-
-        chunks = diffs[0].diff.split(/\n/).inject([[]]) do |arr, line|
-          arr.push([]) if line =~ STATS_PATTERN
-          arr.last << line
-          arr
-        end
+    def hunks
+      @hunks ||= begin
+        diff = @parent.diff(@commit, paths: [@file_name])
+        return nil unless diff
 
-        chunks[1..-1].map { |c| Chunk.new(c) } # slice off first chunk -- it's just the filename
+        diff.patches[0].hunks.map { |h| Chunk.new(h) } 
       end
     end
 
@@ -159,11 +139,11 @@ module GitSpelunk
     end
 
     def unable_to_trace_lineage?
-      @parent && (@chunks.nil? || target_chunk.nil?)
+      @parent && (@hunks.nil? || target_chunk.nil?)
     end
 
     def line_number_to_parent
-      return :at_beginning_of_time unless @parent && chunks
+      return :at_beginning_of_time unless @parent && hunks
       chunk = target_chunk(@line_number)
       return :unable_to_trace unless chunk
 
@@ -175,7 +155,7 @@ module GitSpelunk
     private
 
     def target_chunk(line_number)
-      chunks.find { |c| c.has_line?(line_number) }
+      hunks.find { |c| c.has_line?(line_number) }
     end
   end
 end

data/lib/git_spelunk/ui/pager.rb

@@ -13,7 +13,7 @@ module GitSpelunk
         @highlight_sha = true
       end
 
-      attr_accessor :data, :highlight_sha, :search_term
+      attr_accessor :data, :highlight_sha, :search_term, :height
       attr_reader :cursor, :top, :data
 
       def blame_line

data/lib/git_spelunk/ui/repo.rb

@@ -1,7 +1,7 @@
 module GitSpelunk
   class UI
     class RepoWindow
-      attr_accessor :content, :command_mode, :command_buffer
+      attr_accessor :content, :command_mode, :command_buffer, :height
 
       def initialize(height)
         @height = height
@@ -18,7 +18,6 @@ module GitSpelunk
 
       private
 
-      #with_highlighting do
       def status_line
         [
           "navigation: j k CTRL-D CTRL-U",

data/lib/git_spelunk/ui.rb

@@ -6,22 +6,23 @@ module GitSpelunk
   class UI
     def initialize(file_context)
       Dispel::Screen.open(:colors => true) do |screen|
-        calculate_heights!
         @file_context = file_context
         @history = [file_context]
 
-        @pager = PagerWindow.new(@pager_height)
+        @pager = PagerWindow.new(0)
         @pager.data = @file_context.get_blame
 
-        @repo = RepoWindow.new(@repo_height)
+        @repo = RepoWindow.new(0)
         set_repo_content
 
         @status = StatusWindow.new
         set_status_message
 
+        calculate_heights!(screen)
         screen.draw *draw
-        Dispel::Keyboard.output :timeout => 0.30 do |key|
+        Dispel::Keyboard.output(timeout: 0.5) do |key|
           handle_key(key)
+          calculate_heights!(screen)
           screen.draw *draw
         end
       end
@@ -33,7 +34,7 @@ module GitSpelunk
       view3, style3 = @status.draw
 
       cursor = if typing?
-        [@pager_height + @repo_height, @status.command_buffer.size + 1]
+        [@pager.height + @repo.height, @status.command_buffer.size + 1]
       else
         [Curses.lines-1, Curses.cols]
       end
@@ -45,10 +46,10 @@ module GitSpelunk
       ]
     end
 
-    def calculate_heights!
-      @status_height = 1
-      @repo_height = [(Curses.lines.to_f * 0.20).to_i, 6].max
-      @pager_height = Curses.lines  - @repo_height - @status_height
+    def calculate_heights!(screen)
+      status_height = 1
+      @repo.height = [(screen.lines.to_f * 0.20).to_i, 6].max
+      @pager.height = screen.lines  - @repo.height - status_height
     end
 
     def set_status_message
@@ -56,7 +57,16 @@ module GitSpelunk
     end
 
     def set_repo_content
-      @repo.content = @file_context.get_line_commit_info(@pager.blame_line)
+      info = @file_context.get_line_commit_info(@pager.blame_line)
+      content = <<-EOL
+commit: #{info[:commit]}
+Author: #{info[:author]}
+Date: #{info[:date]}
+
+      EOL
+      message_lines = info[:message].split(/\r?\n/)
+      content += message_lines[0..(@repo.height - 6)].join("\n")
+      @repo.content = content
       @repo.draw
     end
 

data/lib/git_spelunk/version.rb

@@ -1,3 +1,3 @@
 module GitSpelunk
-  VERSION = "0.4.1"
+  VERSION = "0.5.2"
 end

data/lib/git_spelunk.rb

@@ -2,5 +2,4 @@ require 'git_spelunk/version'
 require 'git_spelunk/ui'
 require 'git_spelunk/file_context'
 require 'git_spelunk/offset'
-require 'git_spelunk/grit_patches'
 

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: git_spelunk
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ben Osheroff
 - Saroj Yadav
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +68,6 @@ files:
 - lib/git_spelunk.rb
 - lib/git_spelunk/blame.rb
 - lib/git_spelunk/file_context.rb
-- lib/git_spelunk/grit_patches.rb
 - lib/git_spelunk/offset.rb
 - lib/git_spelunk/ui.rb
 - lib/git_spelunk/ui/pager.rb
@@ -79,7 +78,7 @@ homepage: https://github.com/osheroff/git-spelunk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.4.2
+signing_key:
 specification_version: 4
 summary: A git tool for exploring history and blame
 test_files: []

data/lib/git_spelunk/grit_patches.rb

@@ -1,14 +0,0 @@
-require 'grit'
-
-if RUBY_VERSION >= "2.0.0"
-  class String
-    def getord(offset); self[offset].ord; end
-  end
-
-  begin
-    old, $VERBOSE = $VERBOSE, nil
-    PACK_IDX_SIGNATURE = "\377tOc".force_encoding(Encoding::ASCII_8BIT)
-  ensure
-    $VERBOSE = old
-  end
-end