# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1306611735 -7200
# Node ID 8f19409f081a853c316d62803001e28d2f8da1b0
# Parent  959f5d1bd619d86abc41f89496294b6c6a26d9ab
Added a parser installation action.
Added support for attachments in the page-packaging action.
Added some release notes.

diff -r 959f5d1bd619 -r 8f19409f081a README.txt
--- a/README.txt	Fri Apr 15 23:08:37 2011 +0200
+++ b/README.txt	Sat May 28 21:42:15 2011 +0200
@@ -136,6 +136,20 @@
 CMDsyntax                   Tested with 0.91
                             Source: http://www.boddie.org.uk/david/Projects/Python/CMDSyntax/index.html
 
+New in moinsetup 0.2 (Changes since moinsetup 0.1)
+--------------------------------------------------
+
+  * Improved OpenID configuration, supporting MoinMoin 1.9, and added support
+    for other authentication methods.
+  * Added support for ACL-capable filesystems when setting Wiki permissions.
+    It can be more convenient to retain read/write access to the installed
+    files while also granting the Web server user (who need not be in a common
+    group) access to read and modify the files.
+  * Added support for configurations employing a separate static resources
+    directory (such as a typical "htdocs" directory).
+  * Added a parser installation action.
+  * Added support for page attachments in the page-packaging action.
+
 Release Procedures
 ------------------
 
diff -r 959f5d1bd619 -r 8f19409f081a moinsetup.py
--- a/moinsetup.py	Fri Apr 15 23:08:37 2011 +0200
+++ b/moinsetup.py	Sat May 28 21:42:15 2011 +0200
@@ -301,6 +301,7 @@
         "install_plugins",
         "install_actions",
         "install_macros",
+        "install_parsers",
         "install_theme_resources",
         "edit_theme_stylesheet",
 
@@ -981,6 +982,12 @@
 
         self.install_plugins(macros_dir, "macro")
 
+    def install_parsers(self, parsers_dir):
+
+        "Install Wiki macros provided in the given 'parsers_dir'."
+
+        self.install_plugins(parsers_dir, "parser")
+
     def install_theme_resources(self, theme_resources_dir, theme_name=None):
 
         """
@@ -1101,8 +1108,26 @@
             script = ["MoinMoinPackage|1"]
 
             for filename in os.listdir(page_directory):
-                package.write(join(page_directory, filename), filename)
-                script.append("AddRevision|%s|%s" % (filename, filename))
+                pathname = join(page_directory, filename)
+
+                # Add files as pages having the filename as page name.
+
+                if os.path.isfile(pathname):
+                    package.write(pathname, filename)
+                    script.append("AddRevision|%s|%s" % (filename, filename))
+
+                # Add directories ending with "-attachments" as collections of
+                # attachments for a particular page.
+
+                elif os.path.isdir(pathname) and filename.endswith("-attachments"):
+                    parent = filename[:-len("-attachments")]
+
+                    # Add each file as an attachment.
+
+                    for attachment in os.listdir(pathname):
+                        zipname = "%s_%s" % (filename, attachment)
+                        package.write(join(pathname, attachment), zipname)
+                        script.append("AddAttachment|%s|%s|%s||" % (zipname, attachment, parent))
 
             package.writestr("MOIN_PACKAGE", "\n".join(script))