| Previous changeset 1:02dfbbf869d8 (2020-04-14) Next changeset 3:156d0908e232 (2021-03-12) |
|
Commit message:
"planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/diff commit 04afacfdfc505fb74219d0e6124afdce61e2ad8f" |
|
modified:
diff.xml |
|
added:
test-data/file 3.txt |
| b |
| diff -r 02dfbbf869d8 -r 95a9dc82fc9a diff.xml --- a/diff.xml Tue Apr 14 13:56:01 2020 -0400 +++ b/diff.xml Wed Feb 03 20:49:42 2021 +0000 |
| [ |
| b'@@ -1,104 +1,115 @@\n-<tool id="diff" name="diff" version="3.6+galaxy1">\n-\n+<tool id="diff" name="diff" version="@TOOL_VERSION@+galaxy@GALAXY_VERSION@">\n <description>analyzes two files and generates an unidiff text file with information about the differences and an optional Html report</description>\n-\n+ <macros>\n+ <token name="@TOOL_VERSION@">3.6</token>\n+ <token name="@GALAXY_VERSION@">2</token>\n+ </macros>\n <requirements>\n- <requirement type="package" version="3.6">diffutils</requirement>\n+ <requirement type="package" version="@TOOL_VERSION@">diffutils</requirement>\n <requirement type="package" version="4.7">sed</requirement>\n </requirements>\n-\n <stdio>\n- <exit_code range="2:" level="fatal" description="Something went wrong trying to check differences in files. Please check output log for more details." />\n- <regex match="diff: memory exhausted" source="stdout" level="fatal_oom" description="Out of memory error occurred" />\n+ <exit_code range="2:" level="fatal" description="Something went wrong trying to check differences in files. Please check output log for more details."/>\n+ <regex match="diff: memory exhausted" source="stdout" level="fatal_oom" description="Out of memory error occurred"/>\n </stdio>\n-\n- <command ><![CDATA[\n+ <command><![CDATA[\n diff -u \'$input1\' \'$input2\' > \'$diff_file\';\n #if $generate_report:\n- sed -e \'s/@@title@@/Diff report for \'$input1.element_identifier\' and \'$input2.element_identifier\'/g\'\n+ sed -e \'s/@@title@@/Diff report for "$input1.element_identifier" and "$input2.element_identifier"/g\'\n -e \'s/@@outputformat@@/\'$output_format\'/g\'\n -e \'/@@diffoutput@@/{r\'$diff_file\'\' -e \';d}\'\n \'$__tool_directory__/template.html\' > \'$html_file\'\n #end if\n ]]>\n </command>\n-\n <inputs>\n- <param name="input1" type="data" format="txt" label="First input file" />\n- <param name="input2" type="data" format="txt" label="Second input file" />\n+ <param name="input1" type="data" format="txt" label="First input file"/>\n+ <param name="input2" type="data" format="txt" label="Second input file"/>\n <param name="generate_report" type="boolean" checked="true" truevalue="true" falsevalue="false" label="Generate HTML report" help="Generates an HTML report to visualize the differences"/>\n <param name="output_format" type="select" label="Choose report output format" help="Displays the differences in the report using the selected format. Either line by line or side by side.">\n <option value="side-by-side">Side by side</option>\n <option value="line-by-line">Line by line</option>\n </param>\n </inputs>\n-\n <outputs>\n- <data format="txt" name="diff_file" from_work_dir="output.txt" label="${tool.name} on ${on_string}: Raw Output" />\n+ <data format="txt" name="diff_file" from_work_dir="output.txt" label="${tool.name} on ${on_string}: Raw Output"/>\n <data format="html" name="html_file" from_work_dir="output.html" label="${tool.name} on ${on_string}: Html Report">\n <filter>generate_report is True</filter>\n </data>\n </outputs>\n-\n <tests>\n <test expect_exit_code="0" expect_failure="false" expect_num_outputs="1">\n- <param name="input1" value="file1.txt" />\n- <param name="input2" value="file1.txt" />\n- <param name="generate_report" value="false" />\n+ <param name="input1" value="file1.txt"/>\n+ <param name="input2" value="file1.txt"/>\n+ <param name="generate_report" value="false"/>\n <output name="diff_file">\n <assert_contents>\n- <has_n_lines n="0" />\n+ <has_n_lines n="0"/>\n </assert_contents>\n </output>\n </test>\n <test expect_exit_code="1" expe'..b'"false" />\n+ <param name="input1" value="file1.txt"/>\n+ <param name="input2" value="file2.txt"/>\n+ <param name="generate_report" value="false"/>\n <output name="diff_file">\n <assert_contents>\n- <has_n_lines n="5" />\n- <has_line line=" a" />\n- <has_line line="+b" />\n+ <has_n_lines n="5"/>\n+ <has_line line=" a"/>\n+ <has_line line="+b"/>\n+ </assert_contents>\n+ </output>\n+ </test>\n+ <test expect_exit_code="0" expect_failure="false" expect_num_outputs="2">\n+ <param name="input1" value="file1.txt"/>\n+ <param name="input2" value="file2.txt"/>\n+ <param name="generate_report" value="true"/>\n+ <output name="html_file">\n+ <assert_contents>\n+ <has_text text="!DOCTYPE html"/>\n </assert_contents>\n </output>\n </test>\n <test expect_exit_code="0" expect_failure="false" expect_num_outputs="2">\n- <param name="input1" value="file1.txt" />\n- <param name="input2" value="file2.txt" />\n- <param name="generate_report" value="true" />\n+ <param name="input1" value="file1.txt"/>\n+ <param name="input2" value="file2.txt"/>\n+ <param name="generate_report" value="true"/>\n+ <param name="output_format" value="side-by-side"/>\n <output name="html_file">\n <assert_contents>\n- <has_text text="!DOCTYPE html" />\n+ <has_text text="!DOCTYPE html"/>\n+ <has_text text="side-by-side"/>\n </assert_contents>\n </output>\n </test>\n <test expect_exit_code="0" expect_failure="false" expect_num_outputs="2">\n- <param name="input1" value="file1.txt" />\n- <param name="input2" value="file2.txt" />\n- <param name="generate_report" value="true" />\n- <param name="output_format" value="side-by-side" />\n+ <param name="input1" value="file1.txt"/>\n+ <param name="input2" value="file2.txt"/>\n+ <param name="generate_report" value="true"/>\n+ <param name="output_format" value="line-by-line"/>\n <output name="html_file">\n <assert_contents>\n- <has_text text="!DOCTYPE html" />\n- <has_text text="side-by-side" />\n+ <has_text text="!DOCTYPE html"/>\n+ <has_text text="line-by-line"/>\n </assert_contents>\n </output>\n </test>\n <test expect_exit_code="0" expect_failure="false" expect_num_outputs="2">\n- <param name="input1" value="file1.txt" />\n- <param name="input2" value="file2.txt" />\n- <param name="generate_report" value="true" />\n- <param name="output_format" value="line-by-line" />\n+ <param name="input1" value="file 3.txt"/>\n+ <param name="input2" value="file 3.txt"/>\n+ <param name="generate_report" value="true"/>\n+ <output name="diff_file">\n+ <assert_contents>\n+ <has_n_lines n="0"/>\n+ </assert_contents>\n+ </output>\n <output name="html_file">\n <assert_contents>\n- <has_text text="!DOCTYPE html" />\n- <has_text text="line-by-line" />\n+ <has_text text="!DOCTYPE html"/>\n </assert_contents>\n </output>\n </test>\n </tests>\n-\n <help><![CDATA[\n .. class:: infomark\n \n@@ -129,7 +140,6 @@\n An **optional** *HTML report* with a friendlier visual representation of the differences.\n ]]>\n </help>\n-\n <citations>\n <citation type="bibtex">\n @misc{gnudiffutils,\n' |
| b |
| diff -r 02dfbbf869d8 -r 95a9dc82fc9a test-data/file 3.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/file 3.txt Wed Feb 03 20:49:42 2021 +0000 |
| b |
| @@ -0,0 +1,1 @@ +c |