git_spelunk 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a7fa06da8d61e779a69fb28667bf618cf067a15
-  data.tar.gz: 0e60161a7aea4de66fec9a6f64d7a164be6a4aba
+  metadata.gz: 1b01cdc9019c68eea06ac6c29c082825ca79fe38
+  data.tar.gz: 3b735af021fb4cc09e22ee3f27658094bf87c70f
 SHA512:
-  metadata.gz: 52d04a313b56ea8297514a270d62af51c10985cbc600361ad5e4ecf1ed603f312c41da7fd97a0e54fe7be2c2c1b1a52fe1253479ccb882b51ea0d8aad3af4424
-  data.tar.gz: 9841ab6897ab0bfbc3abbbee1cf59331591393cfc6a13f0d9ac60d2af3711cf8c25a4623b5b8a34d66d273d1160d01ed0120f12a5c4eaaf23cd7e3d054ebe153
+  metadata.gz: 977b086900391210e36e91eda889a68c9327ca0e84cab598dcc51ca071658f30163ac797f650e096fbd2e410e25f767d5a9b2cf13d24b53a912b9f1ccffc5a8a
+  data.tar.gz: 30d809b6d384b71491be31d48501f435ad2de9f8dd61cbdba87ca4ac80c7e016a7e5f832cd565316ae7d99724d289d01aa593293d99ac47683322612bbb38421

data/bin/git-spelunk

@@ -25,7 +25,8 @@ end
 
 options = parse_options(ARGV)
 
-raise "Too many arguments" if ARGV.size != 1
+raise "No filename specified. You must provide a file to blame-on." if ARGV.size == 0
+raise "Too many arguments" if ARGV.size > 1
 
 file = ARGV[0]
 
@@ -36,6 +37,14 @@ 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)
+begin
+  file_context = GitSpelunk::FileContext.new(file, options)
+
+  ui = GitSpelunk::UI.new(file_context)
+rescue GitSpelunk::EmptyBlame => e
+  $stderr.puts("No git information found for '#{file}'")
+  exit 1
+end
+
+
 #ui.run

data/lib/git_spelunk/blame.rb

@@ -1,35 +1,42 @@
 module GitSpelunk
   BlameLine = Struct.new(:line_number, :old_line_number, :sha, :commit, :filename, :content)
+  class EmptyBlame < StandardError ; end
   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
+      lines = []
+      commits = {}
+      commit_file_map = {}
+
+      raise EmptyBlame.new if output.empty?
+
+      split_output = output.split(/^(\w{40} \d+ \d+(?: \d+)?\n)/m)
+      split_output.shift if split_output.first.empty?
+
+      lines = split_output.each_slice(2).map do |sha_line, rest|
+        sha_split = sha_line.split(' ')
+
+        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
+
+        if rest =~ /^filename (.*)$/
+          commit_file_map[sha] = $1
+        end
+
+        data = rest.split("\n").detect { |l| l[0] == "\t" }[1..-1]
+        { :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
 
-      # 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])
+      @lines = lines.map do |hash|
+        GitSpelunk::BlameLine.new(hash[:line_number], hash[:old_line_number], hash[:sha], commits[hash[:sha]], hash[:filename], hash[:data])
       end
-      @lines = final
     end
   end
 end

data/lib/git_spelunk/offset.rb

@@ -113,9 +113,10 @@ module GitSpelunk
         last_old_block = blocks.last
 
         if last_old_block.type == " "
+          # if the previous context existed in both, just go to the end of that.
           last_old_block.offset + (last_old_block.size - 1)
         else
-          # offset N lines into last block, but don't go beyond the edge of it.
+          # offset N lines into the block that was removed to create the target block, but don't go beyond the edge of it.
           last_old_block.offset + [addition_block.size - 1, last_old_block.size].min
         end
       end

data/lib/git_spelunk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_spelunk
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A git tool for exploring history and blame