diffy 3.4.0 → 3.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG +13 -0
- data/lib/diffy/diff.rb +1 -7
- data/lib/diffy/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 107dc73001f2e00bccf4b4f89a15ba86d045511f125f33bc8ed8987e239b5079
|
|
4
|
+
data.tar.gz: 0a07b298ff5eec7bcbf83adb0e3fa3c59c122796693d75e18d81d9ccfcb131de
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 47df78d6118935280b9011a77bb0c888da50af9dfac81dd810ca522cf23ad0099b50411a27e2ca57eac0369cb9fd9d82b97ce56525093002f2845d5d8e2e8121
|
|
7
|
+
data.tar.gz: fca9f15d0cd9cca745caa12f59da048f6bd4c62a572abd9987530ef3acacbdf228c78140c3305f618b86dc57a2a50a25fb0336e325f33afd5261c0a47e28f73c
|
data/CHANGELOG
CHANGED
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
== 3.4.2 ==
|
|
2
|
+
Silence warning from unused variable when using `ruby -w`. Thanks
|
|
3
|
+
@sambostock!
|
|
4
|
+
|
|
5
|
+
== 3.4.1 ==
|
|
6
|
+
Prevent remote code execution from user controlled diff file paths. This
|
|
7
|
+
issue was only present in Windows platforms. Thanks @tehryanx for reporting
|
|
8
|
+
and testing the fix!
|
|
9
|
+
|
|
10
|
+
== 3.4.0 ==
|
|
11
|
+
Remove space between U diff option and context number. Thanks @tomas!
|
|
12
|
+
Add option to ignore CRLF diffs in HTML comparisons. Thanks @ptyagi16!
|
|
13
|
+
|
|
1
14
|
== 3.3.0 ==
|
|
2
15
|
Fix diff lines that begin with -- or ++. Thanks @dark-panda!
|
|
3
16
|
|
data/lib/diffy/diff.rb
CHANGED
|
@@ -49,13 +49,7 @@ module Diffy
|
|
|
49
49
|
[string1, string2]
|
|
50
50
|
end
|
|
51
51
|
|
|
52
|
-
|
|
53
|
-
# don't use open3 on windows
|
|
54
|
-
cmd = sprintf '"%s" %s %s', diff_bin, diff_options.join(' '), @paths.map { |s| %("#{s}") }.join(' ')
|
|
55
|
-
diff = `#{cmd}`
|
|
56
|
-
else
|
|
57
|
-
diff = Open3.popen3(diff_bin, *(diff_options + @paths)) { |i, o, e| o.read }
|
|
58
|
-
end
|
|
52
|
+
diff, _stderr, _process_status = Open3.capture3(diff_bin, *(diff_options + @paths))
|
|
59
53
|
diff.force_encoding('ASCII-8BIT') if diff.respond_to?(:valid_encoding?) && !diff.valid_encoding?
|
|
60
54
|
if diff =~ /\A\s*\Z/ && !options[:allow_empty_diff]
|
|
61
55
|
diff = case options[:source]
|
data/lib/diffy/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: diffy
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.4.
|
|
4
|
+
version: 3.4.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sam Goldstein
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2022-06-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|