git-conflict-blame 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aaa7463d1d1619c7f781cc98030ad29f1f453b9
-  data.tar.gz: 9c25a3bcd048ec63bc4cbf16536810d8ec90eaa1
+  metadata.gz: 648e9062a9e6437008a337c21b29105e904e6929
+  data.tar.gz: 870c341a8573536504db258ec892bf307ea20e16
 SHA512:
-  metadata.gz: 34d30c89566c7fd850656ebd56ae2e1467ba5f73447965f4005f663ad73b7a4b787c520ada3c2ae8564e3b9f506a18a776ac1f1a981e176a4dd4ec59b41f3ab5
-  data.tar.gz: 86cd0b99d0068c7039aad752f002f03a00bf1f433864849b3c83248ed47674ee9bf7c72fa38348838873382e23ba2f05d08380e0fe4a960d54daac3339ac8f7e
+  metadata.gz: 1fd508711a2cd336a46dc97990a0fbf71e630ecd1d93716bea0178a2d0ef3cde07d3dddcedea4eb37cd25435a840939776c225464888ced68040b6001ab28b5d
+  data.tar.gz: de7c8e123ffb1bce5b2b51a55921366d5f9c9da44c0c9c9d633ff1aabff709406f7ddda3c0987b3125489a81955e3e4402b18994c4d39187a083f0ce7e1b1060

data/README.md

@@ -1,5 +1,10 @@
 # Git Conflict Blame
 
+[![Gem Version](https://badge.fury.io/rb/git-conflict-blame.svg)](https://badge.fury.io/rb/git-conflict-blame)
+![](http://ruby-gem-downloads-badge.herokuapp.com/git-conflict-blame?type=total)
+[![Inline docs](http://inch-ci.org/github/eterry1388/git-conflict-blame.svg?branch=master)](http://inch-ci.org/github/eterry1388/git-conflict-blame)
+[![Dependency Status](https://gemnasium.com/eterry1388/git-conflict-blame.svg)](https://gemnasium.com/eterry1388/git-conflict-blame)
+
 Git command that shows the blame on the lines that are in conflict. This should be ran
 after a `git merge` command has been ran and there are files that are in conflict.
 
@@ -32,6 +37,7 @@ Try running one of these (depending on your OS):
 ```bash
 sudo apt-get install cmake
 yum install cmake
+dnf install cmake
 brew install cmake
 ```
 
@@ -45,7 +51,7 @@ nothing will be displayed.
 #### Run this:
 
 ```bash
-git conflict-blame
+git conflict-blame | more
 ```
 
 #### To see this:

data/lib/git-conflict-blame.rb

@@ -28,18 +28,33 @@ class GitConflictBlame
   def run!
     if conflicts?
       Dir.chdir( @repo.workdir )
-      log "#{conflicts.count} files are in conflict".red
+      @submodules = find_submodules
+      log "#{conflict_count} files are in conflict".red
       log "Parsing files to find out who is to blame..."
       data, total_conflicts = find_conflict_blames
+
       if total_conflicts == 0
-        log "All conflicts appear to be resolved".green
+        if conflict_count == 0
+          log "All conflicts appear to be resolved".green
+        else
+          log "\nThere are #{conflict_count} files in conflict that cannot be blamed:".red
+          remaining_conflicted_files = cmd( 'git diff --name-only --diff-filter=U' )
+          log remaining_conflicted_files
+          if @json
+            data = {}
+            remaining_conflicted_files.split( "\n" ).each do |file_name|
+              data[file_name] = 'conflict cannot be blamed'
+            end
+          end
+        end
       else
         log "#{total_conflicts} total conflicts found!\n".red
       end
+
       if @json
         json_data = {
           exception:   false,
-          file_count:  conflicts.count,
+          file_count:  conflict_count,
           total_count: total_conflicts,
           data:        data
         }
@@ -124,7 +139,17 @@ class GitConflictBlame
   #
   # @return [Array<String>]
   def conflicts
-    @conflicts ||= @repo.index.conflicts.map { |conflict| conflict[:ours][:path] }
+    @conflicts ||= @repo.index.conflicts.map do |conflict|
+      ours = conflict[:ours]
+      ours[:path] if ours
+    end.compact
+  end
+
+  # Gets the total number of files that are in conflict
+  #
+  # @return [Integer] Number of files in conflict
+  def conflict_count
+    @conflict_count ||= @repo.index.conflicts.count
   end
 
   # Runs the "git blame" command
@@ -135,35 +160,57 @@ class GitConflictBlame
     cmd( "git blame --show-email -c --date short #{filename}" )
   end
 
+  # Find all submodules in git repo
+  #
+  # @return [Array] List of submodule paths
+  def find_submodules
+    submodules = []
+    current_dir = Dir.pwd
+    Dir.chdir( @repo.workdir )
+    if File.exists?( '.gitmodules' )
+      submodules = cmd( "grep path .gitmodules | sed 's/.*= //'" ).split( "\n" )
+    end
+    Dir.chdir( current_dir )
+    submodules
+  end
+
   # Parses through the conflicted files and finds the blame on each line
   #
   # @return [Array] [data_hash, conflict_count]
   def find_conflict_blames
     data = {}
     total_conflicts = 0
+
     conflicts.each do |conflict|
-      raw = raw_blame( conflict )
-      start_indexes = []
-      end_indexes = []
-      lines = raw.split( "\n" )
-      lines.each do |line|
-        start_indexes << lines.index( line ) if line.include?( '<<<<<<<' )
-        end_indexes   << lines.index( line ) if line.include?( '>>>>>>>' )
-      end
+      begin
+        next if @submodules.include?( conflict )
+        raw = raw_blame( conflict )
+        start_indexes = []
+        end_indexes = []
+        lines = raw.split( "\n" )
+        lines.each do |line|
+          start_indexes << lines.index( line ) if line.include?( '<<<<<<<' )
+          end_indexes   << lines.index( line ) if line.include?( '>>>>>>>' )
+        end
 
-      index = 0
-      all_line_sets = []
-      start_indexes.count.times do
-        start_index = start_indexes[index]
-        end_index = end_indexes[index]
-        line_set = lines[start_index..end_index]
-        all_line_sets << parse_lines( line_set )
-        index += 1
+        index = 0
+        all_line_sets = []
+        start_indexes.count.times do
+          start_index = start_indexes[index]
+          end_index = end_indexes[index]
+          line_set = lines[start_index..end_index]
+          all_line_sets << parse_lines( line_set )
+          index += 1
+        end
+        total_conflicts += start_indexes.count
+        data[conflict] = all_line_sets
+      rescue ArgumentError
+        # Do nothing
+        # Caused by encoding issues like "invalid byte sequence in UTF-8"
       end
-      total_conflicts += start_indexes.count
-      data[conflict] = all_line_sets
     end
     data.delete_if { |_, all_line_sets| all_line_sets.nil? || all_line_sets.empty? }
+
     [data, total_conflicts]
   end
 

data/lib/git-conflict-blame/version.rb

@@ -1,3 +1,3 @@
 class GitConflictBlame
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-conflict-blame
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Eric Terry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Git Conflict Blame