From 58c4878526dec5510f23c812274686787d8724ba Mon Sep 17 00:00:00 2001 From: Agustin Henze Date: Fri, 13 Jun 2014 21:51:02 -0300 Subject: Imported Upstream version 7.0.1 --- scripts/generate_symlinked_list.sh | 9 ++ scripts/getbaseline.sh | 14 +++ scripts/getwheelhouse.sh | 7 ++ scripts/import_po.py | 16 --- scripts/jinjify.py | 219 +++++++++++++++++++++++++++++++++++++ scripts/nikola | 37 ------- scripts/nikola.bat | 2 - scripts/set_version.py | 5 +- scripts/theme_snapshot | 2 +- 9 files changed, 252 insertions(+), 59 deletions(-) create mode 100755 scripts/generate_symlinked_list.sh create mode 100755 scripts/getbaseline.sh create mode 100755 scripts/getwheelhouse.sh create mode 100755 scripts/jinjify.py delete mode 100755 scripts/nikola delete mode 100755 scripts/nikola.bat (limited to 'scripts') diff --git a/scripts/generate_symlinked_list.sh b/scripts/generate_symlinked_list.sh new file mode 100755 index 0000000..fe7a7cc --- /dev/null +++ b/scripts/generate_symlinked_list.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Generate a list of symlinked files and directories. +# Each line must be the file path, relative to the git root. + +WDir="${PWD##*/}" +[[ $WDir == 'scripts' ]] && cd .. + +dst='nikola/data/symlinked.txt' +git ls-files -s | awk '/120000/{print $4}' > $dst diff --git a/scripts/getbaseline.sh b/scripts/getbaseline.sh new file mode 100755 index 0000000..719fbe5 --- /dev/null +++ b/scripts/getbaseline.sh @@ -0,0 +1,14 @@ +#!/bin/bash +cd tests/data +for i in $@; do + if [[ $i == '2.7' ]]; then + # we only support 2.7 now + wget https://github.com/getnikola/invariant-builds/archive/v$i'.zip' + unzip 'v'$i'.zip' + rm -rf baseline$i + mv invariant-builds-$i baseline$i + rm 'v'$i'.zip' + else + echo 'Version '$i' does not support baseline testing.' + fi +done diff --git a/scripts/getwheelhouse.sh b/scripts/getwheelhouse.sh new file mode 100755 index 0000000..911ffbd --- /dev/null +++ b/scripts/getwheelhouse.sh @@ -0,0 +1,7 @@ +#!/bin/bash +for i in $@; do + wget https://github.com/getnikola/wheelhouse/archive/v$i'.zip' + unzip 'v'$i'.zip' + pip install --use-wheel --no-index --find-links=wheelhouse-$i lxml Pillow ipython + rm -rf wheelhouse-$i 'v'$i'.zip' +done diff --git a/scripts/import_po.py b/scripts/import_po.py index 7e99064..50afab9 100755 --- a/scripts/import_po.py +++ b/scripts/import_po.py @@ -25,22 +25,6 @@ MESSAGES = {""".splitlines() lines2 = [] for entry in po: lines2.append(' "{0}": "{1}",'. format(entry.msgid, entry.msgstr)) - ### BACKWARDS COMPATIBILITY PATCH START - ### TODO: remove in v7 - if entry.msgid in ["Posted:", "Also available in:"]: - fid = entry.msgid - fid = fid.replace(':', '') - fstr = entry.msgstr - fstr = fstr.replace(':', '').replace(':', '') - lines2.append(' "{0}": "{1}",'. format(fid, fstr)) - elif entry.msgid == 'More posts about %s': - fid = entry.msgid - fid = fid.replace(' %s', '') - fstr = entry.msgstr - fstr = fstr.replace(' %s', '').replace('%s', '') - lines2.append(' "{0}": "{1}",'. format(fid, fstr)) - ### BACKWARDS COMPATIBILITY PATCH END - ### TODO: remove in v7 lines.extend(sorted(lines2)) lines.append("}\n") print("Generating:", outf) diff --git a/scripts/jinjify.py b/scripts/jinjify.py new file mode 100755 index 0000000..5f07032 --- /dev/null +++ b/scripts/jinjify.py @@ -0,0 +1,219 @@ +#!/usr/bin/env python +import codecs +import glob +import sys +import os +import re +import json +import shutil + +import colorama +import jinja2 + +dumb_replacements = [ + ["{% if isinstance(url, tuple) %}", "{% if url is mapping %}"], + ["{% if any(post.is_mathjax for post in posts) %}", '{% if posts|selectattr("is_mathjax")|list %}'], + ["json.dumps(title)", "title|tojson"], + ["{{ parent.extra_head() }}", "{{ super() }}"], + ["prefix='\\", "prefix='"], + ["og: http://ogp.me/ns# \\", "og: http://ogp.me/ns#"], + ["article: http://ogp.me/ns/article# \\", "article: http://ogp.me/ns/article#"], + ["fb: http://ogp.me/ns/fb# \\", "fb: http://ogp.me/ns/fb#"], + ['dir="rtl" \\', 'dir="rtl"'] +] + +dumber_replacements = [ + ["(.*)', re.IGNORECASE) + macro_end = re.compile(r'(.*)(.*)', re.IGNORECASE) + + if_start = re.compile(r'(.*)% *if (.*):(.*)', re.IGNORECASE) + if_else = re.compile(r'(.*)% *else.*:(.*)', re.IGNORECASE) + if_elif = re.compile(r'(.*)% *elif (.*):(.*)', re.IGNORECASE) + if_end = re.compile(r'(.*)% *endif(.*)', re.IGNORECASE) + + for_start = re.compile(r'(.*)% *for (.*):(.*)', re.IGNORECASE) + for_end = re.compile(r'(.*)% *endfor(.*)', re.IGNORECASE) + + namespace = re.compile(r'(.*)<% *namespace name="(.*?)".* file="(.*?)".*/>(.*)', re.IGNORECASE) + inherit = re.compile(r'(.*)<% *inherit file="(.*?)".*/>(.*)', re.IGNORECASE) + + block_single_line = re.compile(r'(.*)<% *block.*name="(.*?)".*>(.*)(.*)', re.IGNORECASE) + block_start = re.compile(r'(.*)<% *block.*name="(.*?)".*>(.*)', re.IGNORECASE) + block_end = re.compile(r'(.*)(.*)', re.IGNORECASE) + + val = re.compile(r'\$\{(.*?)\}', re.IGNORECASE) + func_len = re.compile(r'len\((.*?)\)', re.IGNORECASE) + filter_h = re.compile(r'\|h', re.IGNORECASE) + filter_striphtml = re.compile(r'\|striphtml', re.IGNORECASE) + filter_u = re.compile(r'\|u', re.IGNORECASE) + + comment_single_line = re.compile(r'^.*##(.*?)$', re.IGNORECASE) + + for line in input_file: + + # Process line for repeated inline replacements + m_val = val.search(line) + m_func_len = func_len.search(line) + m_filter_h = filter_h.search(line) + m_filter_striphtml = filter_striphtml.search(line) + m_filter_u = filter_u.search(line) + + if m_val: + line = val.sub(r'{{ \1 }}', line) + + if m_filter_h: + line = filter_h.sub(r'|e', line) + + if m_filter_striphtml: + line = filter_striphtml.sub(r'|e', line) + + if m_filter_u: + line = filter_u.sub(r'|urlencode', line) + + if m_func_len: + line = func_len.sub(r'\1|length', line) + + # Process line for single 'whole line' replacements + m_macro_start = macro_start.search(line) + m_macro_end = macro_end.search(line) + m_if_start = if_start.search(line) + m_if_else = if_else.search(line) + m_if_elif = if_elif.search(line) + m_if_end = if_end.search(line) + m_for_start = for_start.search(line) + m_for_end = for_end.search(line) + m_namspace = namespace.search(line) + m_inherit = inherit.search(line) + m_block_single_line = block_single_line.search(line) + m_block_start = block_start.search(line) + m_block_end = block_end.search(line) + + m_comment_single_line = comment_single_line.search(line) + + if m_comment_single_line: + output += m_comment_single_line.expand(r'{# \1 #}') + '\n' + + elif m_macro_start: + output += m_macro_start.expand(r'\1{% macro \2 %}\3') + '\n' + elif m_macro_end: + output += m_macro_end.expand(r'\1{% endmacro %}\1') + '\n' + + elif m_if_start: + output += m_if_start.expand(r'\1{% if \2 %}\3') + '\n' + elif m_if_else: + output += m_if_else.expand(r'\1{% else %}\2') + '\n' + elif m_if_elif: + output += m_if_elif.expand(r'\1{% elif \2 %}\3') + '\n' + elif m_if_end: + output += m_if_end.expand(r'\1{% endif %}\2') + '\n' + + elif m_for_start: + output += m_for_start.expand(r'\1{% for \2 %}\3') + '\n' + elif m_for_end: + output += m_for_end.expand(r'\1{% endfor %}\2') + '\n' + + elif m_namspace: + output += m_namspace.expand(r"\1{% import '\3' as \2 with context %}\4") + '\n' + elif m_inherit: + output += m_inherit.expand(r"{% extends '\2' %}\3") + '\n' + + elif m_block_single_line: + output += m_block_single_line.expand(r'\1{% block \2 %}\3{% endblock %}\4') + '\n' + elif m_block_start: + output += m_block_start.expand(r'\1{% block \2 %}\3') + '\n' + elif m_block_end: + output += m_block_end.expand(r'\1{% endblock %}\2') + '\n' + + else: + # Doesn't match anything we're going to process, pass though + output += line + + return output + +if __name__ == "__main__": + if len(sys.argv) != 3: + print('ERROR: needs exactly two arguments, input and output directory.') + else: + jinjify(sys.argv[1], sys.argv[2]) diff --git a/scripts/nikola b/scripts/nikola deleted file mode 100755 index 16ac701..0000000 --- a/scripts/nikola +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -"""Nikola main script.""" - -from __future__ import print_function -import os -import sys - -# LIBDIR trick start (marker for removal on platforms that don't need it) -libdir = '@LIBDIR@' - -# Two cases: -if libdir != '@' 'LIBDIR' '@': - # Changed by our distutils hook, then use the given path. - - if not os.path.isabs(libdir): - libdir = os.path.join(os.path.dirname( - os.path.realpath(__file__)), libdir) - libdir = os.path.abspath(libdir) -else: - # Unchanged, running from checkout, - # use the parent directory, the nikola package ought be there. - libdir = os.path.join(os.path.dirname(__file__), "..") - -sys.path.insert(0, libdir) - -if "PYTHONPATH" not in os.environ: - os.environ["PYTHONPATH"] = libdir -else: - os.environ["PYTHONPATH"] = os.environ["PYTHONPATH"] + ":" + libdir - -# LIBDIR trick end (marker for removal on platforms that don't need it) - -from nikola import __main__ - -if __name__ == "__main__": - sys.exit(__main__.main(sys.argv[1:])) diff --git a/scripts/nikola.bat b/scripts/nikola.bat deleted file mode 100755 index 0aad2d4..0000000 --- a/scripts/nikola.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -python "%~dpn0" %* \ No newline at end of file diff --git a/scripts/set_version.py b/scripts/set_version.py index 38ea03c..100a9f7 100755 --- a/scripts/set_version.py +++ b/scripts/set_version.py @@ -23,9 +23,8 @@ def sed_like_thing(pattern, repl, path): outf.write(data) if __name__ == "__main__": - print("New version number (in format X.Y.Z): ", end="") - sys.stdout.flush() - version = sys.stdin.readline().strip() + inpf = raw_input if sys.version_info[0] == 2 else input + version = inpf("New version number (in format X.Y.Z): ").strip() for doc in glob.glob(os.path.join("docs/*.txt")): sed_like_thing(":Version: .*", ":Version: {0}".format(version), doc) diff --git a/scripts/theme_snapshot b/scripts/theme_snapshot index ab3ac7f..391f9c6 100755 --- a/scripts/theme_snapshot +++ b/scripts/theme_snapshot @@ -7,7 +7,7 @@ theme_name=$1 tempsite=temp_$theme_name -nikola init $tempsite +nikola init -q $tempsite cd $tempsite doit install_theme -n $theme_name sed -i s/\'site\'/\'$theme_name\'/g conf.py -- cgit v1.2.3