Merge lp:~rharding/launchpad/watch_jsbuild into lp:launchpad

[Richard Harding]

[r=jcsackett][no-qa] Add a new make command `jsbuild_watch` that uses a running python script to auto build js files as changed.

= Summary =
In order to test and work with JS changes, you need to rebuild the JS files into the combo root, minimize, etc. This is done from the command `make jsbuild`, but it's a manual command that severly slows down development.

This adds a new make command `make jsbuild_watch` that will run a constant process, watching for changed JS files, and auto building them on the fly. In this way you shouldn't have to manually run `make jsbuild` while the process is running.

The only works for the combo loader and so isn't helpful if that feature flag isn't enabled.

== Proposed Fix ==
Adds a watch script and a make command to start it up manually. It runs and is killed with just a ctrl-c for now.

== Implementation Details ==
The watch_jsbuild.py script watching any changed files in lib. It checks them to see if they're non-test JS files. If so, it copies and minifies them into the build directory for the combo loader.

The script uses pyinotify to watch the lib directory and all sub directories for changed files.

[j.c.sackett (jcsackett)]

As we discussed in IRC, the event.mask == pyinotify.IN_MODIFY should be changed to .IN_CREATE in the process_IN_CREATE method.

review: Needs Fixing

[Robert Collins (lifeless)]

Also, you have both made this a buildout template *and manually* run
it via bin/py: pick one.

-Rob

[j.c.sackett (jcsackett)]

Thanks for making that change.

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-02-23 12:15:01 +0000
+++ Makefile	2012-02-28 19:50:37 +0000
@@ -63,7 +63,8 @@
     bin/harness bin/iharness bin/ipy bin/jsbuild bin/lpjsmin\
     bin/killservice bin/kill-test-services bin/lint.sh bin/retest \
     bin/run bin/run-testapp bin/sprite-util bin/start_librarian bin/stxdocs \
-    bin/tags bin/test bin/tracereport bin/twistd bin/update-download-cache
+    bin/tags bin/test bin/tracereport bin/twistd bin/update-download-cache \
+    bin/watch_jsbuild
 
 BUILDOUT_TEMPLATES = buildout-templates/_pythonpath.py.in
 
@@ -179,6 +180,9 @@
 	    --srcdir lib/lp/app/javascript \
 	    --builddir $(LP_BUILT_JS_ROOT)
 
+jsbuild_watch:
+	$(PY) bin/watch_jsbuild
+
 $(JS_LP): jsbuild_widget_css
 $(JS_YUI):
 	cp -a lib/canonical/launchpad/icing/yui_2.7.0b/build build/js/yui2

=== added file 'buildout-templates/bin/watch_jsbuild.in'
--- buildout-templates/bin/watch_jsbuild.in	1970-01-01 00:00:00 +0000
+++ buildout-templates/bin/watch_jsbuild.in	2012-02-28 19:50:37 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+import os
+import re
+from jsautobuild import YUIBuilder
+
+# Using ionotify we watch our sources of JavaScript in order to know we should
+# build when the files change.
+
+def lp_path_builder(changed_path, **builder_props):
+    """The custom bit of LP code that determines where files get moved to"""
+    # to start out let's assume your CWD is where we're referencing things from
+    CWD = os.getcwd()
+    JSDIR = os.path.join(CWD, builder_props['build_dir'])
+    RENAME = re.compile("^.*lib/lp/(.*)/javascript")
+
+    match = RENAME.search(changed_path)
+    js_dir = match.groups()[0]
+    return os.path.join(JSDIR, RENAME.sub(js_dir, changed_path))
+
+
+if __name__ == "__main__":
+    build_dir = 'build/js/lp'
+    meta_name = 'LP_MODULES'
+    watch_dir = 'lib'
+
+    builder = YUIBuilder(lp_path_builder,
+            build_dir,
+            watch_dir=watch_dir,
+            meta_jsmodule=meta_name)
+
+    builder.run()

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-02-21 20:48:55 +0000
+++ buildout.cfg	2012-02-28 19:50:37 +0000
@@ -67,7 +67,9 @@
 eggs = lp
     funkload
     zc.zservertracelog
+    pyinotify
     lpjsmin
+    jsautobuild
 # XXX gary 2009-5-12 bug 375751:
 # Make mailman built and installed in a more normal way.
 extra-paths =

=== modified file 'versions.cfg'
--- versions.cfg	2012-02-24 14:15:47 +0000
+++ versions.cfg	2012-02-28 19:50:37 +0000
@@ -28,6 +28,7 @@
 httplib2 = 0.6.0
 ipython = 0.9.1
 iso8601 = 0.1.4
+jsautobuild = 0.2
 Jinja2 = 2.2
 keyring = 0.6.2
 launchpadlib = 1.9.12
@@ -69,6 +70,7 @@
 pyasn1 = 0.0.9a
 pycrypto = 2.0.1
 pydkim = 0.3-mbp-r7
+pyinotify = 0.9.3
 # Unreleased Pygments trunk which includes fixes for issues 618 and 697 (LP
 # bug 834427).  Can be replaced with Pygments 1.5 once it is released.
 Pygments = 1.4dev-20111007