for issue #7: merge 4f29fc8 by @yaccz, implement auto test cases w/o shunit2

Makefile

@@ -1,24 +1,17 @@
 # Makefile for testing
 
-TESTS = git svn crlf strange
 TESTPYPI = http://testpypi.python.org/pypi
 
-.PHONY: dogfood test $(TESTS) clean dist-test dist
+.PHONY: dogfood test clean dist-test dist
 
 dogfood:
 	./cdiff.py -s
 	git diff | ./cdiff.py
 	git diff | ./cdiff.py -s
 
-test: $(TESTS)
-
-$(TESTS):
-	./cdiff.py tests/$@.diff
-	./cdiff.py tests/$@.diff -s
-	./cdiff.py tests/$@.diff | diff -u tests/$@.diff -
-	python3 ./cdiff.py tests/$@.diff
-	python3 ./cdiff.py tests/$@.diff -s
-	python3 ./cdiff.py tests/$@.diff | diff -u tests/$@.diff -
+test:
+	PYTHON=python ./tests/tests.sh
+	PYTHON=python3 ./tests/tests.sh
 
 clean:
 	rm -f cdiff MANIFEST

cdiff.py

@@ -571,8 +571,10 @@ def main():
     parser = optparse.OptionParser(usage=usage,
             description=META_INFO['description'],
             version='%%prog %s' % META_INFO['version'])
+    parser.add_option('-c', '--color', default='auto', metavar='WHEN',
+            help='colorize mode "auto" (default), "always", or "never"')
     parser.add_option('-s', '--side-by-side', action='store_true',
-            help=('show in side-by-side mode'))
+            help='show in side-by-side mode')
     parser.add_option('-w', '--width', type='int', default=80, metavar='N',
             help='set text width (side-by-side mode only), default is 80')
     opts, args = parser.parse_args()
@@ -609,7 +611,7 @@ def main():
     if not stream:
         return 0
 
-    if sys.stdout.isatty():
+    if opts.color == 'always' or (opts.color == 'auto' and sys.stdout.isatty()):
         try:
             markup_to_pager(stream, opts)
         except IOError:

tests/README

@@ -0,0 +1,4 @@
+# To generate expected output, use following command, then review with `less -R`
+../../cdiff.py -c always in.diff > out.normal 
+../../cdiff.py -c always -s in.diff > out.side-by-side
+../../cdiff.py -c always -s in.diff -w70 > out.w70

tests/crlf/out.normal

@@ -0,0 +1,31 @@
+Index: README.md
+===================================================================
+--- README.md	(revision 41)
++++ README.md	(working copy)
+@@ -3,7 +3,6 @@
+ ## About
+ 
+ Coderev is a toolkit generates static side-by-side html pages for code review.
+-Typical use case is to generate diff pages for local modification in svn/cvs
+ workspace and send page link to teammates for code review.
+ 
+ See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) for a demo.
+@@ -18,9 +17,10 @@
+ 
+ ## Usage of coderev.sh
+ 
+-Just type `./coderev.sh -h` to see the usage.
++Just type `./coderev.sh --help` to see the usage.
+ 
+     Usage:
++
+         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \
+                 [-F comment-file | -m 'comment...'] [file...]
+ 
+@@ -145,3 +145,5 @@
+                             specify column number where lines are broken and
+                             wrapped for sdiff, default is no line wrapping
+     -y, --yes             do not prompt for overwriting
++
++# EOF
+

tests/crlf/out.side-by-side

@@ -0,0 +1,29 @@
+Index: README.md
+===================================================================
+--- README.md	(revision 41)
++++ README.md	(working copy)
+@@ -3,7 +3,6 @@
+  3 ## About                                                                           3 ## About
+  4                                                                                    4 
+  5 Coderev is a toolkit generates static side-by-side html pages for code review.     5 Coderev is a toolkit generates static side-by-side html pages for code review.
+  6 Typical use case is to generate diff pages for local modification in svn/cvs     
+  7 workspace and send page link to teammates for code review.                         6 workspace and send page link to teammates for code review.
+  8                                                                                    7 
+  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) for a demo.    8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) for a demo.
+@@ -18,9 +17,10 @@
+ 18                                                                                   17 
+ 19 ## Usage of coderev.sh                                                            18 ## Usage of coderev.sh
+ 20                                                                                   19 
+ 21 Just type `./coderev.sh -h` to see the usage.                                     20 Just type `./coderev.sh --help` to see the usage.
+ 22                                                                                   21 
+ 23     Usage:                                                                        22     Usage:
+                                                                                      23 
+ 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \          24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \
+ 25                 [-F comment-file | -m 'comment...'] [file...]                     25                 [-F comment-file | -m 'comment...'] [file...]
+ 26                                                                                   26 
+@@ -145,3 +145,5 @@
+145                             specify column number where lines are broken and     145                             specify column number where lines are broken and
+146                             wrapped for sdiff, default is no line wrapping       146                             wrapped for sdiff, default is no line wrapping
+147     -y, --yes             do not prompt for overwriting                          147     -y, --yes             do not prompt for overwriting
+                                                                                     148 
+                                                                                     149 # EOF

tests/crlf/out.w70

@@ -0,0 +1,29 @@
+Index: README.md
+===================================================================
+--- README.md	(revision 41)
++++ README.md	(working copy)
+@@ -3,7 +3,6 @@
+  3 ## About                                                                 3 ## About
+  4                                                                          4 
+  5 Coderev is a toolkit generates static side-by-side html pages for cod>   5 Coderev is a toolkit generates static side-by-side html pages for cod>
+  6 Typical use case is to generate diff pages for local modification in >     
+  7 workspace and send page link to teammates for code review.               6 workspace and send page link to teammates for code review.
+  8                                                                          7 
+  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>   8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>
+@@ -18,9 +17,10 @@
+ 18                                                                         17 
+ 19 ## Usage of coderev.sh                                                  18 ## Usage of coderev.sh
+ 20                                                                         19 
+ 21 Just type `./coderev.sh -h` to see the usage.                           20 Just type `./coderev.sh --help` to see the usage.
+ 22                                                                         21 
+ 23     Usage:                                                              22     Usage:
+                                                                            23 
+ 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>  24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>
+ 25                 [-F comment-file | -m 'comment...'] [file...]           25                 [-F comment-file | -m 'comment...'] [file...]
+ 26                                                                         26 
+@@ -145,3 +145,5 @@
+145                             specify column number where lines are bro> 145                             specify column number where lines are bro>
+146                             wrapped for sdiff, default is no line wra> 146                             wrapped for sdiff, default is no line wra>
+147     -y, --yes             do not prompt for overwriting                147     -y, --yes             do not prompt for overwriting
+                                                                           148 
+                                                                           149 # EOF

tests/git/out.normal

@@ -0,0 +1,48 @@
+commit 15bfa564b9db08fb277a343a3d0a01d377800606
+Author: Matthew Wang <XXXXXXX@gmail.com>
+Date:   Thu Jan 31 15:27:17 2013 +0800
+
+    Default width is now 80
+
+diff --git a/src/cdiff.py b/src/cdiff.py
+index 13f725f..bf15ef1 100755
+--- a/src/cdiff.py
++++ b/src/cdiff.py
+@@ -128,9 +128,7 @@ class Diff(object):
+                     yield self._markup_common(' ' + old[1])
+ 
+     def markup_side_by_side(self, width):
+-        """width of 0 means infinite width, None means auto detect. Returns a
++        """Returns a generator"""
+-        generator
+-        """
+         def _normalize(line):
+             return line.replace('\t', ' ' * 8).replace('\n', '')
+ 
+@@ -147,7 +145,8 @@ class Diff(object):
+                 return markup
+ 
+         # Setup line width and number width
+-        if not width: width = 80
++        if width <= 0:
++            width = 80
+         (start, offset) = self._hunks[-1].get_old_addr()
+         max1 = start + offset - 1
+         (start, offset) = self._hunks[-1].get_new_addr()
+@@ -430,13 +429,10 @@ if __name__ == '__main__':
+     parser = optparse.OptionParser(usage)
+     parser.add_option('-s', '--side-by-side', action='store_true',
+             help=('show in side-by-side mode'))
+-    parser.add_option('-w', '--width', type='int', default=None,
++    parser.add_option('-w', '--width', type='int', default=80,
+-            help='set line width (side-by-side mode only)')
++            help='set line width (side-by-side mode only), default is 80')
+     opts, args = parser.parse_args()
+-
+-    if opts.width and opts.width < 0:
+-        opts.width = 0
+ 
+     if len(args) >= 1:
+         diff_hdl = open(args[0], 'r')
+     elif sys.stdin.isatty():
+

tests/git/out.side-by-side

@@ -0,0 +1,43 @@
+commit 15bfa564b9db08fb277a343a3d0a01d377800606
+Author: Matthew Wang <XXXXXXX@gmail.com>
+Date:   Thu Jan 31 15:27:17 2013 +0800
+
+    Default width is now 80
+
+diff --git a/src/cdiff.py b/src/cdiff.py
+index 13f725f..bf15ef1 100755
+--- a/src/cdiff.py
++++ b/src/cdiff.py
+@@ -128,9 +128,7 @@ class Diff(object):
+128                     yield self._markup_common(' ' + old[1])                      128                     yield self._markup_common(' ' + old[1])
+129                                                                                  129 
+130     def markup_side_by_side(self, width):                                        130     def markup_side_by_side(self, width):
+131         """width of 0 means infinite width, None means auto detect. Returns a    131         """Returns a generator"""
+132         generator     
+133         """     
+134         def _normalize(line):                                                    132         def _normalize(line):
+135             return line.replace('\t', ' ' * 8).replace('\n', '')                 133             return line.replace('\t', ' ' * 8).replace('\n', '')
+136                                                                                  134 
+@@ -147,7 +145,8 @@ class Diff(object):
+147                 return markup                                                    145                 return markup
+148                                                                                  146 
+149         # Setup line width and number width                                      147         # Setup line width and number width
+150         if not width: width = 80                                                 148         if width <= 0:
+                                                                                     149             width = 80
+151         (start, offset) = self._hunks[-1].get_old_addr()                         150         (start, offset) = self._hunks[-1].get_old_addr()
+152         max1 = start + offset - 1                                                151         max1 = start + offset - 1
+153         (start, offset) = self._hunks[-1].get_new_addr()                         152         (start, offset) = self._hunks[-1].get_new_addr()
+@@ -430,13 +429,10 @@ if __name__ == '__main__':
+430     parser = optparse.OptionParser(usage)                                        429     parser = optparse.OptionParser(usage)
+431     parser.add_option('-s', '--side-by-side', action='store_true',               430     parser.add_option('-s', '--side-by-side', action='store_true',
+432             help=('show in side-by-side mode'))                                  431             help=('show in side-by-side mode'))
+433     parser.add_option('-w', '--width', type='int', default=None,                 432     parser.add_option('-w', '--width', type='int', default=80,
+434             help='set line width (side-by-side mode only)')                      433             help='set line width (side-by-side mode only), default is 80')
+435     opts, args = parser.parse_args()                                             434     opts, args = parser.parse_args()
+436      
+437     if opts.width and opts.width < 0:     
+438         opts.width = 0     
+439                                                                                  435 
+440     if len(args) >= 1:                                                           436     if len(args) >= 1:
+441         diff_hdl = open(args[0], 'r')                                            437         diff_hdl = open(args[0], 'r')
+442     elif sys.stdin.isatty():                                                     438     elif sys.stdin.isatty():

tests/git/out.w70

@@ -0,0 +1,43 @@
+commit 15bfa564b9db08fb277a343a3d0a01d377800606
+Author: Matthew Wang <XXXXXXX@gmail.com>
+Date:   Thu Jan 31 15:27:17 2013 +0800
+
+    Default width is now 80
+
+diff --git a/src/cdiff.py b/src/cdiff.py
+index 13f725f..bf15ef1 100755
+--- a/src/cdiff.py
++++ b/src/cdiff.py
+@@ -128,9 +128,7 @@ class Diff(object):
+128                     yield self._markup_common(' ' + old[1])            128                     yield self._markup_common(' ' + old[1])
+129                                                                        129 
+130     def markup_side_by_side(self, width):                              130     def markup_side_by_side(self, width):
+131         """width of 0 means infinite width, None means auto detect. R> 131         """Returns a generator"""
+132         generator     
+133         """     
+134         def _normalize(line):                                          132         def _normalize(line):
+135             return line.replace('\t', ' ' * 8).replace('\n', '')       133             return line.replace('\t', ' ' * 8).replace('\n', '')
+136                                                                        134 
+@@ -147,7 +145,8 @@ class Diff(object):
+147                 return markup                                          145                 return markup
+148                                                                        146 
+149         # Setup line width and number width                            147         # Setup line width and number width
+150         if not width: width = 80                                       148         if width <= 0:
+                                                                           149             width = 80
+151         (start, offset) = self._hunks[-1].get_old_addr()               150         (start, offset) = self._hunks[-1].get_old_addr()
+152         max1 = start + offset - 1                                      151         max1 = start + offset - 1
+153         (start, offset) = self._hunks[-1].get_new_addr()               152         (start, offset) = self._hunks[-1].get_new_addr()
+@@ -430,13 +429,10 @@ if __name__ == '__main__':
+430     parser = optparse.OptionParser(usage)                              429     parser = optparse.OptionParser(usage)
+431     parser.add_option('-s', '--side-by-side', action='store_true',     430     parser.add_option('-s', '--side-by-side', action='store_true',
+432             help=('show in side-by-side mode'))                        431             help=('show in side-by-side mode'))
+433     parser.add_option('-w', '--width', type='int', default=None,       432     parser.add_option('-w', '--width', type='int', default=80,
+434             help='set line width (side-by-side mode only)')            433             help='set line width (side-by-side mode only), default is>
+435     opts, args = parser.parse_args()                                   434     opts, args = parser.parse_args()
+436      
+437     if opts.width and opts.width < 0:     
+438         opts.width = 0     
+439                                                                        435 
+440     if len(args) >= 1:                                                 436     if len(args) >= 1:
+441         diff_hdl = open(args[0], 'r')                                  437         diff_hdl = open(args[0], 'r')
+442     elif sys.stdin.isatty():                                           438     elif sys.stdin.isatty():

tests/strange/out.normal

@@ -0,0 +1,21 @@
+commit 57263369bd810ba3a2c2dfd32a905f1e7d59cc6d
+Author: Matthew Wang <XXXXXXX@gmail.com>
+Date:   Sun Jan 6 21:56:54 2013 +0800
+
+    simplify with seperate node.py
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..0d20b64
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1 @@
++*.pyc
+diff --git a/README b/README
+index 7e70850..b5eb369 100644
+--- a/README
++++ b/README
+@@ -1 +1,2 @@
+ Sun Feb  3 13:57:05 CST 2013
++Sun Feb  3 13:57:15 CST 2013
+

tests/strange/out.side-by-side

@@ -0,0 +1,20 @@
+commit 57263369bd810ba3a2c2dfd32a905f1e7d59cc6d
+Author: Matthew Wang <XXXXXXX@gmail.com>
+Date:   Sun Jan 6 21:56:54 2013 +0800
+
+    simplify with seperate node.py
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..0d20b64
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1 @@
+                                                                                     1 *.pyc
+diff --git a/README b/README
+index 7e70850..b5eb369 100644
+--- a/README
++++ b/README
+@@ -1 +1,2 @@
+1 Sun Feb  3 13:57:05 CST 2013                                                     1 Sun Feb  3 13:57:05 CST 2013
+                                                                                   2 Sun Feb  3 13:57:15 CST 2013

tests/strange/out.w70

@@ -0,0 +1,20 @@
+commit 57263369bd810ba3a2c2dfd32a905f1e7d59cc6d
+Author: Matthew Wang <XXXXXXX@gmail.com>
+Date:   Sun Jan 6 21:56:54 2013 +0800
+
+    simplify with seperate node.py
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..0d20b64
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1 @@
+                                                                           1 *.pyc
+diff --git a/README b/README
+index 7e70850..b5eb369 100644
+--- a/README
++++ b/README
+@@ -1 +1,2 @@
+1 Sun Feb  3 13:57:05 CST 2013                                           1 Sun Feb  3 13:57:05 CST 2013
+                                                                         2 Sun Feb  3 13:57:15 CST 2013

tests/svn/out.normal

@@ -0,0 +1,31 @@
+Index: README.md
+===================================================================
+--- README.md	(revision 41)
++++ README.md	(working copy)
+@@ -3,7 +3,6 @@
+ ## About
+ 
+ Coderev is a toolkit generates static side-by-side html pages for code review.
+-Typical use case is to generate diff pages for local modification in svn/cvs
+ workspace and send page link to teammates for code review.
+ 
+ See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) for a demo.
+@@ -18,9 +17,10 @@
+ 
+ ## Usage of coderev.sh
+ 
+-Just type `./coderev.sh -h` to see the usage.
++Just type `./coderev.sh --help` to see the usage.
+ 
+     Usage:
++
+         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \
+                 [-F comment-file | -m 'comment...'] [file...]
+ 
+@@ -145,3 +145,5 @@
+                             specify column number where lines are broken and
+                             wrapped for sdiff, default is no line wrapping
+     -y, --yes             do not prompt for overwriting
++
++# EOF
+

tests/svn/out.side-by-side

@@ -0,0 +1,29 @@
+Index: README.md
+===================================================================
+--- README.md	(revision 41)
++++ README.md	(working copy)
+@@ -3,7 +3,6 @@
+  3 ## About                                                                           3 ## About
+  4                                                                                    4 
+  5 Coderev is a toolkit generates static side-by-side html pages for code review.     5 Coderev is a toolkit generates static side-by-side html pages for code review.
+  6 Typical use case is to generate diff pages for local modification in svn/cvs     
+  7 workspace and send page link to teammates for code review.                         6 workspace and send page link to teammates for code review.
+  8                                                                                    7 
+  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) for a demo.    8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) for a demo.
+@@ -18,9 +17,10 @@
+ 18                                                                                   17 
+ 19 ## Usage of coderev.sh                                                            18 ## Usage of coderev.sh
+ 20                                                                                   19 
+ 21 Just type `./coderev.sh -h` to see the usage.                                     20 Just type `./coderev.sh --help` to see the usage.
+ 22                                                                                   21 
+ 23     Usage:                                                                        22     Usage:
+                                                                                      23 
+ 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \          24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \
+ 25                 [-F comment-file | -m 'comment...'] [file...]                     25                 [-F comment-file | -m 'comment...'] [file...]
+ 26                                                                                   26 
+@@ -145,3 +145,5 @@
+145                             specify column number where lines are broken and     145                             specify column number where lines are broken and
+146                             wrapped for sdiff, default is no line wrapping       146                             wrapped for sdiff, default is no line wrapping
+147     -y, --yes             do not prompt for overwriting                          147     -y, --yes             do not prompt for overwriting
+                                                                                     148 
+                                                                                     149 # EOF

tests/svn/out.w70

@@ -0,0 +1,29 @@
+Index: README.md
+===================================================================
+--- README.md	(revision 41)
++++ README.md	(working copy)
+@@ -3,7 +3,6 @@
+  3 ## About                                                                 3 ## About
+  4                                                                          4 
+  5 Coderev is a toolkit generates static side-by-side html pages for cod>   5 Coderev is a toolkit generates static side-by-side html pages for cod>
+  6 Typical use case is to generate diff pages for local modification in >     
+  7 workspace and send page link to teammates for code review.               6 workspace and send page link to teammates for code review.
+  8                                                                          7 
+  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>   8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>
+@@ -18,9 +17,10 @@
+ 18                                                                         17 
+ 19 ## Usage of coderev.sh                                                  18 ## Usage of coderev.sh
+ 20                                                                         19 
+ 21 Just type `./coderev.sh -h` to see the usage.                           20 Just type `./coderev.sh --help` to see the usage.
+ 22                                                                         21 
+ 23     Usage:                                                              22     Usage:
+                                                                            23 
+ 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>  24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>
+ 25                 [-F comment-file | -m 'comment...'] [file...]           25                 [-F comment-file | -m 'comment...'] [file...]
+ 26                                                                         26 
+@@ -145,3 +145,5 @@
+145                             specify column number where lines are bro> 145                             specify column number where lines are bro>
+146                             wrapped for sdiff, default is no line wra> 146                             wrapped for sdiff, default is no line wra>
+147     -y, --yes             do not prompt for overwriting                147     -y, --yes             do not prompt for overwriting
+                                                                           148 
+                                                                           149 # EOF

tests/tests.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+set -o errexit
+
+SELF_DIR=$(cd $(dirname $0) && pwd) || exit 1
+CDIFF=$SELF_DIR/../cdiff.py
+
+# Override this to test with python3
+PYTHON=${PYTHON:-python}
+
+function pass()
+{
+    if [[ -t 1 ]]; then
+        echo -e "\x1b[01;32mPASS\x1b[0m" "$*"
+    else
+        echo "PASS" "$*"
+    fi
+}
+
+function fail()
+{
+    if [[ -t 1 ]]; then
+        echo -e "\x1b[01;31mFAIL\x1b[0m" "$*"
+    else
+        echo "FAIL" "$*"
+    fi
+}
+
+function cmpOutput()
+{
+    local input=${1:?}
+    local expected_out=${2:?}
+    local cdiff_opt=${3:-""}
+
+    echo -n "Test option '$cdiff_opt' with input '$input' ... "
+    if $PYTHON $CDIFF $cdiff_opt $input | diff -ub $expected_out - >& /dev/null
+    then
+        pass
+        return 0
+    else
+        fail "(expected output: '$expected_out')"
+        return 1
+    fi
+}
+
+function main()
+{
+    local rc=0
+    local d
+
+    for d in $SELF_DIR/*/; do
+        cmpOutput "${d}in.diff" ${d}out.normal "-c always" || rc=1
+        cmpOutput "${d}in.diff" ${d}out.side-by-side "-c always -s" || rc=1
+        cmpOutput "${d}in.diff" ${d}out.w70 "-c always -s -w70" || rc=1
+        cmpOutput "${d}in.diff" "${d}in.diff" "-c auto" || rc=1
+        cmpOutput "${d}in.diff" "${d}in.diff" "-c auto -s" || rc=1
+        cmpOutput "${d}in.diff" "${d}in.diff" "-c auto -s -w70" || rc=1
+    done
+    return $rc
+}
+
+main "$@"
+
+# vim:set et sts=4 sw=4: