git_spelunk 0.2.3 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjQwOThjMDk4OGM4YjhjMTY2OWUxNDBjOTc4NGU1MzdjN2MxYzQ1MQ==
+    YzI4MDI1MzBhYzllMTQ1N2I0YTM5ZGY0ZTVmZjUwYzI0NDE2ZTFkMw==
   data.tar.gz: !binary |-
-    MzA1ZGE4ZmJlMDY2OGRiZDhjZjgyZjNmNGFiZDJlMzFiMTQ5YWZmNQ==
+    NjJiZWJkMWM0MmU0OTEzMjEyMjgwNjJjNmNjZTEzMTU4NjUyMWIwMg==
 SHA512:
   metadata.gz: !binary |-
-    YTgxODcyZTNkMTk5YmU0ODE4MDg5NjA0ZGVjNDNmNjQxMDAzMWI5ZmNlZWQ2
-    OTQ5MTAwMmFlOTA2N2ZkMmMxNWM4NDM0OTM0NTlhNTAxZGRmNjYxZGFhNDcw
-    MDFkODE1MzQwNzkxOGRjYzczMGRjYzRiZjMzYzk4OTE2MjM5OGM=
+    OWI4MjdiOTg0OTdiNDk0YTVhZmI2NzU1MmIyYTkxMThhMzhkOWJmOThjMDkw
+    MmUyMjQ0NDg2OThmMjg2NTRmZjc5YzkzMDhlZGQ4NzhmYWEyNTUyYjgyODVj
+    NDc3NzEwMDJjOGRiNjBkN2UxZTg4YzdmOWE0MWE0ZTYyZjJmM2Y=
   data.tar.gz: !binary |-
-    ODY2YTIxNTU5YzQ5ZDBmYjM1NGI2MWIxYzJiZGQzMWE5NGYyZTA5Mzk4ZjI0
-    MWEwNTYyM2Q0YzQ4YjNhYTM1NDYzMjJiNzU2YmM5MmY4N2ZlYzk5ODllMDQz
-    NmRmODM5M2YyMjMwZGIzM2M2ZDJhZWVjMDQxZGQwYmUzODdkMWI=
+    OGZiMTMwMDgyYmU1YzA4ZmI4N2I0Yzc2NDA5YTYxMTA2ZjY0ZDJiNDE1NTJk
+    MzhlOTI4NTMwYzRhMGM1YjIxMWYxYjcyMTcwNTU5NTc0NmYxYjdhODQ0NjEy
+    NjQ5ZGE4YTQ4NDRhMWM5MGI3MmFmNTQ0NTcxYmJkNzIxNDZkNTU=

data/bin/git-spelunk

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require 'git_spelunk'
+require 'dispel'
 require 'optparse'
 
 def parse_options(argv)
@@ -31,6 +32,10 @@ file = ARGV[0]
 file, line = file.split(':',2) if file.include?(':')
 options[:line_number] = line
 
+def log(stuff)
+  File.open('spelunk.log','ab'){|f| f.puts stuff }
+end
+
 file_context = GitSpelunk::FileContext.new(file, options)
 ui = GitSpelunk::UI.new(file_context)
-ui.run
+#ui.run

data/lib/git_spelunk/blame.rb

@@ -0,0 +1,36 @@
+module GitSpelunk
+  BlameLine = Struct.new(:line_number, :old_line_number, :sha, :commit, :filename, :content)
+  class Blame < Grit::Blame
+    def process_raw_blame(output)
+      lines, final = [], []
+      info, commits = {}, {}
+
+      current_filename = nil
+      # process the output
+      output.split("\n").each do |line|
+        if line[0, 1] == "\t"
+          lines << line[1, line.size]
+        elsif m = /^(\w{40}) (\d+) (\d+)/.match(line)
+          commit_id, old_lineno, lineno = m[1], m[2].to_i, m[3].to_i
+          commits[commit_id] = nil
+          info[lineno] = [commit_id, old_lineno, current_filename]
+        elsif line =~ /^filename (.*)/
+          current_filename = $1
+         end
+      end
+
+      # load all commits in single call
+      @repo.batch(*commits.keys).each do |commit|
+        commits[commit.id] = commit
+      end
+
+      # get it together
+      info.sort.each do |lineno, (commit_id, old_lineno, filename)|
+        commit = commits[commit_id]
+        final << GitSpelunk::BlameLine.new(lineno, old_lineno, commit_id, commit, filename, lines[lineno - 1])
+      end
+      @lines = final
+    end
+  end
+end
+

data/lib/git_spelunk/file_context.rb

@@ -1,5 +1,6 @@
 require 'grit'
 require 'fileutils'
+require 'git_spelunk/blame'
 
 module GitSpelunk
   class FileContext
@@ -20,14 +21,13 @@ module GitSpelunk
       @commit_cache = {}
     end
 
-
-    def clone_for_parent_sha(line_number)
-      new_sha = sha_for_line(line_number) + "~1"
-      GitSpelunk::FileContext.new(@file, {:sha => new_sha, :repo => @repo, :file => @file})
+    def clone_for_blame_line(blame_line)
+      new_sha = blame_line.sha + "~1"
+      GitSpelunk::FileContext.new(blame_line.filename, {:sha => new_sha, :repo => @repo, :file => blame_line.filename})
     end
 
-    def get_line_for_sha_parent(line_number)
-      o = GitSpelunk::Offset.new(@repo, @file, sha_for_line(line_number), @new_to_old[line_number])
+    def get_line_for_sha_parent(blame_line)
+      o = GitSpelunk::Offset.new(@repo, blame_line.filename, blame_line.sha, blame_line.old_line_number)
       o.line_number_to_parent
     end
 
@@ -50,23 +50,13 @@ module GitSpelunk
       @blame_data ||= begin
         @new_to_old = {}
         @line_to_sha = {}
-        blame = Grit::Blame.new(@repo, @file, @sha)
-        blame.lines.map do |line|
-          @new_to_old[line.lineno] = line.oldlineno
-          [line.commit.id_abbrev, line.line]
-        end
+        GitSpelunk::Blame.new(@repo, @file, @sha).lines
       end
-      @blame_data
-    end
-
-    def sha_for_line(line)
-      @blame_data[line - 1][0]
     end
 
-    def get_line_commit_info(line)
+    def get_line_commit_info(blame_line)
       get_blame
-      abbrev = sha_for_line(line)
-      commit = (@commit_cache[abbrev] ||= @repo.commit(abbrev))
+      commit = blame_line.commit
       return nil unless commit
 
       author_info = commit.author_string.split(" ")

data/lib/git_spelunk/ui.rb

@@ -1,104 +1,86 @@
-require 'git_spelunk/ui/window'
 require 'git_spelunk/ui/pager'
 require 'git_spelunk/ui/repo'
 require 'git_spelunk/ui/status'
-require 'curses'
 
 module GitSpelunk
   class UI
     def initialize(file_context)
-      init_curses
+      Dispel::Screen.open(:colors => true) do |screen|
+        calculate_heights!
+        @file_context = file_context
+        @history = [file_context]
 
-      calculate_heights!
-      @file_context = file_context
-      @history = [file_context]
+        @pager = PagerWindow.new(@pager_height)
+        @pager.data = @file_context.get_blame
 
-      @pager = PagerWindow.new(@pager_height)
-      @pager.data = @file_context.get_blame
+        @repo = RepoWindow.new(@repo_height)
+        set_repo_content
 
-      @repo = RepoWindow.new(@repo_height, @pager_height)
+        @status = StatusWindow.new
+        set_status_message
 
-      @status = StatusWindow.new(1, Curses.lines - 1)
-      set_status_message
+        screen.draw *draw
+        Dispel::Keyboard.output :timeout => 0.30 do |key|
+          handle_key(key)
+          screen.draw *draw
+        end
+      end
     end
 
-    def init_curses
-      Curses.init_screen
-      Curses.start_color
-      Curses.raw
-      Curses.nonl
-      Curses.noecho
-      Curses.curs_set(0)
-      screen = Curses.stdscr
-      screen.refresh
-      screen.keypad(1)
-      Curses.init_pair(ACTIVE_SHA_COLOR, Curses::COLOR_GREEN, Curses::COLOR_BLACK)
+    def draw
+      view1, style1 = @pager.draw
+      view2, style2 = @repo.draw
+      view3, style3 = @status.draw
+
+      cursor = if typing?
+        [@pager_height + @repo_height, @status.command_buffer.size + 1]
+      else
+        [Curses.lines-1, Curses.cols]
+      end
+
+      [
+        [view1, view2, view3].join("\n"),
+        style1 + style2 + style3,
+        cursor
+      ]
     end
 
     def calculate_heights!
-      @repo_height = [(Curses.lines.to_f * 0.20).to_i, 6].max
-      @pager_height = Curses.lines  - @repo_height - 1
       @status_height = 1
-    end
-
-    def run
-      @repo.content = @file_context.get_line_commit_info(@pager.cursor)
-      pause_thread
-      begin
-        [@pager, @repo, @status].each(&:draw)
-        handle_key(Curses.getch)
-      end while true
+      @repo_height = [(Curses.lines.to_f * 0.20).to_i, 6].max
+      @pager_height = Curses.lines  - @repo_height - @status_height
     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
-        while true
-          if heartbeat_expired? && @last_line != @pager.cursor
-            current_line = @pager.cursor
-            content = @file_context.get_line_commit_info(current_line)
-            if heartbeat_expired? && @pager.cursor == current_line
-              @repo.content = content
-              @repo.draw
-              @last_line = current_line
-            else
-              @heartbeat = Time.now
-            end
-          end
-          sleep 0.05
-        end
-      end
-    end
-
-    def heartbeat_expired?
-      @heartbeat && (Time.now - @heartbeat).to_f > 0.30
+    def set_repo_content
+      @repo.content = @file_context.get_line_commit_info(@pager.blame_line)
+      @repo.draw
     end
 
     def after_navigation
       @pager.highlight_sha = true
+      set_repo_content
       @status.exit_command_mode!
       @status.clear_onetime_message!
     end
 
     def history_back
       @status.set_onetime_message("Rewinding...")
-      goto = @file_context.get_line_for_sha_parent(@pager.cursor)
+      goto = @file_context.get_line_for_sha_parent(@pager.blame_line)
       if goto.is_a?(Fixnum)
         @file_context.line_number = @pager.cursor
         @history.push(@file_context)
 
-        @file_context = @file_context.clone_for_parent_sha(@pager.cursor)
+        @file_context = @file_context.clone_for_blame_line(@pager.blame_line)
         @pager.data = @file_context.get_blame
         @pager.go_to(goto)
 
-        # force commit info update
+        set_repo_content
         @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
@@ -113,97 +95,94 @@ module GitSpelunk
         @file_context = @history.pop
         @pager.data = @file_context.get_blame
         @pager.go_to(@file_context.line_number)
+        set_repo_content
 
         @status.clear_onetime_message!
         set_status_message
-
-        # force commit info update
-        @last_line = nil
       end
     end
 
     def handle_key(key)
-      @heartbeat = Time.now
       case key
-      when Curses::KEY_DOWN, 'j'
-        @pager.cursordown
-        after_navigation
-      when Curses::KEY_UP, '-', 'k'
-        @pager.cursorup
-        after_navigation
-      when Curses::KEY_CTRL_D, ' '
+      when :"Ctrl+d", ' ', :page_down
         @pager.pagedown
         after_navigation
-      when Curses::KEY_CTRL_U
+      when :"Ctrl+u", :page_up
         @pager.pageup
         after_navigation
-      when *(0..9).to_a.map(&:to_s)
-        @status.command_buffer += key
-      when Curses::KEY_CTRL_M
-        if @status.command_buffer != ''
-          @pager.go_to(@status.command_buffer.to_i)
-        end
-        after_navigation
-      when 'G'
-        if @status.command_buffer != ''
-          @pager.go_to(@status.command_buffer.to_i)
-        else
-          @pager.go_bottom
-        end
-        after_navigation
-      when '['
-        history_back
-      when ']'
-        history_forward
-      when 's'
-        @heartbeat = nil
-        sha = @file_context.sha_for_line(@pager.cursor)
-        Curses.close_screen
-        system("git -p --git-dir='#{@file_context.repo.path}' show #{sha} | less")
-        Curses.stdscr.refresh
-      when '/', '?'
-        @heartbeat = nil
-        @status.command_buffer = key
-        @status.draw
-
-        line = getline
-        if line
-          @pager.search(line, false, key == '?')
-        end
-        @status.exit_command_mode!
-      when 'n'
-        @pager.search(nil, true, false)
-        after_navigation
-      when 'N'
-        @pager.search(nil, true, true)
-        after_navigation
-      when 'q', Curses::KEY_CTRL_C
+      when :"Ctrl+c"
         exit
-      end
-    end
-
-    # you'd really think there was a better way
-    def getline
-      while ch = Curses.getch
-        case ch
-        when Curses::KEY_CTRL_C
-          @status.command_buffer = ''
-          return
-        when Curses::KEY_CTRL_M
-          return @status.command_buffer[1..-1]
-        when Curses::KEY_BACKSPACE, Curses::KEY_CTRL_H, 127
-          if @status.command_buffer == "/"
-            return
+      when :escape
+        @pager.search_term = nil
+        @status.exit_command_mode!
+        @typing = false
+      else
+        if typing?
+          case key
+          when String
+            if key == "G" && @typing == :goto
+              execute_goto
+            else
+              @status.command_buffer << key
+            end
+          when :backspace then @status.command_buffer[-1..-1] = ""
+          when :enter
+            if @typing == :search
+              typed = @status.command_buffer
+              @pager.search(typed[1..-1], false, typed[0] == '?')
+            elsif @typing == :goto
+              execute_goto
+            end
+            @typing = false
+            @status.command_buffer = ""
           end
-          @status.command_buffer.chop!
         else
-          if ch.is_a?(String)
-            @status.command_buffer += ch
+          case key
+          when :down, 'j'
+            @pager.cursordown
+            after_navigation
+          when :up, '-', 'k'
+            @pager.cursorup
+            after_navigation
+          when *(0..9).to_a.map(&:to_s)
+            @status.command_buffer = key
+            @typing = :goto
+          when '['
+            history_back
+          when ']'
+            history_forward
+          when 's'
+            sha = @pager.blame_line.sha
+            Curses.close_screen
+            system("git -p --git-dir='#{@file_context.repo.path}' show #{sha} | less")
+          when '/', '?'
+            @status.command_buffer = key
+            @typing = :search
+          when 'n'
+            @pager.search(nil, true, false)
+            after_navigation
+          when 'N'
+            @pager.search(nil, true, true)
+            after_navigation
+          when 'q'
+            exit
           end
         end
-        @status.draw
       end
     end
+
+    def typing?
+      @status.command_buffer.size > 0
+    end
+
+    def execute_goto
+      if @status.command_buffer != ''
+        @pager.go_to(@status.command_buffer.to_i)
+      else
+        @pager.go_bottom
+      end
+      after_navigation
+    end
   end
 end
 

data/lib/git_spelunk/ui/pager.rb

@@ -3,56 +3,64 @@ require 'curses'
 ACTIVE_SHA_COLOR=1
 module GitSpelunk
   class UI
-    class PagerWindow < Window
+    class PagerWindow
+      ACTIVE_SHA_COLOR = ["#00ff00", "#000000"]
+      FOUND_COLOR = :reverse
+      CURRENT_COLOR = ["#000000", "#00ff00"]
+
       def initialize(height)
-        @window = Curses::Window.new(height, Curses.cols, 0, 0)
         @height = height
         @cursor = 1
         @top = 1
         @highlight_sha = true
       end
 
-      attr_accessor :data, :highlight_sha
-      attr_reader :cursor, :top
+      attr_accessor :data, :highlight_sha, :search_term
+      attr_reader :cursor, :top, :data
+
+      def blame_line
+        @data[@cursor - 1]
+      end
 
       def draw
-        @window.clear
-        @window.setpos(0,0)
+        styles = Dispel::StyleMap.new(@height)
+
         line_number_width = (data.size + 1).to_s.size
 
-        active_sha = data[@cursor - 1][0]
+        active_sha = blame_line.sha
+
+        view = Array.new(@height)
+
+        data[@top - 1,@height].each_with_index.map do |b, i|
+          line = view[i] = ""
+          sha, content = b.sha, b.content
 
-        data[@top - 1,@height].each_with_index do |b, i|
-          sha, content = *b
           line_number = i + @top
+          content_start = (sha.size + line_number_width + 2)
 
           if sha == active_sha && highlight_sha
-            @window.attron(Curses::color_pair(ACTIVE_SHA_COLOR))
+            styles.add(ACTIVE_SHA_COLOR, i, 0...999)
           end
 
+          sha_abbrev = sha[0..5]
           if @cursor == line_number
-            with_highlighting { @window.addstr(sha) }
-          else
-            @window.addstr(sha)
+            styles.add(CURRENT_COLOR, i, 0..(sha_abbrev.size - 1))
           end
 
-          @window.addstr(" %*s " % [line_number_width, line_number])
+          line << sha_abbrev
+
+          line << " %*s " % [line_number_width, line_number]
+          line << content
+
           if @search_term
-            content.split(/(#{@search_term})/).each do |t|
-              if t == @search_term
-                @window.attron(Curses::A_STANDOUT)
-              end
-              @window.addstr(t[0,line_remainder])
-              @window.attroff(Curses::A_STANDOUT)
+            Dispel::Tools.indexes(content, @search_term).each do |found|
+              found = content_start + found
+              styles.add(FOUND_COLOR, i, found...(found + @search_term.size))
             end
-          else
-            @window.addstr(content[0,line_remainder])
           end
-          @window.addstr("\n")
-          @window.attroff(Curses::color_pair(ACTIVE_SHA_COLOR))
-        end
-        @window.refresh
-        @window.setpos(0,0)
+        end.join("\n")
+
+        [view, styles]
       end
 
       attr_accessor :top
@@ -61,7 +69,7 @@ module GitSpelunk
       def find_next_index(term, start, reverse)
         i = start
         while i < data.size && i >= 0
-          if data[i][1] =~ /#{term}/
+          if data[i].content =~ /#{term}/
             return i
           end
           i += reverse ? -1 : 1
@@ -142,7 +150,6 @@ module GitSpelunk
         adjust_top!
       end
 
-
       def go_bottom
         @cursor = data.size
         @top = data.size - (@height - 1)

data/lib/git_spelunk/ui/repo.rb

@@ -1,32 +1,32 @@
 module GitSpelunk
   class UI
-    class RepoWindow < Window
-      def initialize(height, offset)
-        @window = Curses::Window.new(height, Curses.cols, offset, 0)
-        @offset = offset
+    class RepoWindow
+      attr_accessor :content, :command_mode, :command_buffer
+
+      def initialize(height)
         @height = height
-        @content = ""
+        self.content = ""
       end
 
-      attr_accessor :content, :command_mode, :command_buffer
-
       def draw
-        @window.setpos(0,0)
-        draw_status_line
-        @window.addstr(@content + "\n") if content
-        @window.addstr("\n" * (@height - @content.split("\n").size - 1))
-        @window.refresh
+        styles = Dispel::StyleMap.new(@height)
+        styles.add(:reverse, 0, 0..999)
+        view = [status_line] + content.split("\n")
+        view = Array.new(@height).each_with_index.map {|_,i| view[i] }
+        [view, styles]
       end
 
-      def draw_status_line
-        with_highlighting do
-          @window.addstr("navigation: j k CTRL-D CTRL-U   ")
-          @window.addstr("history: [ ]   ")
-          @window.addstr("search: / ? n N   ")
-          @window.addstr("git-show: s   ")
-          @window.addstr("quit: q   ")
-          @window.addstr(" " * line_remainder + "\n")
-        end
+      private
+
+      #with_highlighting do
+      def status_line
+        [
+          "navigation: j k CTRL-D CTRL-U",
+          "history: [ ]",
+          "search: / ? n N",
+          "git-show: s",
+          "quit: q"
+        ].join("  ")
       end
     end
   end

data/lib/git_spelunk/ui/status.rb

@@ -1,9 +1,7 @@
 module GitSpelunk
   class UI
-    class StatusWindow < Window
-      def initialize(height, offset)
-        @window = Curses::Window.new(height, Curses.cols, offset, 0)
-        @offset = offset
+    class StatusWindow
+      def initialize
         @command_buffer = ""
         @status_message = ""
         @onetime_message = nil
@@ -17,32 +15,24 @@ module GitSpelunk
 
       def set_onetime_message(message)
         @onetime_message = message
-        draw
       end
 
       def exit_command_mode!
         self.command_buffer = ""
       end
 
-      def set_cursor
-        Curses::stdscr.setpos(@offset, command_buffer.size + 1)
-      end
-
       def draw
-        @window.setpos(0,0)
-        if !command_buffer.empty?
-          Curses.curs_set(1)
-          @window.addstr(":" + command_buffer)
-          @window.addstr(" " * line_remainder)
+        styles = Dispel::StyleMap.new(1)
+
+        view = if command_buffer.size > 0
+          ":" + command_buffer
         else
-          Curses.curs_set(0)
-          with_highlighting do
-            @window.addstr(@onetime_message || @status_message)
-            @window.addstr(" " * line_remainder + "\n")
-          end
+          message = (@onetime_message || @status_message)
+          styles.add(:reverse, 0, 0...999)
+          message
         end
-        set_cursor
-        @window.refresh
+
+        [view, styles]
       end
     end
   end

data/lib/git_spelunk/version.rb

@@ -1,3 +1,3 @@
 module GitSpelunk
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_spelunk
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -25,6 +25,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dispel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: git-spelunk is a terminal based exploration tool for git blame and history,
   based on the notion of moving in history based on file context
 email:
@@ -38,6 +52,7 @@ files:
 - MIT-LICENSE.txt
 - bin/git-spelunk
 - 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
@@ -45,7 +60,6 @@ files:
 - lib/git_spelunk/ui/pager.rb
 - lib/git_spelunk/ui/repo.rb
 - lib/git_spelunk/ui/status.rb
-- lib/git_spelunk/ui/window.rb
 - lib/git_spelunk/version.rb
 homepage: https://github.com/osheroff/git-spelunk
 licenses:

data/lib/git_spelunk/ui/window.rb

@@ -1,19 +0,0 @@
-require 'curses'
-
-module GitSpelunk
-  class UI
-    class Window
-      def with_highlighting
-        @window.attron(Curses::A_STANDOUT)
-        yield
-      ensure
-        @window.attroff(Curses::A_STANDOUT)
-      end
-
-      def line_remainder
-        Curses.cols - @window.curx - 1
-      end
-    end
-  end
-end
-