sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d89bc5af952d9769a7bcccf74a632cda5f864d60)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d89bc5af952d9769a7bcccf74a632cda5f864d60)
Date: Sat, 3 Jan 2015 10:38:45 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3 ++
python-pypi/hatta/DETAILS | 11 +++++-----
python-pypi/hatta/HISTORY | 10 +++++++++
python-pypi/hatta/PRE_BUILD | 3 +-
python-pypi/hatta/locale.patch | 11 +++++-----
python-pypi/hatta/parser.patch | 23 +++++++++++++++++++++
python-pypi/hatta/template.patch | 41
+++++++++++++++++++++++++++++++++++++++
python-pypi/hatta/wanted.patch | 12 -----------
python-pypi/pelican/DEPENDS | 18 +++++++++++++++--
python-pypi/pelican/DETAILS | 26 ++++++++++++++++--------
python-pypi/pelican/HISTORY | 5 ++++
python-pypi/wok/DEPENDS | 17 ++++++++++++++++
python-pypi/wok/DETAILS | 16 +++++++++++++++
python-pypi/wok/HISTORY | 7 ++++++
python-pypi/wok/PRE_BUILD | 4 +++
python-pypi/wok/setup.patch | 19 ++++++++++++++++++
16 files changed, 192 insertions(+), 34 deletions(-)

New commits:
commit d89bc5af952d9769a7bcccf74a632cda5f864d60
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wok: new spell, static site generator

commit bf92948904d1d01843b38e5e40e2417a2cdf8556
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

hatta: => 1.6.5

commit 3709ddb7a5c61a44e30d9d5dc5f59d2d8fab4675
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pelican: => 3.5.0

diff --git a/ChangeLog b/ChangeLog
index bc6a287..f586b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-01-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/wok: new spell, static site generator
+
2015-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* ruby-raa/ruby-2.2: new sepll, latest ruby release

diff --git a/python-pypi/hatta/DETAILS b/python-pypi/hatta/DETAILS
index ac1d75e..05096f9 100755
--- a/python-pypi/hatta/DETAILS
+++ b/python-pypi/hatta/DETAILS
@@ -1,10 +1,11 @@
SPELL=hatta
- VERSION=1.6.3
+ SPELLX=Hatta
+ VERSION=1.6.5
PATCHLEVEL=1
- SOURCE=Hatta-${VERSION}.tar.gz
- SOURCE_URL[0]=http://pypi.python.org/packages/source/H/Hatta/$SOURCE
-
SOURCE_HASH=sha512:856a64cac7fcae791f5b53a37cce75d3331883c5038fd074d3129c19388ef3540fa5dc29810fb9ac460d2c132c54192f2997577046b6c203cd5f587537c66935
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Hatta-${VERSION}"
+ SOURCE=${SPELLX}-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/H/${SPELLX}/$SOURCE
+
SOURCE_HASH=sha512:782d9d679afd3b23cb6f5a4f08e67d97d96b21f0fc248b5eca93655a7c8a45f5b7a30cc30ee811ddf86a62dfd644a301d2fb0aadc4b9f99bf07e836800a28584
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE=http://hatta-wiki.org/
LICENSE[0]=GPL
ENTERED=20100815
diff --git a/python-pypi/hatta/HISTORY b/python-pypi/hatta/HISTORY
index 2a6fef1..60188d8 100644
--- a/python-pypi/hatta/HISTORY
+++ b/python-pypi/hatta/HISTORY
@@ -1,3 +1,13 @@
+2014-12-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * parser.patch: added, backported official patch
+
+2014-12-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.5; use SPELLX
+ * template.patch: added, to use custom templates
+ * locale.patch: updated for new version
+ * wanted.patch: dropped, fixed by upstream
+
2014-12-18 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added recaptcha-client suggest dep

diff --git a/python-pypi/hatta/PRE_BUILD b/python-pypi/hatta/PRE_BUILD
index af933f7..ad351a8 100755
--- a/python-pypi/hatta/PRE_BUILD
+++ b/python-pypi/hatta/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/wanted.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/parser.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/template.patch" &&
patch -p0 < "$SPELL_DIRECTORY/locale.patch"
diff --git a/python-pypi/hatta/locale.patch b/python-pypi/hatta/locale.patch
index 480fbff..005c605 100644
--- a/python-pypi/hatta/locale.patch
+++ b/python-pypi/hatta/locale.patch
@@ -1,7 +1,7 @@
$OpenBSD$
---- setup.py.orig Sat Sep 21 17:59:28 2013
-+++ setup.py Thu Oct 10 17:08:39 2013
-@@ -20,20 +20,20 @@ setuptools.setup(
+--- setup.py.orig 2014-12-20 01:24:03.000000000 +0300
++++ setup.py 2014-12-23 11:15:23.311023035 +0300
+@@ -20,21 +20,21 @@
tests_require=['py.test', 'lxml', 'pygments'],
data_files=[
('share/locale/ar/LC_MESSAGES', ['locale/ar/LC_MESSAGES/hatta.mo']),
@@ -20,9 +20,10 @@ $OpenBSD$
- ('share/locale/ja/LC_MESSAGES', ['locale/hu/LC_MESSAGES/hatta.mo']),
+ ('share/locale/hu/LC_MESSAGES', ['locale/hu/LC_MESSAGES/hatta.mo']),
('share/locale/ja/LC_MESSAGES', ['locale/ja/LC_MESSAGES/hatta.mo']),
+- ('share/locale/ja/LC_MESSAGES', ['locale/lt/LC_MESSAGES/hatta.mo']),
++ ('share/locale/lt/LC_MESSAGES', ['locale/lt/LC_MESSAGES/hatta.mo']),
('share/locale/pl/LC_MESSAGES', ['locale/pl/LC_MESSAGES/hatta.mo']),
-- ('share/locale/pl/LC_MESSAGES', ['locale/ru/LC_MESSAGES/hatta.mo']),
-+ ('share/locale/ru/LC_MESSAGES', ['locale/ru/LC_MESSAGES/hatta.mo']),
+ ('share/locale/ru/LC_MESSAGES', ['locale/ru/LC_MESSAGES/hatta.mo']),
('share/locale/sv/LC_MESSAGES', ['locale/sv/LC_MESSAGES/hatta.mo']),
- ('share/locale/sv/LC_MESSAGES', ['locale/vi/LC_MESSAGES/hatta.mo']),
+ ('share/locale/vi/LC_MESSAGES', ['locale/vi/LC_MESSAGES/hatta.mo']),
diff --git a/python-pypi/hatta/parser.patch b/python-pypi/hatta/parser.patch
new file mode 100644
index 0000000..d47fd46
--- /dev/null
+++ b/python-pypi/hatta/parser.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Radomir Dopieralski <devel AT sheep.art.pl>
+# Date 1419554508 -3600
+# Node ID 097c67f0fd2d3b433000b418def37c32b042c7ce
+# Parent c4b8828458b3764548b2cca48195a173cf2dbe7f
+Fix #109, don't catch parens and quotes in the e-mail link rule
+
+The rules for e-mail addresses allow for pretty much anything in the user
name
+part, but due to practical reasons we will exclude parens and quote symbols,
as
+they are rarely used in that place, but often used around e-mail addresses.
+
+diff --git a/hatta/parser.py b/hatta/parser.py
+--- a/hatta/parser.py
++++ b/hatta/parser.py
+@@ -341,7 +341,7 @@
+ return self._line_link(link_target=link_url)
+
+ @markup_rules(ur"""(?P<mail_address>(mailto:)?"""
+- ur"""\S+@\S+(\.[^\s.,:;!?()'"\*/=+<>-]+)+)""" , 90)
++
ur"""[^\s()\[\]<>{}"']+@\S+(\.[^\s.,:;!?()'"\*/=+<>-]+)+)""" , 90)
+ def _line_mail(self, mail_address):
+ text = mail_address
+ if mail_address.startswith(u'mailto:'):
diff --git a/python-pypi/hatta/template.patch
b/python-pypi/hatta/template.patch
new file mode 100644
index 0000000..f56162e
--- /dev/null
+++ b/python-pypi/hatta/template.patch
@@ -0,0 +1,41 @@
+--- hatta/config.py.orig 2013-11-11 16:03:04.000000000 +0300
++++ hatta/config.py 2014-12-23 11:26:37.826040437 +0300
+@@ -24,6 +24,8 @@
+ help='Use the repository at DIR', metavar='DIR')
+ _add('-t', '--cache-dir', dest='cache_path',
+ help='Store cache in DIR', metavar='DIR')
++_add('-T', '--template-dir', dest='template_path',
++ help='Use templates in DIR', metavar='DIR')
+ _add('-i', '--interface', dest='interface',
+ help='Listen on interface INT', metavar='INT')
+ _add('-p', '--port', dest='port', type='int',
+--- hatta/wiki.py.orig 2013-11-11 16:14:00.000000000 +0300
++++ hatta/wiki.py 2014-12-23 18:15:27.824078168 +0300
+@@ -52,10 +52,15 @@
+ return translation
+
+
+-def init_template(translation):
++def init_template(translation, template_path):
++ loaders = [ jinja2.PackageLoader('hatta', 'templates') ]
++
++ if template_path is not None:
++ loaders.insert(0,
jinja2.FileSystemLoader(os.path.abspath(template_path)))
++
+ template_env = jinja2.Environment(
+ extensions=['jinja2.ext.i18n'],
+- loader=jinja2.PackageLoader('hatta', 'templates'),
++ loader=jinja2.ChoiceLoader(loaders),
+ )
+ template_env.autoescape = True
+ template_env.install_gettext_translations(translation, True)
+@@ -82,7 +87,8 @@
+ self.language = config.get('language')
+ translation = init_gettext(self.language)
+ self.gettext = translation.ugettext
+- self.template_env = init_template(translation)
++ self.template_path = config.get('template_path')
++ self.template_env = init_template(translation, self.template_path)
+ self.path = os.path.abspath(config.get('pages_path', 'docs'))
+ self.repo_path = config.get('repo_path')
+ self.page_charset = config.get('page_charset', 'utf-8')
diff --git a/python-pypi/hatta/wanted.patch b/python-pypi/hatta/wanted.patch
deleted file mode 100644
index 3adffe7..0000000
--- a/python-pypi/hatta/wanted.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD$
---- hatta/templates/wanted.html.orig Sat May 18 14:05:36 2013
-+++ hatta/templates/wanted.html Sat Aug 2 19:31:56 2014
-@@ -8,7 +8,7 @@
- <ul class="wanted">
- {% for refs, page_title in pages %}
- <li>{{ page.wiki_link(page_title)|safe }}
-- (<a href="{{ url(page_title, wiki.backlinks) }}"
-+ (<a href="{{ url(page_title, 'backlinks') }}"
- class="backlinks"
- >{{ ngettext("%(num)d reference", "%(num)d references", refs) }}</a>)
- </li>
diff --git a/python-pypi/pelican/DEPENDS b/python-pypi/pelican/DEPENDS
index 370e953..cf20dfc 100755
--- a/python-pypi/pelican/DEPENDS
+++ b/python-pypi/pelican/DEPENDS
@@ -1,5 +1,5 @@
. ${SECTION_DIRECTORY}/PY_DEPENDS &&
-depends smartypants &&
+
depends feedgenerator &&
depends jinja2 &&
depends pygments &&
@@ -8,5 +8,19 @@ depends pytz &&
depends blinker &&
depends unidecode &&
depends six &&
+depends python-dateutil &&
+
suggest_depends typogrify "" "" "for typographical enhancements" &&
-suggest_depends python-markdown "" "" "support for the Markdown input
format"
+
+# TODO: add beautifulsoup4 spell to grimoire
+#suggest_depends beautifulsoup4 "" "" "for ability to import WordPress XML
files" &&
+#
+#if is_depends_enabled $SPELL beautifulsoup4; then
+# depends lxml
+#fi &&
+
+if [[ "$(get_spell_provider $SPELL PYTHON)" == "python" ]]; then
+ suggest_depends simplejson "" "" "for ability to import Posterous and
Tumblr posts"
+fi &&
+
+suggest_depends python-markdown "" "" "for Markdown input format support"
diff --git a/python-pypi/pelican/DETAILS b/python-pypi/pelican/DETAILS
index 6e2b7f2..8c6925f 100755
--- a/python-pypi/pelican/DETAILS
+++ b/python-pypi/pelican/DETAILS
@@ -1,18 +1,26 @@
SPELL=pelican
- VERSION=3.3.0
+ VERSION=3.5.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=https://github.com/getpelican/pelican/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:352f755d95662c0cd06f1860ebeddc2b2b9fe84ddac4ae4c51b96a04119414a50e5920d88d8b6e7ab2bbd5463d2c048f74682f8893512aa927d7c1ae3884d049
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELL}/{SOURCE}
+
SOURCE_HASH=sha512:37222a8e8a732dd0c6122e57cf8f7ae5c522d2886404515df0bcd5b741e41c563a4819a3ae2e2b963d27343e8f211ae86c5630b1229cf42f4ec59f6f14272429
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://getpelican.com/";
LICENSE[0]=Affero GPL
ENTERED=20130702
- SHORT="A tool to generate a static blog from reStructuredText or
Markdown input files"
+ SHORT="tool to generate a static blog from reStructuredText or
Markdown input files"
cat << EOF
-Pelican is a static site generator, written in Python.
+Pelican is a static site generator, written in Python, that requires no
database
+or server-side logic.

- * Write your weblog entries directly with your editor of choice (vim!) in
- reStructuredText or Markdown * Includes a simple CLI tool to (re)generate
- the weblog * Easy to interface with DVCSes and web hooks * Completely
- static output is easy to host anywhere
+Some of the features include:
+
+o Write your content in reStructuredText, Markdown, or AsciiDoc formats
+o Completely static output is easy to host anywhere
+o Themes that can be customized via Jinja templates
+o Publish content in multiple languages
+o Atom/RSS feeds
+o Code syntax highlighting
+o Import from WordPress, Dotclear, RSS feeds, and other services
+o Modular plugin system and corresponding plugin repository
+o ... and many other features.
EOF
diff --git a/python-pypi/pelican/HISTORY b/python-pypi/pelican/HISTORY
index 96bcc41..abe0ab9 100644
--- a/python-pypi/pelican/HISTORY
+++ b/python-pypi/pelican/HISTORY
@@ -1,3 +1,8 @@
+2014-12-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.5.0; updated descriptions, source url
+ * DEPENDS: removed smartypants -- it's optional and included within
+ typogrify suggest dep; added missing python-dateutil required dep
+
2014-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.3.0

diff --git a/python-pypi/wok/DEPENDS b/python-pypi/wok/DEPENDS
new file mode 100755
index 0000000..1c75b28
--- /dev/null
+++ b/python-pypi/wok/DEPENDS
@@ -0,0 +1,17 @@
+depends python &&
+depends SETUPTOOLS &&
+depends jinja2 &&
+depends pyyaml &&
+depends awesome-slugify &&
+
+message "${MESSAGE_COLOR}NOTICE: You probably want to install either a
Markdown library (one of" &&
+message "'python-markdown', or 'python-markdown2'), 'docutils', or
'python-textile'." &&
+message "Otherwise only plain text input will be supported.${DEFAULT_COLOR}"
&&
+
+suggest_depends python-markdown "" "" "for Markdown rendering support via
markdown library" &&
+suggest_depends python-markdown2 "" "" "for Markdown rendering support via
markdown2 library" &&
+suggest_depends docutils "" "" "for reStructuredText rendering support" &&
+suggest_depends python-textile "" "" "for Textile rendering support" &&
+
+suggest_depends pygments "" "" "for syntax highlighting support" &&
+suggest_depends pytest "" "" "to perform test cases (useful for development)"
diff --git a/python-pypi/wok/DETAILS b/python-pypi/wok/DETAILS
new file mode 100755
index 0000000..1f29271
--- /dev/null
+++ b/python-pypi/wok/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=wok
+ VERSION=1.1.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/w/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:fe295720ff6f54e3bbdc15ee4d6d0307aa41fd61b01add996b2c9cfeb7c82d5e0b000e5a871b5ebd464b1ef59a3f57ec48221b8d54453cd3177b89c46f824f77
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=http://wok.mythmon.com/
+ LICENSE[0]=MIT
+ ENTERED=20150103
+ SHORT="static site generator"
+cat << EOF
+Wok is a static website generator. It turns a pile of templates, content, and
+resources (like CSS and images) into a neat stack of plain HTML. You run it
on
+your local computer, and it generates a directory of web files that you can
+upload to your web server, or serve directly.
+EOF
diff --git a/python-pypi/wok/HISTORY b/python-pypi/wok/HISTORY
new file mode 100644
index 0000000..0ace068
--- /dev/null
+++ b/python-pypi/wok/HISTORY
@@ -0,0 +1,7 @@
+2014-12-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: rearrange dependencies
+ * PRE_BUILD: added, to apply patch
+ * setup.patch: added, to fix setup.py
+
+2014-12-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 1.1.1
diff --git a/python-pypi/wok/PRE_BUILD b/python-pypi/wok/PRE_BUILD
new file mode 100755
index 0000000..46a91b3
--- /dev/null
+++ b/python-pypi/wok/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/setup.patch"
diff --git a/python-pypi/wok/setup.patch b/python-pypi/wok/setup.patch
new file mode 100644
index 0000000..91b2fa7
--- /dev/null
+++ b/python-pypi/wok/setup.patch
@@ -0,0 +1,19 @@
+--- setup.py.orig 2014-04-30 05:28:50.000000000 +0300
++++ setup.py 2014-12-22 14:06:26.456200951 +0300
+@@ -25,13 +25,9 @@
+ 'Programming Language :: Python',
+ ],
+ install_requires=[
+- 'Jinja2==2.6',
+- 'Markdown==2.1.1',
+- 'PyYAML==3.10',
+- 'Pygments==1.4',
+- 'docutils==0.8.1',
+- 'awesome-slugify==1.4',
+- 'pytest==2.5.2',
++ 'Jinja2>=2.6',
++ 'PyYAML>=3.10',
++ 'awesome-slugify>=1.4',
+ ],
+ packages=['wok'],
+ scripts=['scripts/wok'],

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d89bc5af952d9769a7bcccf74a632cda5f864d60), Vlad Glagolev, 01/03/2015