fix_tsv_conflict 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f8545e521c8c3a0b91d53a8dc35eb2414d1da1a7bb8fc673e0a9697ec2d1b2
-  data.tar.gz: e410a589bfd588143133abc59092e2ccf820f01636424f43ea168db0e02680f7
+  metadata.gz: 4dabd984b3240e512b940afbf709307460a67cd44eb2eebb664d6529491e30b0
+  data.tar.gz: 70996a3970ec15d951b7a933a54793321abbaa2aab52d3acb49c8903815cfec6
 SHA512:
-  metadata.gz: f79e153a54393de55d5bba7f1bb985f12f7d4235081e54e588173d7b6063752ac19d49d21bc59f579e1668be005c766524087ff082657c82eaed3a7a3d424204
-  data.tar.gz: f259d5bc68b0ca3ff4359f53082b4edd180df68c29c5319b6d9384e3264c6869aea804c22a73c56c88fad594c4fd333ab9b40c78ee29e73b556c3882dd66e84d
+  metadata.gz: 4d13b237f98344c21a4390ea2a4781dd681ca4a8fb125e728475214f7c72356e091e23427f1def23ea117ea46b363592c5dc05ff79eafd29f6c9426b6e24d232
+  data.tar.gz: f006c0262ab4f1088e2f1d66b15957a8dc8832d8440d3ed19ce5a24aea084902571fc38b1104d75b1789675f33990df880d6acef3f3854a2fd582122a956fa23

data/.travis.yml

@@ -3,3 +3,5 @@ language: ruby
 rvm:
   - 2.5.0
 before_install: gem install bundler -v 1.16.1
+notifications:
+  email: false

data/lib/fix_tsv_conflict/diff_printer.rb

@@ -1,5 +1,11 @@
+require "fix_tsv_conflict/logging"
+
 module FixTSVConflict
   class DiffPrinter
+    include Logging
+
+    attr_reader :stderr
+
     def initialize(stderr: $stderr)
       @stderr = stderr
       @left, @right = {}, {}
@@ -15,7 +21,7 @@ module FixTSVConflict
         l, r = left[i], right[i]
         if l == r
           flush_conflicts if in_conflict?
-          print_col_and_value(col, l)
+          dump [col, l].join(TAB)
         else
           @left[col]  = l
           @right[col] = r
@@ -26,15 +32,11 @@ module FixTSVConflict
     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}"
+      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

data/lib/fix_tsv_conflict/logging.rb

@@ -0,0 +1,45 @@
+module FixTSVConflict
+  module Logging
+    using Module.new {
+      refine String do
+        def red;    "\e[31m#{self}\e[0m"; end
+        def green;  "\e[32m#{self}\e[0m"; end
+        def yellow; "\e[33m#{self}\e[0m"; end
+      end
+    }
+
+    def log(message, **options)
+      if options[:no_newline]
+        stderr.print message.chomp
+      else
+        stderr.puts message
+      end
+    end
+
+    def info(message, **options)
+      log message, options
+    end
+
+    def error(message, **options)
+      log message.to_s.red
+    end
+
+    def warn(message, **options)
+      log message.to_s.yellow
+    end
+
+    def notice(message, **options)
+      log message.to_s.green
+    end
+
+    def dump(lines, **options)
+      Array(lines).each do |line|
+        log line.gsub(/^/, "  "), options
+      end
+    end
+
+    def blank
+      stderr.puts
+    end
+  end
+end

data/lib/fix_tsv_conflict/repairman.rb

@@ -1,4 +1,5 @@
 require "fix_tsv_conflict/diff_printer"
+require "fix_tsv_conflict/logging"
 
 module StringExt
   BLANK_RE = /\A[[:space:]]*\z/
@@ -11,8 +12,12 @@ end
 
 module FixTSVConflict
   class Repairman
+    include Logging
     using StringExt
 
+
+    attr_reader :stderr
+
     def initialize(stdin: $stdin, stderr: $stderr)
       @stdin  = stdin
       @stderr = stderr
@@ -29,6 +34,8 @@ module FixTSVConflict
             @rbranch = line.chomp.split(" ").last
             result += resolve(left, right)
             branch = nil
+            left.clear
+            right.clear
           elsif line.start_with?(SEP)
             branch = right
           else
@@ -47,6 +54,32 @@ module FixTSVConflict
     end
 
     def resolve(left, right)
+      print_conflicts(left, right)
+      result = resolve_conflicts(left, right)
+      print_result(result)
+      result
+    end
+
+    def print_conflicts(left, right)
+      warn "A conflict found:"
+      blank
+      dump "#{LEFT} #{@lbranch}"
+      dump left
+      dump SEP
+      dump right
+      dump "#{RIGHT} #{@rbranch}"
+      blank
+    end
+
+    def print_result(result)
+      notice "The conflict was fixed 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|
@@ -74,22 +107,25 @@ module FixTSVConflict
     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}
-3) both of them
+  1) #{@lbranch}
+  2) #{@rbranch}
+  k) keep as is
 
-Please enter 1, 2, or 3:
+Please enter 1, 2, or k:
       TEXT
 
-      @stderr.print text.chomp
+      info text.chomp, no_newline: true
 
       loop do
         case selected = @stdin.gets.strip
@@ -97,12 +133,12 @@ Please enter 1, 2, or 3:
           break l
         when "2"
           break r
-        when "3"
+        when "k"
           break "#{LEFT} #{@lbranch}\n#{l}#{SEP}\n#{r}#{RIGHT} #{@rbranch}\n"
         else
           text = <<-TEXT
 Invalid input: #{selected}
-Please enter 1, 2, or 3:
+Please enter 1, 2, or k:
           TEXT
           @stderr.print text.chomp
         end
@@ -127,6 +163,8 @@ Please enter 1, 2, or 3:
     end
 
     def pick_by_trailing_tabs(l, r)
+      info "Trailing tab conflicts were fixed automatically."
+
       ltabs = l.count(TAB)
       rtabs = r.count(TAB)
 

data/lib/fix_tsv_conflict/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix_tsv_conflict
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Masato Ikeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,7 @@ files:
 - lib/fix_tsv_conflict.rb
 - lib/fix_tsv_conflict/cli.rb
 - lib/fix_tsv_conflict/diff_printer.rb
+- lib/fix_tsv_conflict/logging.rb
 - lib/fix_tsv_conflict/repairman.rb
 - lib/fix_tsv_conflict/version.rb
 homepage: https://github.com/a2ikm/fix_tsv_conflict