git-conflict-blame 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba336c946c4cfd3a24b327810946ca95f230a19
-  data.tar.gz: 004e24d928ccda8fa28619570adb9b94efc6e33c
+  metadata.gz: 2aaa7463d1d1619c7f781cc98030ad29f1f453b9
+  data.tar.gz: 9c25a3bcd048ec63bc4cbf16536810d8ec90eaa1
 SHA512:
-  metadata.gz: 42e753b8727d85da20f2b82f06066e60b9ff3449279685e7f33e9f51a2ae390dcdd314cf25442627a7ca9c9c3c73c5989cb92e89763dbbb211b06af28989fed8
-  data.tar.gz: ea9af7d55fd4bfee8594e080cae3d4c90c84b0f4b5fbc6500f849f44ff448e3dd582c12c1cd30e5252e13f854b4c90e7892e1ad8d11220582d4867873d46ab0d
+  metadata.gz: 34d30c89566c7fd850656ebd56ae2e1467ba5f73447965f4005f663ad73b7a4b787c520ada3c2ae8564e3b9f506a18a776ac1f1a981e176a4dd4ec59b41f3ab5
+  data.tar.gz: 86cd0b99d0068c7039aad752f002f03a00bf1f433864849b3c83248ed47674ee9bf7c72fa38348838873382e23ba2f05d08380e0fe4a960d54daac3339ac8f7e

data/README.md

@@ -27,10 +27,12 @@ libraries and/or headers.  Check the mkmf.log file for more details.  You may
 need configuration options.
 ```
 
-Try running this (if you are on a Debian-based OS):
+Try running one of these (depending on your OS):
 
 ```bash
 sudo apt-get install cmake
+yum install cmake
+brew install cmake
 ```
 
 ## Usage
@@ -49,8 +51,10 @@ git conflict-blame
 #### To see this:
 
 ```
-1 files in conflict found!
+2 files are in conflict
 Parsing files to find out who is to blame...
+2 total conflicts found!
+
 app.rb
   00000000   not.committed.yet              2015-10-15    [7     ]  <<<<<<< HEAD
   ad3e1b25   bob.fred@example.com           2015-10-15    [8     ]  output = add( 5, 6 
@@ -78,7 +82,7 @@ git conflict-blame --json
 #### To see this:
 
 ```json
-{"exception":false,"count":1,"data":{"app.rb":[[{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":7,"line_content":"<<<<<<< HEAD"},{"commit_id":"ad3e1b25","email":"bob.fred@example.com","date":"2015-10-15","line_number":8,"line_content":"output = add( 5, 6 "},{"commit_id":"ad3e1b25","email":"bob.fred@example.com","date":"2015-10-15","line_number":9,"line_content":"puts output"},{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":10,"line_content":"======="},{"commit_id":"b8fb28f1","email":"bob.fred@example.com","date":"2015-10-15","line_number":11,"line_content":"puts add( 5, 6 "},{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":12,"line_content":">>>>>>> master"}]]}}
+{"exception":false,"file_count":1,"total_count":1,"data":{"app.rb":[[{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":7,"line_content":"<<<<<<< HEAD"},{"commit_id":"ad3e1b25","email":"bob.fred@example.com","date":"2015-10-15","line_number":8,"line_content":"output = add( 5, 6 "},{"commit_id":"ad3e1b25","email":"bob.fred@example.com","date":"2015-10-15","line_number":9,"line_content":"puts output"},{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":10,"line_content":"======="},{"commit_id":"b8fb28f1","email":"bob.fred@example.com","date":"2015-10-15","line_number":11,"line_content":"puts add( 5, 6 "},{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":12,"line_content":">>>>>>> master"}]]}}
 ```
 
 ### To output pretty machine-readable data
@@ -94,7 +98,8 @@ git conflict-blame --json --pretty
 ```json
 {
   "exception": false,
-  "count": 1,
+  "file_count": 1,
+  "total_count": 1,
   "data": {
     "app.rb": [
       [

data/git-conflict-blame.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Git Conflict Blame'
   spec.description   = 'Git command that shows the blame on the lines that are in conflict'
-  spec.homepage      = 'https://github.com/eterry1388/git-conflict-blame'
+  spec.homepage      = 'http://eterry1388.github.io/git-conflict-blame'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split( "\x0" ).reject { |f| f.match( %r{^(test|spec|features)/} ) }

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

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

data/lib/git-conflict-blame.rb

@@ -26,20 +26,29 @@ class GitConflictBlame
 
   # Actually performs the conflict blame
   def run!
-    Dir.chdir( @repo.workdir )
-    raise GitError, 'No conflicts found' unless conflicts?
-    log "#{conflicts.count} files in conflict found!".red
-    log "Parsing files to find out who is to blame..."
-    data = find_conflict_blames
-    if @json
-      json_data = {
-        exception: false,
-        count:     conflicts.count,
-        data:      data
-      }
-      output_json( json_data )
+    if conflicts?
+      Dir.chdir( @repo.workdir )
+      log "#{conflicts.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
+      else
+        log "#{total_conflicts} total conflicts found!\n".red
+      end
+      if @json
+        json_data = {
+          exception:   false,
+          file_count:  conflicts.count,
+          total_count: total_conflicts,
+          data:        data
+        }
+        output_json( json_data )
+      else
+        display_results( data )
+      end
     else
-      display_results( data )
+      log 'No conflicts found'.green
     end
   rescue GitError => e
     log_error( e )
@@ -128,9 +137,10 @@ class GitConflictBlame
 
   # Parses through the conflicted files and finds the blame on each line
   #
-  # @return [Hash]
+  # @return [Array] [data_hash, conflict_count]
   def find_conflict_blames
     data = {}
+    total_conflicts = 0
     conflicts.each do |conflict|
       raw = raw_blame( conflict )
       start_indexes = []
@@ -150,10 +160,11 @@ class GitConflictBlame
         all_line_sets << parse_lines( line_set )
         index += 1
       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
+    [data, total_conflicts]
   end
 
   # Iterates through a line set and parses them

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-conflict-blame
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Eric Terry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ files:
 - lib/git-conflict-blame.rb
 - lib/git-conflict-blame/exceptions.rb
 - lib/git-conflict-blame/version.rb
-homepage: https://github.com/eterry1388/git-conflict-blame
+homepage: http://eterry1388.github.io/git-conflict-blame
 licenses:
 - MIT
 metadata: {}