git_spelunk 0.1.3 → 0.2.0

data/lib/git_spelunk/offset.rb

@@ -49,7 +49,7 @@ module GitSpelunk
     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(/(@@.*?@@.*?\n)/)
+      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

data/lib/git_spelunk/ui/pager.rb

@@ -57,25 +57,34 @@ module GitSpelunk
 
       attr_accessor :top
 
-      def search(term, skip_current_line)
-        @search_term = term
-        return unless term
-        save_cursor = @cursor
-        search_data = data.map { |d| d[1] }
-        initial_position = save_cursor - (skip_current_line ? 0 : 1)
-        search_data[initial_position..-1].each_with_index do |d, i|
-          if d =~ /#{term}/
-            go_to(initial_position + i + 1)
-            return
+      #returns position in data set, not cursor position
+      def find_next_index(term, start, reverse)
+        i = start
+        while i < data.size && i >= 0
+          if data[i][1] =~ /#{term}/
+            return i
           end
+          i += reverse ? -1 : 1
         end
+        nil
+      end
 
-        search_data[0..initial_position].each_with_index do |d, i|
-          if d =~ /#{term}/
-            go_to(i + 1)
-            return
-          end
+      def search(term, skip_current_line, reverse)
+        if term
+          @search_term = term
+        else
+          term = @search_term # nil indicates 'use-last-term'
+        end
+
+        search_from = @cursor - 1
+        if skip_current_line
+          search_from += reverse ? -1 : 1
         end
+
+        p = find_next_index(term, search_from, reverse) ||
+              find_next_index(term, reverse ? data.size - 1 : 0, reverse)
+
+        go_to(p + 1) if p
       end
 
       def bufbottom
@@ -121,6 +130,12 @@ module GitSpelunk
       end
 
       def go_to(l)
+        if l > @data.size
+          l = @data.size
+        elsif l < 1
+          l = 1
+        end
+
         previous_offset = @cursor - @top
         @cursor = l
         @top = @cursor - previous_offset

data/lib/git_spelunk/ui.rb

@@ -139,19 +139,21 @@ module GitSpelunk
         system("git -p --git-dir='#{@file_context.repo.path}' show #{sha} | less")
         Curses.stdscr.refresh
         [@pager, @repo, @status].each(&:draw)
-      when '/'
+      when '/', '?'
         @heartbeat = nil
-        @status.command_buffer = '/'
+        @status.command_buffer = key
         @status.draw
 
         line = getline
         if line
-          @search_string = line
-          @pager.search(@search_string, false)
+          @pager.search(line, false, key == '?')
         end
         @status.exit_command_mode!
       when 'n'
-        @pager.search(@search_string, true)
+        @pager.search(nil, true, false)
+        after_navigation
+      when 'N'
+        @pager.search(nil, true, true)
         after_navigation
       when 'q'
         exit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_spelunk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -28,7 +28,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ''
+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:
 - ben@zendesk.com
 - saroj@zendesk.com
@@ -47,7 +48,7 @@ files:
 - lib/git_spelunk/ui.rb
 - lib/git_spelunk.rb
 - bin/git-spelunk
-homepage: ''
+homepage: https://github.com/osheroff/git-spelunk
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -70,6 +71,6 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: ''
+summary: A git tool for exploring history and blame
 test_files: []
 has_rdoc: