fix_tsv_conflict 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 93f8545e521c8c3a0b91d53a8dc35eb2414d1da1a7bb8fc673e0a9697ec2d1b2
+  data.tar.gz: e410a589bfd588143133abc59092e2ccf820f01636424f43ea168db0e02680f7
+SHA512:
+  metadata.gz: f79e153a54393de55d5bba7f1bb985f12f7d4235081e54e588173d7b6063752ac19d49d21bc59f579e1668be005c766524087ff082657c82eaed3a7a3d424204
+  data.tar.gz: f259d5bc68b0ca3ff4359f53082b4edd180df68c29c5319b6d9384e3264c6869aea804c22a73c56c88fad594c4fd333ab9b40c78ee29e73b556c3882dd66e84d

data/.gitignore

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

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.5.0
+before_install: gem install bundler -v 1.16.1

data/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in fix_tsv_conflict.gemspec
+gemspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard :minitest, include: %w(test) do
+  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     {  |m| "test/#{m[1]}#{m[2]}_test.rb"}
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
+end

data/README.md

@@ -0,0 +1,33 @@
+# FixTSVConflict
+
+[![Build Status](https://travis-ci.org/a2ikm/fix_tsv_conflict.svg?branch=master)](https://travis-ci.org/a2ikm/fix_tsv_conflict)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'fix_tsv_conflict'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install fix_tsv_conflict
+
+## Usage
+
+    $ fix_tsv_conflict [<options>] <tsv>
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` 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/a2ikm/fix_tsv_conflict.

data/Rakefile

@@ -0,0 +1,10 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+task :default => :test

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "fix_tsv_conflict"
+
+# 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(__FILE__)

data/bin/setup

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

data/exec/fix_tsv_conflict

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require "fix_tsv_conflict"
+FixTSVConflict::CLI.new.run

data/fix_tsv_conflict.gemspec

@@ -0,0 +1,28 @@
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "fix_tsv_conflict/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "fix_tsv_conflict"
+  spec.version       = FixTSVConflict::VERSION
+  spec.authors       = ["Masato Ikeda"]
+  spec.email         = ["masato.ikeda@gmail.com"]
+
+  spec.summary       = %q{Fix git conflicts in TSV file.}
+  spec.description   = %q{Fix git conflicts in TSV file.}
+  spec.homepage      = "https://github.com/a2ikm/fix_tsv_conflict"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-minitest"
+end

data/lib/fix_tsv_conflict.rb

@@ -0,0 +1,11 @@
+require "fix_tsv_conflict/version"
+require "fix_tsv_conflict/cli"
+
+module FixTSVConflict
+  TAB = "\t"
+  LF  = "\n"
+
+  LEFT =  "<<<<<<<"
+  SEP   = "======="
+  RIGHT = ">>>>>>>"
+end

data/lib/fix_tsv_conflict/cli.rb

@@ -0,0 +1,47 @@
+require "fix_tsv_conflict/repairman"
+require "optparse"
+
+module FixTSVConflict
+  class CLI
+    def run(argv = ARGV)
+      path, options = handle_argv(argv)
+
+      source = File.read(path)
+      output =  Repairman.new.repair(source)
+
+      if options[:override]
+        File.open(path, "w") { |f| f.write(output) }
+      else
+        puts output
+      end
+    end
+
+    def handle_argv(argv)
+      options = {}
+      op = option_parser(options)
+      op.parse!(argv)
+
+      path = argv.shift
+      abort(op.help) if path.nil?
+
+      [path, options]
+    end
+
+    def option_parser(options)
+      OptionParser.new do |op|
+        op.banner = <<-BANNER
+Usage: #{executable} [<options>] <tsv>
+Options:
+        BANNER
+
+        op.on "-O", "--override", "Override source file" do
+          options[:override] = true
+        end
+      end
+    end
+
+    def executable
+      File.basename($0)
+    end
+  end
+end

data/lib/fix_tsv_conflict/diff_printer.rb

@@ -0,0 +1,51 @@
+module FixTSVConflict
+  class DiffPrinter
+    def initialize(stderr: $stderr)
+      @stderr = stderr
+      @left, @right = {}, {}
+    end
+
+    def print(cols, left, lbranch, right, rbranch)
+      @lbranch, @rbranch = lbranch, rbranch
+
+      left  = left.chomp.split(TAB)
+      right = right.chomp.split(TAB)
+
+      cols.each do |col, i|
+        l, r = left[i], right[i]
+        if l == r
+          flush_conflicts if in_conflict?
+          print_col_and_value(col, l)
+        else
+          @left[col]  = l
+          @right[col] = r
+        end
+      end
+
+      flush_conflicts
+    end
+
+    def flush_conflicts
+      @stderr.puts "#{LEFT} #{@lbranch}"
+      @left.each do |c, v|
+        print_col_and_value(c, v)
+      end
+      @stderr.puts SEP
+      @right.each do |c, v|
+        print_col_and_value(c, v)
+      end
+      @stderr.puts "#{RIGHT} #{@rbranch}"
+
+      @left.clear
+      @right.clear
+    end
+
+    def print_col_and_value(col, value)
+      @stderr.puts [col, value].join(TAB)
+    end
+
+    def in_conflict?
+      @left.length > 0 || @right.length > 0
+    end
+  end
+end

data/lib/fix_tsv_conflict/repairman.rb

@@ -0,0 +1,144 @@
+require "fix_tsv_conflict/diff_printer"
+
+module StringExt
+  BLANK_RE = /\A[[:space:]]*\z/
+  refine String do
+    def blank?
+      BLANK_RE === self
+    end
+  end
+end
+
+module FixTSVConflict
+  class Repairman
+    using StringExt
+
+    def initialize(stdin: $stdin, stderr: $stderr)
+      @stdin  = stdin
+      @stderr = stderr
+    end
+
+    def repair(source)
+      result = []
+      branch, left, right = nil, [], []
+
+      source.each_line.with_index do |line, i|
+        parse_header(line) if i.zero?
+        if branch
+          if line.start_with?(RIGHT)
+            @rbranch = line.chomp.split(" ").last
+            result += resolve(left, right)
+            branch = nil
+          elsif line.start_with?(SEP)
+            branch = right
+          else
+            branch << line
+          end
+        else
+          if line.start_with?(LEFT)
+            @lbranch = line.chomp.split(" ").last
+            branch = left
+          else
+            result << line
+          end
+        end
+      end
+      result.join
+    end
+
+    def resolve(left, right)
+      left  = index_by_id(left.reject(&:blank?))
+      right = index_by_id(right.reject(&:blank?))
+      (left.keys + right.keys).uniq.sort.map do |id|
+        l = left[id]
+        r = right[id]
+        if l && r
+          select(l, r)
+        else
+          l || r
+        end
+      end
+    end
+
+    def select(l, r)
+      selected = if l.rstrip == r.rstrip
+        pick_by_trailing_tabs(l, r)
+      else
+        prompt(l, r)
+      end
+    end
+
+    def prompt(l, r)
+      print_diff(l, r)
+      prompt_select(l, r)
+    end
+
+    def print_diff(l, r)
+      printer = DiffPrinter.new(stderr: @stderr)
+      printer.print(@cols, l, @lbranch, r, @rbranch)
+    end
+
+    def prompt_select(l, r)
+      text = <<-TEXT
+Which do you want keep?
+
+1) #{@lbranch}
+2) #{@rbranch}
+3) both of them
+
+Please enter 1, 2, or 3:
+      TEXT
+
+      @stderr.print text.chomp
+
+      loop do
+        case selected = @stdin.gets.strip
+        when "1"
+          break l
+        when "2"
+          break r
+        when "3"
+          break "#{LEFT} #{@lbranch}\n#{l}#{SEP}\n#{r}#{RIGHT} #{@rbranch}\n"
+        else
+          text = <<-TEXT
+Invalid input: #{selected}
+Please enter 1, 2, or 3:
+          TEXT
+          @stderr.print text.chomp
+        end
+      end
+    end
+
+    def index_by_id(lines)
+      result = {}
+      lines.each do |line|
+        id = line.split(TAB, 2).first
+        result[id] = line
+      end
+      result
+    end
+
+    def parse_header(line)
+      @cols = {}
+      line.chomp.split(TAB).each.with_index do |col, i|
+        @cols[col] = i
+      end
+      @tabs = @cols.length - 1
+    end
+
+    def pick_by_trailing_tabs(l, r)
+      ltabs = l.count(TAB)
+      rtabs = r.count(TAB)
+
+      if ltabs == @tabs
+        l
+      elsif rtabs == @tabs
+        r
+      else
+        # both are wrong.
+        # so this is a determistic picking.
+        ltabs < rtabs ? l : r
+      end
+    end
+  end
+end

data/lib/fix_tsv_conflict/version.rb

@@ -0,0 +1,3 @@
+module FixTSVConflict
+  VERSION = "0.1.0"
+end

metadata

@@ -0,0 +1,128 @@
+--- !ruby/object:Gem::Specification
+name: fix_tsv_conflict
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- Masato Ikeda
+autorequire: 
+bindir: exe
+cert_chain: []
+date: 2018-02-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !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: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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: guard-minitest
+  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'
+description: Fix git conflicts in TSV file.
+email:
+- masato.ikeda@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- Guardfile
+- README.md
+- Rakefile
+- bin/console
+- bin/setup
+- exec/fix_tsv_conflict
+- fix_tsv_conflict.gemspec
+- lib/fix_tsv_conflict.rb
+- lib/fix_tsv_conflict/cli.rb
+- lib/fix_tsv_conflict/diff_printer.rb
+- lib/fix_tsv_conflict/repairman.rb
+- lib/fix_tsv_conflict/version.rb
+homepage: https://github.com/a2ikm/fix_tsv_conflict
+licenses: []
+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.7.3
+signing_key: 
+specification_version: 4
+summary: Fix git conflicts in TSV file.
+test_files: []