fix_tsv_conflict 0.1.1 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/{exec → exe}/fix_tsv_conflict +0 -0
- data/lib/fix_tsv_conflict/repairman.rb +8 -10
- data/lib/fix_tsv_conflict/version.rb +1 -1
- metadata +5 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9bb0ced2121afe878ea9dcbdcf17ce08560341027047494f7a3ec51f3bdeaac3
|
|
4
|
+
data.tar.gz: 32d3363b7f894d6356624bc894a18552d54e63df7094ea65c7a8898ec1e36658
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c2d320c077a00c9cae3c013eddde5fb6dd1721568df8bbb7e3afcd16fb9f99f20c332bd20b7f8c0108a3fbdca16ef1d9ac28aa83d666059fce45b89aec7065fb
|
|
7
|
+
data.tar.gz: 4fc7b148692e8f96f9308d90866945aebd9ceee6ec2019f819f70d81bfb6e6f210ce8eef4e11ce13428530d6b9aaa54461a6ac06eb97246eb6d9e96ebdb5d62e
|
|
File without changes
|
|
@@ -1,20 +1,18 @@
|
|
|
1
1
|
require "fix_tsv_conflict/diff_printer"
|
|
2
2
|
require "fix_tsv_conflict/logging"
|
|
3
3
|
|
|
4
|
-
module StringExt
|
|
5
|
-
BLANK_RE = /\A[[:space:]]*\z/
|
|
6
|
-
refine String do
|
|
7
|
-
def blank?
|
|
8
|
-
BLANK_RE === self
|
|
9
|
-
end
|
|
10
|
-
end
|
|
11
|
-
end
|
|
12
|
-
|
|
13
4
|
module FixTSVConflict
|
|
14
5
|
class Repairman
|
|
15
6
|
include Logging
|
|
16
|
-
using StringExt
|
|
17
7
|
|
|
8
|
+
BLANK_RE = /\A[[:space:]]*\z/
|
|
9
|
+
using Module.new {
|
|
10
|
+
refine String do
|
|
11
|
+
def blank?
|
|
12
|
+
BLANK_RE === self
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
}
|
|
18
16
|
|
|
19
17
|
attr_reader :stderr
|
|
20
18
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fix_tsv_conflict
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Masato Ikeda
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-02-
|
|
11
|
+
date: 2018-02-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -83,7 +83,8 @@ dependencies:
|
|
|
83
83
|
description: Fix git conflicts in TSV file.
|
|
84
84
|
email:
|
|
85
85
|
- masato.ikeda@gmail.com
|
|
86
|
-
executables:
|
|
86
|
+
executables:
|
|
87
|
+
- fix_tsv_conflict
|
|
87
88
|
extensions: []
|
|
88
89
|
extra_rdoc_files: []
|
|
89
90
|
files:
|
|
@@ -95,7 +96,7 @@ files:
|
|
|
95
96
|
- Rakefile
|
|
96
97
|
- bin/console
|
|
97
98
|
- bin/setup
|
|
98
|
-
-
|
|
99
|
+
- exe/fix_tsv_conflict
|
|
99
100
|
- fix_tsv_conflict.gemspec
|
|
100
101
|
- lib/fix_tsv_conflict.rb
|
|
101
102
|
- lib/fix_tsv_conflict/cli.rb
|