From 0683f469a6bce41b048939d5c13a8d1a3e7bd392 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Sun, 29 Mar 2020 20:11:11 +0200
Subject: [PATCH 1/6] add initial version of wrapper for diff
---
tools/diff/diff.xml | 91 ++++++++++++++++++++++++++++++++++
tools/diff/macros.xml | 5 ++
tools/diff/test-data/file1.txt | 1 +
tools/diff/test-data/file2.txt | 2 +
4 files changed, 99 insertions(+)
create mode 100644 tools/diff/diff.xml
create mode 100644 tools/diff/macros.xml
create mode 100644 tools/diff/test-data/file1.txt
create mode 100644 tools/diff/test-data/file2.txt
diff --git a/tools/diff/diff.xml b/tools/diff/diff.xml
new file mode 100644
index 0000000000..4056f9d861
--- /dev/null
+++ b/tools/diff/diff.xml
@@ -0,0 +1,91 @@
+
+
+ analyzes two files and generates a text file with information about the lines that are different.
+
+
+ macros.xml
+
+
+
+
+
+
+
+ '$output1'
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @misc{gnudiffutils,
+ author = {The Free Software Foundation (FSF), Inc},
+ year = {2017},
+ title = {diff (GNU diffutils)},
+ publisher = {The Free Software Foundation (FSF), Inc},
+ url = {http://www.gnu.org/software/diffutils/},
+ }
+
+
+
diff --git a/tools/diff/macros.xml b/tools/diff/macros.xml
new file mode 100644
index 0000000000..d8fb7b02ad
--- /dev/null
+++ b/tools/diff/macros.xml
@@ -0,0 +1,5 @@
+
+ 3.6
+
+ galaxy0
+
diff --git a/tools/diff/test-data/file1.txt b/tools/diff/test-data/file1.txt
new file mode 100644
index 0000000000..7898192261
--- /dev/null
+++ b/tools/diff/test-data/file1.txt
@@ -0,0 +1 @@
+a
diff --git a/tools/diff/test-data/file2.txt b/tools/diff/test-data/file2.txt
new file mode 100644
index 0000000000..422c2b7ab3
--- /dev/null
+++ b/tools/diff/test-data/file2.txt
@@ -0,0 +1,2 @@
+a
+b
From d2cdc7a09146b3964b31304ce99f211b741ea800 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Sun, 29 Mar 2020 20:43:39 +0200
Subject: [PATCH 2/6] add shed.yml
---
tools/diff/.shed.yml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 tools/diff/.shed.yml
diff --git a/tools/diff/.shed.yml b/tools/diff/.shed.yml
new file mode 100644
index 0000000000..54f91e3440
--- /dev/null
+++ b/tools/diff/.shed.yml
@@ -0,0 +1,15 @@
+categories:
+- Text Manipulation
+description: GNU diff tool that calculates the differences between two files.
+homepage_url: http://www.gnu.org/software/diffutils/
+long_description: |
+ The diff utility is a data comparison tool that calculates and displays the differences between two files.
+ Unlike edit distance notions used for other purposes, diff is line-oriented rather than character-oriented,
+ but it is like Levenshtein distance in that it tries to determine the smallest set of deletions and insertions
+ to create one file from the other. The diff command displays the changes made in a standard format, such that
+ both humans and machines can understand the changes and apply them: given one file and the changes, the other
+ file can be created.
+name: diff
+owner: davelopez
+remote_repository_url: https://github.com/bgruening/galaxytools/tree/master/tools/diff
+type: unrestricted
\ No newline at end of file
From c3f563cecbfca97da9c009a2c1bc5b37c5ae6e43 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Sun, 29 Mar 2020 21:05:18 +0200
Subject: [PATCH 3/6] fix owner in shed.yml
---
tools/diff/.shed.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/diff/.shed.yml b/tools/diff/.shed.yml
index 54f91e3440..ae8010fca2 100644
--- a/tools/diff/.shed.yml
+++ b/tools/diff/.shed.yml
@@ -10,6 +10,6 @@ long_description: |
both humans and machines can understand the changes and apply them: given one file and the changes, the other
file can be created.
name: diff
-owner: davelopez
+owner: bgruening
remote_repository_url: https://github.com/bgruening/galaxytools/tree/master/tools/diff
type: unrestricted
\ No newline at end of file
From b693733b506148d78fcb23758ff9fde8111714e9 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Sun, 29 Mar 2020 22:43:43 +0200
Subject: [PATCH 4/6] remove macros.xml
---
tools/diff/diff.xml | 6 +-----
tools/diff/macros.xml | 5 -----
2 files changed, 1 insertion(+), 10 deletions(-)
delete mode 100644 tools/diff/macros.xml
diff --git a/tools/diff/diff.xml b/tools/diff/diff.xml
index 4056f9d861..7badbf25b8 100644
--- a/tools/diff/diff.xml
+++ b/tools/diff/diff.xml
@@ -1,11 +1,7 @@
-
+
analyzes two files and generates a text file with information about the lines that are different.
-
- macros.xml
-
-
diff --git a/tools/diff/macros.xml b/tools/diff/macros.xml
deleted file mode 100644
index d8fb7b02ad..0000000000
--- a/tools/diff/macros.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
- 3.6
-
- galaxy0
-
From 4de2f3c88198b57ae7cc5a0dffc69911401d4d5c Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Sun, 29 Mar 2020 23:16:32 +0200
Subject: [PATCH 5/6] Update tools/diff/diff.xml
Co-Authored-By: beatrizserrano
---
tools/diff/diff.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/diff/diff.xml b/tools/diff/diff.xml
index 7badbf25b8..bfcc8849a3 100644
--- a/tools/diff/diff.xml
+++ b/tools/diff/diff.xml
@@ -1,6 +1,6 @@
- analyzes two files and generates a text file with information about the lines that are different.
+ analyzes two files and generates a text file with information about the lines that are different
From e906a2453c53f1a3753e67c5ea9fc273fbd14a21 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Tue, 31 Mar 2020 21:56:18 +0200
Subject: [PATCH 6/6] add diffutils requirement
---
tools/diff/diff.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/diff/diff.xml b/tools/diff/diff.xml
index bfcc8849a3..5589035658 100644
--- a/tools/diff/diff.xml
+++ b/tools/diff/diff.xml
@@ -2,6 +2,10 @@
analyzes two files and generates a text file with information about the lines that are different
+
+ diffutils
+
+