fix_tsv_conflict 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb0ced2121afe878ea9dcbdcf17ce08560341027047494f7a3ec51f3bdeaac3
-  data.tar.gz: 32d3363b7f894d6356624bc894a18552d54e63df7094ea65c7a8898ec1e36658
+  metadata.gz: 073b4ff002e1a394af88ca8d2415786d8ee40c69c77af3741bbedc1585f5cd52
+  data.tar.gz: ab701259a3360cef72e8d37c0f9bed15c0bc6abcb1ff178afa1392d9f965f443
 SHA512:
-  metadata.gz: c2d320c077a00c9cae3c013eddde5fb6dd1721568df8bbb7e3afcd16fb9f99f20c332bd20b7f8c0108a3fbdca16ef1d9ac28aa83d666059fce45b89aec7065fb
-  data.tar.gz: 4fc7b148692e8f96f9308d90866945aebd9ceee6ec2019f819f70d81bfb6e6f210ce8eef4e11ce13428530d6b9aaa54461a6ac06eb97246eb6d9e96ebdb5d62e
+  metadata.gz: 6ab5861f20e17388137f1c3a83c03b6c13e05bc0865e80894557849c701379f9ac9e9c56ed73b96102447b431758d01f8da0366f67531f9b9ac9b618f26ed0e1
+  data.tar.gz: bf957e7a2d6614b233cc7e0769a1130f8c6b0f32523761546947e2d7b3f399e2461633d90fbddf2698fafc7c998ae540db71ecf2f1c25b3c7181307190f56be4

data/Guardfile

@@ -1,4 +1,4 @@
-guard :minitest, include: %w(test) do
+guard :minitest, include: %w(test), all_after_pass: true 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' }

data/lib/fix_tsv_conflict/conflict.rb

@@ -0,0 +1,30 @@
+module FixTSVConflict
+  class Conflict
+    attr_reader :left, :lbranch, :right, :rbranch
+
+    def initialize(left, lbranch, right, rbranch)
+      @left = left
+      @lbranch = lbranch
+      @right = right
+      @rbranch = rbranch
+    end
+
+    ID_REGEXP = /\A[0-9]+\t/
+    NL_REGEXP = /\A\n/
+
+    def valid?
+      left.all? { |line| ID_REGEXP =~ line || NL_REGEXP =~ line} &&
+        right.all? { |line| ID_REGEXP =~ line || NL_REGEXP =~ line }
+    end
+
+    def to_a
+      result = []
+      result << "#{LEFT} #{lbranch}\n"
+      result += left
+      result << "#{SEP}\n"
+      result += right
+      result << "#{RIGHT} #{rbranch}\n"
+      result
+    end
+  end
+end

data/lib/fix_tsv_conflict/repairman.rb

@@ -1,48 +1,46 @@
-require "fix_tsv_conflict/diff_printer"
+require "fix_tsv_conflict/conflict"
 require "fix_tsv_conflict/logging"
+require "fix_tsv_conflict/resolver"
 
 module FixTSVConflict
   class Repairman
     include Logging
 
-    BLANK_RE = /\A[[:space:]]*\z/
-    using Module.new {
-      refine String do
-        def blank?
-          BLANK_RE === self
-        end
-      end
-    }
-
-    attr_reader :stderr
+    attr_reader :stdin, :stderr
 
     def initialize(stdin: $stdin, stderr: $stderr)
       @stdin  = stdin
       @stderr = stderr
     end
 
+    def resolver
+      @resolver ||= Resolver.new(stdin: stdin, stderr: stderr)
+    end
+
     def repair(source)
       result = []
-      branch, left, right = nil, [], []
+      branch = nil
+      left,  lbranch = [], nil
+      right, rbranch = [], 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
-            left.clear
-            right.clear
-          elsif line.start_with?(SEP)
-            branch = right
-          else
-            branch << line
-          end
+        if i.zero?
+          load_tabs_count(line)
+          result << line
+        elsif line.start_with?(LEFT)
+          lbranch = line.chomp.split(" ").last
+          branch = left
+        elsif line.start_with?(SEP)
+          branch = right
+        elsif line.start_with?(RIGHT)
+          rbranch = line.chomp.split(" ").last
+          result += handle(left, lbranch, right, rbranch)
+          branch = nil
+          left.clear
+          right.clear
         else
-          if line.start_with?(LEFT)
-            @lbranch = line.chomp.split(" ").last
-            branch = left
+          if branch
+            branch << line
           else
             result << line
           end
@@ -51,130 +49,31 @@ module FixTSVConflict
       result.join
     end
 
-    def resolve(left, right)
-      print_conflicts(left, right)
-      result = resolve_conflicts(left, right)
+    def load_tabs_count(header)
+      resolver.tabs = header.count(TAB)
+    end
+
+    def handle(left, lbranch, right, rbranch)
+      conflict = Conflict.new(left, lbranch, right, rbranch)
+      print_conflict(conflict)
+      result = resolver.resolve(conflict)
       print_result(result)
       result
     end
 
-    def print_conflicts(left, right)
-      warn "A conflict found:"
+    def print_conflict(conflict)
+      info "Found a conflict:"
       blank
-      dump "#{LEFT} #{@lbranch}"
-      dump left
-      dump SEP
-      dump right
-      dump "#{RIGHT} #{@rbranch}"
+      dump conflict.to_a
       blank
     end
 
     def print_result(result)
-      notice "The conflict was fixed to:"
+      notice "Resolved to:"
       blank
       dump result
       blank
       blank
     end
-
-    def resolve_conflicts(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)
-      log "Diff by columns:"
-      blank
-      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}
-  k) keep as is
-
-Please enter 1, 2, or k:
-      TEXT
-
-      info text.chomp, no_newline: true
-
-      loop do
-        case selected = @stdin.gets.strip
-        when "1"
-          break l
-        when "2"
-          break r
-        when "k"
-          break "#{LEFT} #{@lbranch}\n#{l}#{SEP}\n#{r}#{RIGHT} #{@rbranch}\n"
-        else
-          text = <<-TEXT
-Invalid input: #{selected}
-Please enter 1, 2, or k:
-          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)
-      info "Trailing tab conflicts were fixed automatically."
-
-      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/resolver.rb

@@ -0,0 +1,111 @@
+require "fix_tsv_conflict/logging"
+
+module FixTSVConflict
+  class Resolver
+    include Logging
+
+    BLANK_RE = /\A[[:space:]]*\z/
+    using Module.new {
+      refine String do
+        def blank?
+          BLANK_RE === self
+        end
+      end
+    }
+
+    attr_reader :stdin, :stderr
+    attr_accessor :tabs
+
+    def initialize(stdin: $stdin, stderr: $stderr)
+      @stdin  = stdin
+      @stderr = stderr
+
+      @tabs = 0
+    end
+
+    def resolve(conflict)
+      unless conflict.valid?
+        return conflict.to_a
+      end
+
+      result = try(conflict)
+      if result
+        return result
+      end
+
+      warn "Failed to resolve it automatically."
+      select(conflict)
+    end
+
+    def try(conflict)
+      result = []
+      left  = index_by_id(conflict.left.reject(&:blank?))
+      right = index_by_id(conflict.right.reject(&:blank?))
+      (left.keys + right.keys).uniq.sort.each do |id|
+        l = left[id]
+        r = right[id]
+        if l && r
+          if l.rstrip == r.rstrip
+            result << pick_by_tabs(l, r)
+          else
+            return false
+          end
+        else
+          result << (l || r)
+        end
+      end
+      result
+    end
+
+    def select(conflict)
+      text = <<-TEXT
+Which do you want keep?
+
+  1) #{conflict.lbranch}
+  2) #{conflict.rbranch}
+  k) keep as is
+
+      TEXT
+
+      info text
+
+      loop do
+        info "Please enter 1, 2, or k: ", no_newline: true
+        case selected = stdin.gets.strip
+        when "1"
+          return conflict.left
+        when "2"
+          return conflict.right
+        when "k"
+          return conflict.to_a
+        else
+          info "Invalid input: #{selected}"
+        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 pick_by_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

@@ -1,3 +1,3 @@
 module FixTSVConflict
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix_tsv_conflict
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Masato Ikeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,9 +100,10 @@ files:
 - 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/conflict.rb
 - lib/fix_tsv_conflict/logging.rb
 - lib/fix_tsv_conflict/repairman.rb
+- lib/fix_tsv_conflict/resolver.rb
 - lib/fix_tsv_conflict/version.rb
 homepage: https://github.com/a2ikm/fix_tsv_conflict
 licenses: []

data/lib/fix_tsv_conflict/diff_printer.rb

@@ -1,53 +0,0 @@
-require "fix_tsv_conflict/logging"
-
-module FixTSVConflict
-  class DiffPrinter
-    include Logging
-
-    attr_reader :stderr
-
-    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?
-          dump [col, l].join(TAB)
-        else
-          @left[col]  = l
-          @right[col] = r
-        end
-      end
-
-      flush_conflicts
-    end
-
-    def flush_conflicts
-      dump "#{LEFT} #{@lbranch}"
-      dump @left.map { |c, v| [c, v].join(TAB) }
-      dump SEP
-      dump @right.map { |c, v| [c, v].join(TAB) }
-      dump "#{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