git_spelunk 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzAyMWIwY2EzMjU2NWM1YTFmMDE3NDFkOTQzODg2ZmEwYzBiZDM5MQ==
+    YjQwOThjMDk4OGM4YjhjMTY2OWUxNDBjOTc4NGU1MzdjN2MxYzQ1MQ==
   data.tar.gz: !binary |-
-    Zjg4Nzg3ZDhkN2QwODAzOTQxY2Y2YTYzMWE0NWQ3NjE2ZjFiYjg1OQ==
+    MzA1ZGE4ZmJlMDY2OGRiZDhjZjgyZjNmNGFiZDJlMzFiMTQ5YWZmNQ==
 SHA512:
   metadata.gz: !binary |-
-    M2M4MjljMTM1ODMwMjZlZGY1YTFjOGNiODYxNWRjMGNmOTM2ZmFjZTU0NDc1
-    MDNlYWQxMzJlOTc2Njg1Y2EyMDMxNzI1YjZlYTVhODNhMjY4Yjg4ZDQyOGIy
-    OWUwODI5YzI2Mjg5N2E4YWI2ZWQxZWE2ZmExMDIxYzkwNzZlZmY=
+    YTgxODcyZTNkMTk5YmU0ODE4MDg5NjA0ZGVjNDNmNjQxMDAzMWI5ZmNlZWQ2
+    OTQ5MTAwMmFlOTA2N2ZkMmMxNWM4NDM0OTM0NTlhNTAxZGRmNjYxZGFhNDcw
+    MDFkODE1MzQwNzkxOGRjYzczMGRjYzRiZjMzYzk4OTE2MjM5OGM=
   data.tar.gz: !binary |-
-    NTUxYTYwZGZlNGM3MTIzMDIyY2EzMTI4ZTkwMzJjZWY2NjRlNTlhYzJmZGVm
-    OWQwMmVhYzZjYTAxNTRmMmJmZGFmMmNhYmE1NjY1YzYyMGY0M2NmOTU0YjFm
-    YWU5ZTc0M2YzYTlhYTk2ODIzMTI0NzU0NWYzOTNjMDUzMDA2MDg=
+    ODY2YTIxNTU5YzQ5ZDBmYjM1NGI2MWIxYzJiZGQzMWE5NGYyZTA5Mzk4ZjI0
+    MWEwNTYyM2Q0YzQ4YjNhYTM1NDYzMjJiNzU2YmM5MmY4N2ZlYzk5ODllMDQz
+    NmRmODM5M2YyMjMwZGIzM2M2ZDJhZWVjMDQxZGQwYmUzODdkMWI=

data/MIT-LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (C) 2013 Ben Osheroff <ben@zendesk.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/git-spelunk

@@ -1,6 +1,36 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require 'git_spelunk'
+require 'optparse'
 
-file_context = GitSpelunk::FileContext.new(ARGV[0], {:sha => ARGV[1], :line_number => ARGV[2]})
+def parse_options(argv)
+  options = {}
+  OptionParser.new do |opts|
+    opts.banner = <<-BANNER.gsub(/^ {6}/, "")
+      An interactive tool for exploring blame history.
+
+      Usage:
+          git-spelunk some_file.rb
+          git-spelunk some_file.rb:123
+
+      Options:
+    BANNER
+    opts.on("-s", "--sha SHA", String, "Start on this sha") { |sha| options[:sha] = sha }
+    opts.on("-h", "--help", "Show this.") { puts opts; exit }
+    opts.on("-v", "--version", "Show Version"){ puts GitSpelunk::VERSION; exit}
+  end.parse!(argv)
+  options
+end
+
+options = parse_options(ARGV)
+
+raise "Too many arguments" if ARGV.size != 1
+
+file = ARGV[0]
+
+file, line = file.split(':',2) if file.include?(':')
+options[:line_number] = line
+
+file_context = GitSpelunk::FileContext.new(file, options)
 ui = GitSpelunk::UI.new(file_context)
 ui.run

data/lib/git_spelunk/file_context.rb

@@ -12,7 +12,7 @@ module GitSpelunk
 
       @repo = options.fetch(:repo) do
         repo_directory = find_repo_from_file(file)
-        @file = file.sub(%r{^#{repo_directory}/}, '')
+        @file = File.expand_path(file).sub(%r{^#{repo_directory}/}, '')
         Grit::Repo.new(repo_directory)
       end
 
@@ -28,21 +28,12 @@ module GitSpelunk
 
     def get_line_for_sha_parent(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
+      o.line_number_to_parent
     end
 
     def find_repo_from_file(file)
       file = './' + file unless file.start_with?('/')
-      targets = file.split('/')
+      targets = File.expand_path(file).split('/')
       targets.pop
       while !File.directory?(targets.join("/") + "/.git")
         targets.pop

data/lib/git_spelunk/grit_patches.rb

@@ -5,5 +5,10 @@ if RUBY_VERSION >= "2.0.0"
     def getord(offset); self[offset].ord; end
   end
 
-  PACK_IDX_SIGNATURE = "\377tOc".force_encoding(Encoding::ASCII_8BIT)
+  begin
+    old, $VERBOSE = $VERBOSE, nil
+    PACK_IDX_SIGNATURE = "\377tOc".force_encoding(Encoding::ASCII_8BIT)
+  ensure
+    $VERBOSE = old
+  end
 end

data/lib/git_spelunk/offset.rb

@@ -59,13 +59,19 @@ module GitSpelunk
       @parent && (@chunks.nil? || target_chunk.nil?)
     end
 
+    def first_commit_for_file?
+
+    end
+
     def line_number_to_parent
-      return nil unless @parent && chunks
+      return :at_beginning_of_time unless @parent && chunks
       chunk = target_chunk(@line_number)
-      return nil unless chunk
+      return :unable_to_trace unless chunk
+
+      parent_starting_line, parent_total_lines = parent_start_and_total(stats_line(chunk))
+      return :first_commit_for_file if parent_starting_line == 0 && parent_total_lines == 0
 
       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), @line_number, chunk_starting_line, chunk_total_lines)
       parent_starting_line + parent_line_offset
     end
@@ -93,11 +99,11 @@ module GitSpelunk
     def src_start_and_total(line)
       # Get the offset and line number where lines were added
       # @@ -3,10 +3,17 @@ optionally a line\n   unchnaged_line_1\n-    deleted_line_1\n+    new_line_1"
-      line.scan(/\+(.*)@@/)[0][0].split(",").map {|str| str.to_i}
+      line.scan(/\+(\d+),(\d+)/).first.map { |str| str.to_i }
     end
 
     def parent_start_and_total(line)
-      line.scan(/\-(.*)\+/)[0][0].split(",").map {|str| str.to_i}
+      line.scan(/\-(\d+),(\d+)/).first.map { |str| str.to_i }
     end
 
     def find_parent_line_number(lines, src_line_number, src_starting_line, src_number_of_lines)
@@ -122,8 +128,9 @@ module GitSpelunk
       removals = additions = 0
       diff_index -= 1
 
-      while true
+      while diff_index > 0
         line = lines[diff_index]
+
         break unless ["-", "+"].include?(line[0])
 
         if parent_line?(line)

data/lib/git_spelunk/ui/repo.rb

@@ -14,7 +14,7 @@ module GitSpelunk
         @window.setpos(0,0)
         draw_status_line
         @window.addstr(@content + "\n") if content
-        @window.addstr("\n" * (@height - @content.split("\n").size - 2))
+        @window.addstr("\n" * (@height - @content.split("\n").size - 1))
         @window.refresh
       end
 
@@ -24,6 +24,7 @@ module GitSpelunk
           @window.addstr("history: [ ]   ")
           @window.addstr("search: / ? n N   ")
           @window.addstr("git-show: s   ")
+          @window.addstr("quit: q   ")
           @window.addstr(" " * line_remainder + "\n")
         end
       end

data/lib/git_spelunk/ui.rb

@@ -36,7 +36,7 @@ module GitSpelunk
     end
 
     def calculate_heights!
-      @repo_height = (Curses.lines.to_f * 0.20).to_i
+      @repo_height = [(Curses.lines.to_f * 0.20).to_i, 6].max
       @pager_height = Curses.lines  - @repo_height - 1
       @status_height = 1
     end
@@ -84,6 +84,44 @@ module GitSpelunk
       @status.clear_onetime_message!
     end
 
+    def history_back
+      @status.set_onetime_message("Rewinding...")
+      goto = @file_context.get_line_for_sha_parent(@pager.cursor)
+      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)
+        @pager.data = @file_context.get_blame
+        @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")
+      elsif goto == :first_commit_for_file
+        @status.set_onetime_message("At first appearance of file")
+      end
+    end
+
+    def history_forward
+      if @history.last
+        @file_context = @history.pop
+        @pager.data = @file_context.get_blame
+        @pager.go_to(@file_context.line_number)
+
+        @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
@@ -114,37 +152,9 @@ module GitSpelunk
         end
         after_navigation
       when '['
-        @status.set_onetime_message("Rewinding...")
-        goto = @file_context.get_line_for_sha_parent(@pager.cursor)
-        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)
-          @pager.data = @file_context.get_blame
-          @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
+        history_back
       when ']'
-        if @history.last
-          @file_context = @history.pop
-          @pager.data = @file_context.get_blame
-          @pager.go_to(@file_context.line_number)
-
-          @status.clear_onetime_message!
-          set_status_message
-
-          # force commit info update
-          @last_line = nil
-        end
+        history_forward
       when 's'
         @heartbeat = nil
         sha = @file_context.sha_for_line(@pager.cursor)
@@ -167,7 +177,7 @@ module GitSpelunk
       when 'N'
         @pager.search(nil, true, true)
         after_navigation
-      when 'q'
+      when 'q', Curses::KEY_CTRL_C
         exit
       end
     end

data/lib/git_spelunk/version.rb

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

data/lib/git_spelunk.rb

@@ -1,4 +1,4 @@
-require 'debugger'
+require 'git_spelunk/version'
 require 'git_spelunk/ui'
 require 'git_spelunk/file_context'
 require 'git_spelunk/offset'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_spelunk
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -35,19 +35,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/git_spelunk/file.rb
+- MIT-LICENSE.txt
+- bin/git-spelunk
+- lib/git_spelunk.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
 - lib/git_spelunk/ui/repo.rb
 - lib/git_spelunk/ui/status.rb
 - lib/git_spelunk/ui/window.rb
-- lib/git_spelunk/ui.rb
-- lib/git_spelunk.rb
-- bin/git-spelunk
+- lib/git_spelunk/version.rb
 homepage: https://github.com/osheroff/git-spelunk
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -62,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11

data/lib/git_spelunk/file.rb

@@ -1,25 +0,0 @@
-require 'grit'
-
-module GitSpelunk
-  class File
-    def initialize(filename, sha, line=1)
-      @filename = filename
-      @sha = sha
-      @line = line
-    end
-
-    def blame
-      [
-        ["abcdef", "content"],
-        ["abcdef", "content"],
-        ["abcdef", "content"],
-        ["abcdef", "content"],
-        ["abcdef", "content"]
-        ["abcdef", "content"]
-        ["abcdef", "content"]
-        ["abcdef", "content"]
-        ["abcdef", "content"]
-      ]
-    end
-  end
-end