From 264ca302a92cf3f8c21e1b8d899e3082451ebaec Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 14:41:09 +0100 Subject: add a command to closure compile javascripts --- jarmonbuild/commands.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 0be6cf0..2fb2a00 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -8,6 +8,8 @@ import logging import os import shutil import sys +import httplib +import urllib from optparse import OptionParser from subprocess import check_call, PIPE @@ -15,6 +17,9 @@ from tempfile import gettempdir from urllib2 import urlopen from zipfile import ZipFile, ZIP_DEFLATED +from lxml.cssselect import CSSSelector +from lxml import html + import pkg_resources @@ -261,11 +266,53 @@ class BuildTestDataCommand(BuildCommand): my_rrd.update() +class BuildJavascriptDependenciesCommand(BuildCommand): + """ + Export all source files, generate apidocs and create a zip archive for + upload to Launchpad. + """ + + command_name = 'jsdeps' + + def main(self, argv): +# workingbranch_dir = self.workingbranch_dir + build_dir = self.build_dir + + self.log.debug('Compiling javascript dependencies') + + # Define the parameters for the POST request and encode them in + # a URL-safe format. + sel = CSSSelector('script') + doc = html.parse(os.path.join(self.workingbranch_dir, 'docs/examples/index.html')) + external_scripts = [src for src in [ + e.get('src', '') for e in sel(doc)] if src.startswith('http')] + + params = [('code_url', src) for src in external_scripts] + [ + ('compilation_level', 'SIMPLE_OPTIMIZATIONS'), + ('output_format', 'text'), + ('output_info', 'compiled_code'), + ] + + # Always use the following value for the Content-type header. + headers = { "Content-type": "application/x-www-form-urlencoded" } + conn = httplib.HTTPConnection('closure-compiler.appspot.com') + conn.request('POST', '/compile', urllib.urlencode(params), headers) + response = conn.getresponse() + with open(os.path.join(build_dir, 'dependencies.js'), 'w') as f: + for param in params: + f.write('// %s: %s\n' % param) + f.write(response.read()) + + conn.close + + + # The available subcommands SUBCOMMAND_HANDLERS = [ BuildApidocsCommand, BuildReleaseCommand, BuildTestDataCommand, + BuildJavascriptDependenciesCommand, ] -- cgit v1.2.3-2-g168b From e4a7e36fb85be64424ff1fb876d073baafc354c8 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 15:17:17 +0100 Subject: write in chunks --- jarmonbuild/commands.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 2fb2a00..d8d11cd 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -301,7 +301,9 @@ class BuildJavascriptDependenciesCommand(BuildCommand): with open(os.path.join(build_dir, 'dependencies.js'), 'w') as f: for param in params: f.write('// %s: %s\n' % param) - f.write(response.read()) + + while not response.isclosed(): + f.write(response.read(1024 * 10)) conn.close -- cgit v1.2.3-2-g168b From 2aaf1042b4fdfc4b1f8aa8f0d898ad3e9fac1bcf Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 15:40:16 +0100 Subject: read params from existing dependencies.js file --- jarmonbuild/commands.py | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index d8d11cd..7c0e947 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -275,30 +275,26 @@ class BuildJavascriptDependenciesCommand(BuildCommand): command_name = 'jsdeps' def main(self, argv): -# workingbranch_dir = self.workingbranch_dir - build_dir = self.build_dir - self.log.debug('Compiling javascript dependencies') - # Define the parameters for the POST request and encode them in - # a URL-safe format. - sel = CSSSelector('script') - doc = html.parse(os.path.join(self.workingbranch_dir, 'docs/examples/index.html')) - external_scripts = [src for src in [ - e.get('src', '') for e in sel(doc)] if src.startswith('http')] + depjs_path = os.path.join( + self.workingbranch_dir, + 'docs/examples/assets/js/dependencies.js') - params = [('code_url', src) for src in external_scripts] + [ - ('compilation_level', 'SIMPLE_OPTIMIZATIONS'), - ('output_format', 'text'), - ('output_info', 'compiled_code'), - ] + # Get the closure params from the original file + params = [] + for line in open(depjs_path): + line = line.strip() + if line.startswith('//'): + key, val = line.lstrip('/').strip().split(':', 1) + params.append((key.strip(), val.strip())) # Always use the following value for the Content-type header. headers = { "Content-type": "application/x-www-form-urlencoded" } conn = httplib.HTTPConnection('closure-compiler.appspot.com') conn.request('POST', '/compile', urllib.urlencode(params), headers) response = conn.getresponse() - with open(os.path.join(build_dir, 'dependencies.js'), 'w') as f: + with open(depjs_path, 'w') as f: for param in params: f.write('// %s: %s\n' % param) -- cgit v1.2.3-2-g168b From ba30d3162ebe010c9ed7ce2e3ae6a70366f9c98e Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 15:43:12 +0100 Subject: use closure compiler @ prefixes --- jarmonbuild/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 7c0e947..14d99a5 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -296,7 +296,7 @@ class BuildJavascriptDependenciesCommand(BuildCommand): response = conn.getresponse() with open(depjs_path, 'w') as f: for param in params: - f.write('// %s: %s\n' % param) + f.write('// @%s %s\n' % param) while not response.isclosed(): f.write(response.read(1024 * 10)) -- cgit v1.2.3-2-g168b From 744cb1f8c46d46aef94283160b6ea27d1cf75ece Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 15:48:17 +0100 Subject: parse @ style closure params --- jarmonbuild/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 14d99a5..fc422d9 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -286,7 +286,7 @@ class BuildJavascriptDependenciesCommand(BuildCommand): for line in open(depjs_path): line = line.strip() if line.startswith('//'): - key, val = line.lstrip('/').strip().split(':', 1) + key, val = line.lstrip('/ @').strip().split(':', 1) params.append((key.strip(), val.strip())) # Always use the following value for the Content-type header. -- cgit v1.2.3-2-g168b From 17de37c2f6d5cefebdac506340c79bb42df66a3b Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 15:49:53 +0100 Subject: parse @ style closure params --- jarmonbuild/commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index fc422d9..1aaa155 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -285,8 +285,8 @@ class BuildJavascriptDependenciesCommand(BuildCommand): params = [] for line in open(depjs_path): line = line.strip() - if line.startswith('//'): - key, val = line.lstrip('/ @').strip().split(':', 1) + if line.startswith('// @'): + key, val = line.lstrip('/ @').strip().split(None, 1) params.append((key.strip(), val.strip())) # Always use the following value for the Content-type header. -- cgit v1.2.3-2-g168b From bd007c8ef6386e9d15fc0841876512dc77eb4c9b Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 15:55:15 +0100 Subject: Remove unused imports --- jarmonbuild/commands.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 1aaa155..398ba71 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -17,9 +17,6 @@ from tempfile import gettempdir from urllib2 import urlopen from zipfile import ZipFile, ZIP_DEFLATED -from lxml.cssselect import CSSSelector -from lxml import html - import pkg_resources -- cgit v1.2.3-2-g168b From 4a25637c2af68b667082851c02746c88f5ed9f40 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 16:18:33 +0100 Subject: print a timestamp into compiled javascript file --- jarmonbuild/commands.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 398ba71..2e0983b 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -11,6 +11,7 @@ import sys import httplib import urllib +from datetime import datetime from optparse import OptionParser from subprocess import check_call, PIPE from tempfile import gettempdir @@ -230,7 +231,6 @@ class BuildTestDataCommand(BuildCommand): Create an RRD file with values 0-9 entered at 1 second intervals from 1980-01-01 00:00:00 (the first date that rrdtool allows) """ - from datetime import datetime from pyrrd.rrd import DataSource, RRA, RRD start = int(datetime(1980, 1, 1, 0, 0).strftime('%s')) dss = [] @@ -292,6 +292,8 @@ class BuildJavascriptDependenciesCommand(BuildCommand): conn.request('POST', '/compile', urllib.urlencode(params), headers) response = conn.getresponse() with open(depjs_path, 'w') as f: + f.write( + '// Compiled with closure-compiler on %s\n' % (datetime.now())) for param in params: f.write('// @%s %s\n' % param) -- cgit v1.2.3-2-g168b From 61d1dff1dd1125578c367f4419bc9545fcb65dc8 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Sat, 18 Jun 2011 16:43:04 +0100 Subject: fix yuidoc url --- jarmonbuild/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jarmonbuild/commands.py') diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 2e0983b..f6ed712 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -24,7 +24,7 @@ import pkg_resources JARMON_PROJECT_TITLE = 'Jarmon' JARMON_PROJECT_URL = 'http://www.launchpad.net/jarmon' -YUIDOC_URL = 'http://yuilibrary.com/downloads/yuidoc/yuidoc_1.0.0b1.zip' +YUIDOC_URL = 'http://yui.zenfs.com/releases/yuidoc/yuidoc_1.0.0b1.zip' YUIDOC_MD5 = 'cd5545d2dec8f7afe3d18e793538162c' YUIDOC_DEPENDENCIES = ['setuptools', 'pygments', 'cheetah'] -- cgit v1.2.3-2-g168b