diffy 3.4.0 → 3.4.3
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/.travis.yml +1 -0
- data/CHANGELOG +16 -0
- data/lib/diffy/diff.rb +1 -7
- data/lib/diffy/version.rb +1 -1
- data/lib/diffy.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: f4917a9c5ce62dd40fcba1bd26dbe0d43cb864bc17191eb6f1f6d75f0335379b
|
|
4
|
+
data.tar.gz: 4ec8d980136421bb271f89c61d50ff72caa02fa8ed650e05004f41d0107bfcd8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 874f8c29026f342558611b1860a45cd51b4d6f5cee3ce5b139e0d3b03f3e0fb1fcc71fb9581550b5be76ad7c213a78f614fdf1688e3612dfc528ae06788975bb
|
|
7
|
+
data.tar.gz: f0e8ac0ec13e20432927bbcaf4f25caadc30d9af763272c85f8f13a3d32473f9fcb5e1e50a6298843daeea6de0cfd18f3a4755536b8e7399fdc4329554881e56
|
data/.travis.yml
CHANGED
data/CHANGELOG
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
== 3.4.3 ==
|
|
2
|
+
Require open3 unconditionally on Windows. Thanks @avdv!
|
|
3
|
+
|
|
4
|
+
== 3.4.2 ==
|
|
5
|
+
Silence warning from unused variable when using `ruby -w`. Thanks
|
|
6
|
+
@sambostock!
|
|
7
|
+
|
|
8
|
+
== 3.4.1 ==
|
|
9
|
+
Prevent remote code execution from user controlled diff file paths. This
|
|
10
|
+
issue was only present in Windows platforms. Thanks @tehryanx for reporting
|
|
11
|
+
and testing the fix!
|
|
12
|
+
|
|
13
|
+
== 3.4.0 ==
|
|
14
|
+
Remove space between U diff option and context number. Thanks @tomas!
|
|
15
|
+
Add option to ignore CRLF diffs in HTML comparisons. Thanks @ptyagi16!
|
|
16
|
+
|
|
1
17
|
== 3.3.0 ==
|
|
2
18
|
Fix diff lines that begin with -- or ++. Thanks @dark-panda!
|
|
3
19
|
|
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
data/lib/diffy.rb
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
require 'tempfile'
|
|
2
2
|
require 'erb'
|
|
3
3
|
require 'rbconfig'
|
|
4
|
+
require 'open3'
|
|
4
5
|
|
|
5
6
|
module Diffy
|
|
6
7
|
WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
|
|
7
8
|
end
|
|
8
|
-
require 'open3' unless Diffy::WINDOWS
|
|
9
9
|
require File.join(File.dirname(__FILE__), 'diffy', 'format')
|
|
10
10
|
require File.join(File.dirname(__FILE__), 'diffy', 'html_formatter')
|
|
11
11
|
require File.join(File.dirname(__FILE__), 'diffy', 'diff')
|
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.3
|
|
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: 2024-10-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|