anon/cmdtest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

detect mixed line ending on Windows

Browse Source
This commit is contained in:
Johan Holmberg 2016-11-16 17:47:03 +01:00
parent 2b1126a508
commit c3ee66e5c5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cmdtest/util.rb
View File

@ -91,7 +91,21 @@ module Cmdtest
if ! extern_text.valid_encoding? if ! extern_text.valid_encoding?
raise AssertFailed, "ERROR: unexpected encoding: #{@name} not '#{encoding}'" raise AssertFailed, "ERROR: unexpected encoding: #{@name} not '#{encoding}'"
end end
return extern_text.encode('utf-8') str = extern_text.encode('utf-8')
if Util.windows?
has_nl = str.gsub("\n", "") != str
has_crnl = str.gsub("\r\n", "") != str
if has_nl && ! has_crnl
raise AssertFailed, "ERROR: UNIX line ending: #{@name}"
elsif str.gsub("\r", "").gsub("\n", "") == str.gsub("\r\n", "")
return str.gsub("\r\n", "\n")
else
raise AssertFailed, "ERROR: mixed line ending: #{@name}"
end
else
return str
end
end end
end end