git_spelunk 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzAyMWIwY2EzMjU2NWM1YTFmMDE3NDFkOTQzODg2ZmEwYzBiZDM5MQ==
+  data.tar.gz: !binary |-
+    Zjg4Nzg3ZDhkN2QwODAzOTQxY2Y2YTYzMWE0NWQ3NjE2ZjFiYjg1OQ==
+SHA512:
+  metadata.gz: !binary |-
+    M2M4MjljMTM1ODMwMjZlZGY1YTFjOGNiODYxNWRjMGNmOTM2ZmFjZTU0NDc1
+    MDNlYWQxMzJlOTc2Njg1Y2EyMDMxNzI1YjZlYTVhODNhMjY4Yjg4ZDQyOGIy
+    OWUwODI5YzI2Mjg5N2E4YWI2ZWQxZWE2ZmExMDIxYzkwNzZlZmY=
+  data.tar.gz: !binary |-
+    NTUxYTYwZGZlNGM3MTIzMDIyY2EzMTI4ZTkwMzJjZWY2NjRlNTlhYzJmZGVm
+    OWQwMmVhYzZjYTAxNTRmMmJmZGFmMmNhYmE1NjY1YzYyMGY0M2NmOTU0YjFm
+    YWU5ZTc0M2YzYTlhYTk2ODIzMTI0NzU0NWYzOTNjMDUzMDA2MDg=

data/lib/git_spelunk/file_context.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 module GitSpelunk
   class FileContext
     attr_accessor :line_number
-    attr_reader :repo
+    attr_reader :repo, :sha, :file
 
     def initialize(file, options = {})
       @sha = options[:sha] || 'HEAD'
@@ -27,8 +27,17 @@ module GitSpelunk
     end
 
     def get_line_for_sha_parent(line_number)
-      o = GitSpelunk::Offset.new(@repo, @file, sha_for_line(line_number))
-      o.line_number_to_parent(@new_to_old[line_number])
+      o = GitSpelunk::Offset.new(@repo, @file, sha_for_line(line_number), @new_to_old[line_number])
+      line = o.line_number_to_parent
+      if line
+        line
+      else
+        if o.at_beginning_of_time?
+          :at_beginning_of_time
+        elsif o.unable_to_trace_lineage?
+          :unable_to_trace
+        end
+      end
     end
 
     def find_repo_from_file(file)

data/lib/git_spelunk/grit_patches.rb

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

data/lib/git_spelunk/offset.rb

@@ -38,33 +38,49 @@ module GitSpelunk
   class Offset
     attr_reader :repo, :file_name, :sha, :chunks
 
-    def initialize(repo, file_name, sha)
+    def initialize(repo, file_name, sha, line_number)
       @repo = repo
       @file_name = file_name
       @sha = sha
-      parent_sha = @repo.commits(@sha)[0].parents[0].id
-      @chunks = diff_chunks(@repo.diff(parent_sha, @sha, @file_name))
+      @line_number = line_number
+      @parent = @repo.commits(@sha)[0].parents[0]
+      true
     end
 
-    def diff_chunks(diffs)
-      return nil if diffs.empty?
-      # split it into chunks: [["@@ -10,13 +10,18 @@", diffs], ["@@ -20,13 +20,18 @@", diffs, diff]]
-      multiple_chunks = diffs[0].diff.split(/(@@ \-\d+,\d+ \+\d+,\d+ @@.*?\n)/)
-      # Discard file name line
-      multiple_chunks[1..multiple_chunks.length].each_slice(2).to_a
+    def chunks
+      @chunks ||= diff_chunks(@repo.diff(@parent.id, @sha, @file_name))
+    end
+
+    def at_beginning_of_time?
+      @parent.nil?
+    end
+
+    def unable_to_trace_lineage?
+      @parent && (@chunks.nil? || target_chunk.nil?)
     end
 
-    def line_number_to_parent(src_line_number)
-      return nil unless @chunks
-      chunk = target_chunk(src_line_number)
+    def line_number_to_parent
+      return nil unless @parent && chunks
+      chunk = target_chunk(@line_number)
+      return nil unless chunk
+
       chunk_starting_line, chunk_total_lines = src_start_and_total(stats_line(chunk))
       parent_starting_line = parent_start_and_total(stats_line(chunk))[0]
-      parent_line_offset = find_parent_line_number(diff_lines(chunk), src_line_number, chunk_starting_line, chunk_total_lines)
+      parent_line_offset = find_parent_line_number(diff_lines(chunk), @line_number, chunk_starting_line, chunk_total_lines)
       parent_starting_line + parent_line_offset
     end
 
     private
 
+    def diff_chunks(diffs)
+      return nil if diffs.empty?
+      # split it into chunks: [["@@ -10,13 +10,18 @@", diffs], ["@@ -20,13 +20,18 @@", diffs, diff]]
+      multiple_chunks = diffs[0].diff.split(/(@@ \-\d+,\d+ \+\d+,\d+ @@.*?\n)/)
+      # Discard file name line
+      multiple_chunks[1..multiple_chunks.length].each_slice(2).to_a
+    end
+
+
     def target_chunk(line_number)
       chunks.select {|chunk| has_line?(chunk, line_number)}[0]
     end

data/lib/git_spelunk/ui/status.rb

@@ -5,9 +5,20 @@ module GitSpelunk
         @window = Curses::Window.new(height, Curses.cols, offset, 0)
         @offset = offset
         @command_buffer = ""
+        @status_message = ""
+        @onetime_message = nil
       end
 
-      attr_accessor :command_buffer
+      attr_accessor :command_buffer, :status_message
+
+      def clear_onetime_message!
+        @onetime_message = nil
+      end
+
+      def set_onetime_message(message)
+        @onetime_message = message
+        draw
+      end
 
       def exit_command_mode!
         self.command_buffer = ""
@@ -26,6 +37,7 @@ module GitSpelunk
         else
           Curses.curs_set(0)
           with_highlighting do
+            @window.addstr(@onetime_message || @status_message)
             @window.addstr(" " * line_remainder + "\n")
           end
         end

data/lib/git_spelunk/ui.rb

@@ -19,6 +19,7 @@ module GitSpelunk
       @repo = RepoWindow.new(@repo_height, @pager_height)
 
       @status = StatusWindow.new(1, Curses.lines - 1)
+      set_status_message
     end
 
     def init_curses
@@ -49,6 +50,10 @@ module GitSpelunk
       end while true
     end
 
+    def set_status_message
+      @status.status_message = "#{@file_context.file} @ #{@file_context.sha}"
+    end
+
     def pause_thread
       Thread.abort_on_exception = true
       Thread.new do
@@ -59,7 +64,6 @@ module GitSpelunk
             if heartbeat_expired? && @pager.cursor == current_line
               @repo.content = content
               @repo.draw
-              @status.draw
               @last_line = current_line
             else
               @heartbeat = Time.now
@@ -77,6 +81,7 @@ module GitSpelunk
     def after_navigation
       @pager.highlight_sha = true
       @status.exit_command_mode!
+      @status.clear_onetime_message!
     end
 
     def handle_key(key)
@@ -109,8 +114,9 @@ module GitSpelunk
         end
         after_navigation
       when '['
+        @status.set_onetime_message("Rewinding...")
         goto = @file_context.get_line_for_sha_parent(@pager.cursor)
-        if goto
+        if goto.is_a?(Fixnum)
           @file_context.line_number = @pager.cursor
           @history.push(@file_context)
 
@@ -119,15 +125,22 @@ module GitSpelunk
           @pager.go_to(goto)
 
           # force commit info update
+          @status.clear_onetime_message!
+          set_status_message
           @last_line = nil
+        elsif goto == :at_beginning_of_time
+          @status.set_onetime_message("At beginning of repository history!")
+        elsif goto == :unable_to_trace
+          @status.set_onetime_message("Unable to trace lineage of file line")
         end
       when ']'
         if @history.last
           @file_context = @history.pop
           @pager.data = @file_context.get_blame
           @pager.go_to(@file_context.line_number)
-          @pager.draw
-          @status.draw
+
+          @status.clear_onetime_message!
+          set_status_message
 
           # force commit info update
           @last_line = nil
@@ -138,7 +151,6 @@ module GitSpelunk
         Curses.close_screen
         system("git -p --git-dir='#{@file_context.repo.path}' show #{sha} | less")
         Curses.stdscr.refresh
-        [@pager, @repo, @status].each(&:draw)
       when '/', '?'
         @heartbeat = nil
         @status.command_buffer = key

data/lib/git_spelunk.rb

@@ -2,3 +2,5 @@ require 'debugger'
 require 'git_spelunk/ui'
 require 'git_spelunk/file_context'
 require 'git_spelunk/offset'
+require 'git_spelunk/grit_patches'
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_spelunk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Ben Osheroff
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,6 +37,7 @@ extra_rdoc_files: []
 files:
 - lib/git_spelunk/file.rb
 - lib/git_spelunk/file_context.rb
+- lib/git_spelunk/grit_patches.rb
 - lib/git_spelunk/offset.rb
 - lib/git_spelunk/ui/pager.rb
 - lib/git_spelunk/ui/repo.rb
@@ -50,27 +48,25 @@ files:
 - bin/git-spelunk
 homepage: https://github.com/osheroff/git-spelunk
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A git tool for exploring history and blame
 test_files: []
-has_rdoc: