Merge lp:~vds/desktopcouch/check_lint into lp:desktopcouch

[Vincenzo Di Somma]

Add script to lint check changed modules.

Add script to lint check changed modules.

[Eric Casteleijn (thisfred)]

Awesome!

review: Approve

[Manuel de la Peña (mandel)]

+1

review: Approve

[dobey (dobey)]

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in runtests.py

[dobey (dobey)]

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in runtests.py

[dobey (dobey)]

Instead of adding Yet Another Script In Yet Another Project, can we just call u1lint instead? It's in ubuntuone-dev-tools.

[dobey (dobey)]

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in runtests.py

[lp:~vds/desktopcouch/check_lint]

191. By Vincenzo Di Somma on 2010-11-02

conflict solved

[Vincenzo Di Somma (vds)]

ubuntuone-dev-tools is in maverick but not in any previous version.

=== modified file 'runtests.py'
--- runtests.py	2010-11-01 14:50:06 +0000
+++ runtests.py	2010-11-02 19:01:43 +0000
@@ -1,23 +1,29 @@
 #!/usr/bin/python
 
-import os, sys
+"""Run all tests of the module"""
+
+import os, sys 
 from twisted.trial import runner, itrial, reporter
-from desktopcouch.platform import set_application_name
 
 dir, filename = os.path.split(__file__)
 sys.path.insert(0, os.path.realpath(dir))
 
 def get_test_suite():
+    """Load the test suite"""
     loader = runner.TestLoader()
     return loader.loadByNames(['desktopcouch'], True) 
 
 def run():
+    """Run all the tests"""
     test_runner = runner.TrialRunner(reporter.TreeReporter) 
     test_result = test_runner.run(get_test_suite())
     return test_result.wasSuccessful()
 
 if __name__ == '__main__':
+    import subprocess
+    from desktopcouch.platform import set_application_name
+    
     set_application_name("desktopcouch test runner")
-
     ret = run()
+    subprocess.call(["utilities/lint.sh", ""], shell=True)
     sys.exit(not ret)

=== added directory 'utilities'
=== added file 'utilities/lint.sh'
--- utilities/lint.sh	1970-01-01 00:00:00 +0000
+++ utilities/lint.sh	2010-11-02 19:01:43 +0000
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+echo ""
+echo ""
+echo "Pylint started!"
+echo ""
+
+bzr diff > /dev/null
+diff_status=$?
+if [ $diff_status -eq 0 ] ; then
+    # No uncommitted changes in the tree, lint changes relative to the
+    # parent.
+    rev=`bzr info | sed '/parent branch:/!d; s/ *parent branch: /ancestor:/'`
+    rev_option="-r $rev"
+elif [ $diff_status -eq 1 ] ; then
+    # Uncommitted changes in the tree, lint those changes.
+    rev_option=""
+else
+    # bzr diff failed
+    exit 1
+fi
+files=`bzr st --short $rev_option | sed '/^.[MN]/!d; s/.* //'`
+
+if [ -z "$files" ]; then
+    echo ""
+    echo "No changed files detected."
+    echo ""
+    exit 0
+else
+    echo ""
+    echo "Linting changed files:"
+    for file in $files; do
+        echo "  $file"
+    done
+    echo ""
+fi
+
+
+if [ -z "$files" ]; then
+    exit $EXIT
+fi
+
+
+export PYTHONPATH="/usr/share/pycentral/pylint/site-packages:desktopcouch:$PYTHONPATH"
+pyfiles=`echo "$files" | egrep '.py'`
+pylint="`which pylint` -r n"
+
+pylint_notices=`$pylint $pyfiles`
+
+if [ ! -z "$pylint_notices" ]; then
+    echo ""
+    echo ""
+    echo "== Pylint notices =="
+    echo "$pylint_notices"
+    echo ""
+    echo ""
+    EXIT=1
+fi
+
+exit $EXIT