git-conflict-blame 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a86c8e97cedc6efef883350c97235a1022bdcd5e
+  data.tar.gz: fce9caad34072ce10ccfb6fcf3409a8f3cc996f5
+SHA512:
+  metadata.gz: 0c2046509bf36923cd590742157f28da0ee731e48cb437fc791be52aebd14a6ee88ca2ca264b6db3fb76689b33b0a57a8d68eadeb97b19d502a04a4a351e1562
+  data.tar.gz: aab146a0103c4eee5d0b2e49bca2e3bc89b5215a6f621a7faf2ba6b87b7bfd5afd3650a1063a678eb8fed925462928585683ba1686cd7e98088ebf038e9c271b

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git-conflict-blame.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Eric Terry
+
+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/README.md

@@ -0,0 +1,41 @@
+# Git::Conflict::Blame
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/git/conflict/blame`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'git-conflict-blame'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git-conflict-blame
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/git-conflict-blame.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -0,0 +1,6 @@
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new( :spec )
+
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'git-conflict-blame'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/bin/git-conflict-blame

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+# This needs a lot of work.  It was VERY quickly slapped together!
+
+require 'git'
+require 'colorize'
+
+begin
+  git = Git.open( '.' )
+  status = git.status
+  changed = status.changed
+  unmerged = changed.select { |filename, data| data.stage.to_i == 3 }
+rescue Exception => e
+  puts 'Could not find valid GIT repo!'
+  exit 1
+end
+
+data = {}
+unmerged.keys.each do |filename|
+  raw = `git blame --show-email -c --date short #{filename}`
+
+  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_lines = []
+  start_indexes.count.times do
+    start_index = start_indexes[index]
+    end_index = end_indexes[index]
+    all_lines << lines[start_index..end_index]
+    index += 1
+  end
+
+  data[filename] = all_lines
+end
+
+data.delete_if { |_, all_lines| all_lines.nil? || all_lines.empty? }
+
+data.each do |filename, conflicts|
+  puts filename.green
+  conflicts.each do |lines|
+    lines.each do |line|
+      line_array = line.split( "\t" )
+
+      commit_id = line_array[0]
+      email     = line_array[1].delete( "(" )[0..30]
+      date      = line_array[2]
+
+      git_info = [commit_id, email, date]
+      raw_line = line_array[3..999].join( "\t" )
+      raw_line_array = raw_line.split( ")" )
+      line_number = raw_line_array.first
+      raw_line_string = raw_line_array[1..999].join( ")" )
+
+      formatted_git_info =  "\t%-10s %-30s %-13s" % git_info
+      if raw_line.include?( '<<<<<<<' ) || raw_line.include?( '>>>>>>>' )
+        raw_line_string = raw_line_string.red
+      elsif raw_line.include?( '=======' )
+        raw_line_string = raw_line_string.yellow
+      else
+        raw_line_string = raw_line_string.light_blue
+      end
+      puts "%s [%-22s]  %-s" % [formatted_git_info, line_number.bold, raw_line_string]
+      puts if raw_line.include?( '>>>>>>>' )
+    end
+  end
+end

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/git-conflict-blame.gemspec

@@ -0,0 +1,27 @@
+# coding: utf-8
+lib = File.expand_path( '../lib', __FILE__ )
+$LOAD_PATH.unshift( lib ) unless $LOAD_PATH.include?( lib )
+require 'git-conflict-blame/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'git-conflict-blame'
+  spec.version       = GitConflictBlame::VERSION
+  spec.authors       = ['Eric Terry']
+  spec.email         = ['eterry1388@aol.com']
+
+  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.license       = 'MIT'
+
+  spec.files         = `git ls-files -z`.split( "\x0" ).reject { |f| f.match( %r{^(test|spec|features)/} ) }
+  spec.executables   = spec.files.grep( %r{^bin/} ) { |f| File.basename( f ) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
+
+  spec.add_dependency 'git'
+  spec.add_dependency 'colorize'
+end

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

@@ -0,0 +1,3 @@
+module GitConflictBlame
+  VERSION = '0.1.0'
+end

data/lib/git-conflict-blame.rb

@@ -0,0 +1,4 @@
+require 'git-conflict-blame/version'
+
+module GitConflictBlame
+end

metadata

@@ -0,0 +1,129 @@
+--- !ruby/object:Gem::Specification
+name: git-conflict-blame
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- Eric Terry
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2015-10-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Git command that shows the blame on the lines that are in conflict
+email:
+- eterry1388@aol.com
+executables:
+- console
+- git-conflict-blame
+- setup
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rspec"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/console
+- bin/git-conflict-blame
+- bin/setup
+- git-conflict-blame.gemspec
+- lib/git-conflict-blame.rb
+- lib/git-conflict-blame/version.rb
+homepage: https://github.com/eterry1388/git-conflict-blame
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.4.8
+signing_key: 
+specification_version: 4
+summary: Git Conflict Blame
+test_files: []