fix_tsv_conflict 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073b4ff002e1a394af88ca8d2415786d8ee40c69c77af3741bbedc1585f5cd52
-  data.tar.gz: ab701259a3360cef72e8d37c0f9bed15c0bc6abcb1ff178afa1392d9f965f443
+  metadata.gz: 39959f31c8ffbe3f09d65b53322d9b62495a5c5d158785799c05b16e683ce880
+  data.tar.gz: 7618bd91f585debc4412b75e361c7ef941ca06e45d83468f528acfb98d06c6c1
 SHA512:
-  metadata.gz: 6ab5861f20e17388137f1c3a83c03b6c13e05bc0865e80894557849c701379f9ac9e9c56ed73b96102447b431758d01f8da0366f67531f9b9ac9b618f26ed0e1
-  data.tar.gz: bf957e7a2d6614b233cc7e0769a1130f8c6b0f32523761546947e2d7b3f399e2461633d90fbddf2698fafc7c998ae540db71ecf2f1c25b3c7181307190f56be4
+  metadata.gz: 3697049d53e66266a2891cc1c2b33caa0b5d764939f5141b79a6d86f295f29f68895d573eed6c80f25a4a203ae0d4f8a096149e48909ce50ee8ec041a9150c5e
+  data.tar.gz: 335b32f5d964de1b081ab90fad33d1f5092f005b9435c01ac91a9f31ef2028b76aef83cfd6e803f14e53a56c8f03d2a006adad09b4774a84e1eb83643ee1c407

data/.travis.yml

@@ -1,7 +1,11 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 before_install: gem install bundler -v 1.16.1
 notifications:
   email: false

data/lib/fix_tsv_conflict/resolver.rb

@@ -39,8 +39,8 @@ module FixTSVConflict
 
     def try(conflict)
       result = []
-      left  = index_by_id(conflict.left.reject(&:blank?))
-      right = index_by_id(conflict.right.reject(&:blank?))
+      left  = index_by_id(conflict.left.reject { |l| l.blank? })
+      right = index_by_id(conflict.right.reject { |r| r.blank? })
       (left.keys + right.keys).uniq.sort.each do |id|
         l = left[id]
         r = right[id]
@@ -59,7 +59,7 @@ module FixTSVConflict
 
     def select(conflict)
       text = <<-TEXT
-Which do you want keep?
+Which branch do you want to keep?
 
   1) #{conflict.lbranch}
   2) #{conflict.rbranch}

data/lib/fix_tsv_conflict/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix_tsv_conflict
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Masato Ikeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler