fix_tsv_conflict 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39959f31c8ffbe3f09d65b53322d9b62495a5c5d158785799c05b16e683ce880
-  data.tar.gz: 7618bd91f585debc4412b75e361c7ef941ca06e45d83468f528acfb98d06c6c1
+  metadata.gz: 12a3eebf2e9fbb66575328fac1d2ed5d1906b11ccfd5a976274a0792f082fede
+  data.tar.gz: 1d1a70a9ef7cd54d7738efad099eab4869f566543246d5e0e2d2d390064c35cf
 SHA512:
-  metadata.gz: 3697049d53e66266a2891cc1c2b33caa0b5d764939f5141b79a6d86f295f29f68895d573eed6c80f25a4a203ae0d4f8a096149e48909ce50ee8ec041a9150c5e
-  data.tar.gz: 335b32f5d964de1b081ab90fad33d1f5092f005b9435c01ac91a9f31ef2028b76aef83cfd6e803f14e53a56c8f03d2a006adad09b4774a84e1eb83643ee1c407
+  metadata.gz: 570eb1a1be0da2bf5e4a6f808d240012a7924ee30d7a01a196284042071f5acf87f1a699030bffc75c459e0470ce343545e9c114ee51c4ac4bd9b550e1b1dffd
+  data.tar.gz: 7899b9a3c97386701ac7c083045929f809f3a5243072604dffdc3569a1042d9199db020b97d7088ce8ca6c5f006ad3e780f6e2288b64f0f4344a195a3791e754

data/lib/fix_tsv_conflict/logging.rb

@@ -1,12 +1,8 @@
+require "fix_tsv_conflict/refinements/colored_string"
+
 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
-    }
+    using Refinements::ColoredString
 
     def log(message, **options)
       if options[:no_newline]
@@ -34,7 +30,7 @@ module FixTSVConflict
 
     def dump(lines, **options)
       Array(lines).each do |line|
-        log line.gsub(/^/, "  "), options
+        log line.gsub(/^/, "  ").gsub("\t") { |m| m.bg_cyan }, options
       end
     end
 

data/lib/fix_tsv_conflict/refinements/blank.rb

@@ -0,0 +1,13 @@
+module FixTSVConflict
+  module Refinements
+    module Blank
+      BLANK_RE = /\A[[:space:]]*\z/
+
+      refine String do
+        def blank?
+          BLANK_RE === self
+        end
+      end
+    end
+  end
+end

data/lib/fix_tsv_conflict/refinements/colored_string.rb

@@ -0,0 +1,17 @@
+module FixTSVConflict
+  module Refinements
+    module ColoredString
+      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
+        def cyan;   "\e[36m#{self}\e[0m"; end
+
+        def bg_red;    "\e[41m#{self}\e[0m"; end
+        def bg_green;  "\e[42m#{self}\e[0m"; end
+        def bg_yellow; "\e[43m#{self}\e[0m"; end
+        def bg_cyan;   "\e[46m#{self}\e[0m"; end
+      end
+    end
+  end
+end

data/lib/fix_tsv_conflict/resolver.rb

@@ -1,17 +1,10 @@
 require "fix_tsv_conflict/logging"
+require "fix_tsv_conflict/refinements/blank"
 
 module FixTSVConflict
   class Resolver
     include Logging
-
-    BLANK_RE = /\A[[:space:]]*\z/
-    using Module.new {
-      refine String do
-        def blank?
-          BLANK_RE === self
-        end
-      end
-    }
+    using Refinements::Blank
 
     attr_reader :stdin, :stderr
     attr_accessor :tabs

data/lib/fix_tsv_conflict/version.rb

@@ -1,3 +1,3 @@
 module FixTSVConflict
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fix_tsv_conflict
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Masato Ikeda
@@ -102,6 +102,8 @@ files:
 - lib/fix_tsv_conflict/cli.rb
 - lib/fix_tsv_conflict/conflict.rb
 - lib/fix_tsv_conflict/logging.rb
+- lib/fix_tsv_conflict/refinements/blank.rb
+- lib/fix_tsv_conflict/refinements/colored_string.rb
 - lib/fix_tsv_conflict/repairman.rb
 - lib/fix_tsv_conflict/resolver.rb
 - lib/fix_tsv_conflict/version.rb