difftastic 0.3.0 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/difftastic/differ.rb +2 -2
- data/lib/difftastic/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e55421a2fc6e072b6529d9e2f8b9f93115fef615bd7affb124c38dc19ace0f10
|
4
|
+
data.tar.gz: a979a69d9153aaf5555486307d972dd11202eb0c9196a7e88e27c7ae26a03052
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4e56b9b93973d6b106611a10fb9674eceb874c2329adae8236fa04e0cdc61dedc922c75f6f08757a06dc3abcd69b7b5969485d5cb97a4aa698808a44998da178
|
7
|
+
data.tar.gz: 969f73eaf19dafcca3138ad032cbd73f2736b775b5690085d9a880e4772f951a03b5d50705f3de220c7c11af7e5226b7b097fc0df395329b254d14ad4bb642d2
|
data/lib/difftastic/differ.rb
CHANGED
@@ -300,7 +300,7 @@ class Difftastic::Differ
|
|
300
300
|
("--width=#{@width}" if @width),
|
301
301
|
].compact!
|
302
302
|
|
303
|
-
result = Difftastic.execute(options.join(" "))
|
303
|
+
result = Difftastic.execute(options.join(" ")).lstrip.sub(/\n{2}\z/, "")
|
304
304
|
|
305
305
|
unless @show_paths
|
306
306
|
new_line_index = result.index("\n") + 1
|
@@ -328,7 +328,7 @@ class Difftastic::Differ
|
|
328
328
|
end
|
329
329
|
|
330
330
|
# Insert formatted labels at the top
|
331
|
-
result = "
|
331
|
+
result = "#{left_part}#{right_part}#{Difftastic::ANSI.reset}\n#{result}"
|
332
332
|
end
|
333
333
|
|
334
334
|
# Removed due to inconsistencies in the original output. Need to improve the pattern matching.
|
data/lib/difftastic/version.rb
CHANGED