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

[Richard Harding]

TBD

Unmerged revisions

15733. By Richard Harding on 2012-08-01

I wonder if this will work

=== modified file 'Makefile'
--- Makefile	2012-07-13 01:55:27 +0000
+++ Makefile	2012-08-01 21:25:23 +0000
@@ -66,7 +66,7 @@
     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/watch_jsbuild
+    bin/watch_jsbuild bin/yui_extract
 
 BUILDOUT_TEMPLATES = buildout-templates/_pythonpath.py.in
 

=== added file 'buildout-templates/bin/yui_extract.in'
--- buildout-templates/bin/yui_extract.in	1970-01-01 00:00:00 +0000
+++ buildout-templates/bin/yui_extract.in	2012-08-01 21:25:23 +0000
@@ -0,0 +1,113 @@
+#!${buildout:executable}
+#
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+"""
+Extract the YUI library from the zip file in the download-cache into the build
+directory for our JS.
+
+Usage:
+
+    yui_extract -y 3.5.1 -d download-cache/dist -b build/js
+
+"""
+import argparse
+import os
+from os.path import (
+    basename,
+    exists,
+    isdir,
+    join,
+    )
+import shutil
+import sys
+from zipfile import ZipFile
+
+YUI_ZIP = "yui_%s.zip"
+YUI_DIR = None
+
+
+def _parse_args():
+    """Parse out the command options. We want to support
+
+    """
+    desc = "Extract YUI zip files into the build tree."
+
+    parser = argparse.ArgumentParser(description=desc)
+
+    parser.add_argument('-y', '--yui-version', dest='yui_version',
+        action='store',
+        default=None,
+        required=True,
+        help='What version of YUI to extract.')
+
+    parser.add_argument('-d', '--download-cache', dest="download_cache",
+        action="store",
+        default=None,
+        required=True,
+        help="Location of the download cache to find the YUI zip file.")
+
+    parser.add_argument('-b', '--build-dir', dest="build_dir",
+        action="store",
+        default=None,
+        required=True,
+        help="Location to extract the YUI zip to.")
+
+    args = parser.parse_args()
+    return args
+
+
+def _unzip(yui_zip, build_dir):
+    """Unzip the yui file and place the files into the build dir."""
+    # Zip extraction occurs into the cwd so change that.
+    yui_dirname = basename(yui_zip).replace('.zip', '').replace('_', '-')
+    yui_dir = join(build_dir, yui_dirname)
+    tmp_dir = join(build_dir, 'tmp')
+
+    # If the directory isn't there to remove, ignore it. If it does exist
+    # remove it so we drop our zip contents.
+    shutil.rmtree(yui_dir, ignore_errors=True)
+    shutil.rmtree(tmp_dir, ignore_errors=True)
+
+    os.makedirs(tmp_dir)
+
+    try:
+        zip = ZipFile(yui_zip, 'r')
+        zip.extractall(tmp_dir)
+        shutil.copytree(join(tmp_dir, 'yui', 'build'), yui_dir)
+    except Exception, exc:
+        sys.exit(exc)
+    finally:
+        # Make sure that we remove the tmp dir no matter what.
+        shutil.rmtree(tmp_dir, ignore_errors=True)
+
+
+def _validate_args(args):
+    """Verify that the args are valid.
+
+    The download cache exists.
+    We have a zip file for the YUI version specified.
+    The build directory exists.
+
+    """
+    if not isdir(args.download_cache):
+        sys.exit('Download cache not found.')
+
+    if not isdir(args.build_dir):
+        sys.exit('Build directory not found.')
+
+    yui_zip = "%s/%s" % (args.download_cache, YUI_ZIP % args.yui_version)
+    if not exists(yui_zip):
+        sys.exit('Could not find download: ' + yui_zip)
+
+def main(args):
+    """"""
+    # If any args aren't valid then output info on how to correct.
+    _validate_args(args)
+    yui_zip = "%s/%s" % (args.download_cache, YUI_ZIP % args.yui_version)
+    _unzip(yui_zip, args.build_dir)
+
+
+if __name__ == "__main__":
+    args = _parse_args()
+    main(args)

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-07-25 21:09:38 +0000
+++ buildout.cfg	2012-08-01 21:25:23 +0000
@@ -3,7 +3,6 @@
 
 [buildout]
 parts =
-    yui-default
     scripts
     filetemplates
     tags
@@ -11,6 +10,9 @@
     i18n
     txlongpoll
     auditor
+    yui-default
+    yui-3.5
+
 unzip = true
 eggs-directory = eggs
 download-cache = download-cache
@@ -40,24 +42,16 @@
 [yui]
 recipe = plone.recipe.command
 command =
-    mkdir -p ${buildout:yui-directory}/yui-${:yui_version}
-    rm -rf ${buildout:yui-directory}/yui-${:yui_version}/*
-    tar -zxf download-cache/dist/yui-${:yui_version}.tar.gz \
-        --wildcards --strip-components 2 \
-        -C ${buildout:yui-directory}/yui-${:yui_version} \
-        '*/build'
+    mkdir -p ${buildout:yui-directory}
+    bin/yui_extract --yui-version ${:yui_version} --download-cache download-cache/dist --build-dir ${buildout:yui-directory}
 
 [yui-default]
 <= yui
 yui_version = ${versions:yui}
 
-[yui-3.4]
-<= yui
-yui_version = 3.4.1
-
 [yui-3.5]
 <=yui
-yui_version = 3.5.0pr1
+yui_version = 3.5.1 
 
 [filetemplates]
 recipe = z3c.recipe.filetemplate