v2.1.5.6: #23, http:// disabled for aurweb.

Signed-off-by: Kwpolska <kwpolska@gmail.com>
Kwpolska · Oct 28, 2012 · a5f0560 · a5f0560
1 parent e73449a
commit a5f0560
Show file tree

Hide file tree

Showing 41 changed files with 562 additions and 458 deletions.
diff --git a/.pbwrapperhelp b/.pbwrapperhelp
@@ -33,33 +33,33 @@ options:
       --noscriptlet    do not execute the install scriptlet if one exists
       --print-format <string>
                        specify how the targets should be printed
-usage: pkgbuilder [-h] [-V] [-c] [-C] [--debug] [-d] [-D] [-v] [-w]
-                  [-P PROTOCOL] [-S] [-y] [-i] [-s] [-u]
+usage: pkgbuilder [-h] [-V] [-c] [-C] [--debug] [-d] [-D] [-v] [-w] [-S] [-y]
+                  [-i] [-s] [-u]
                   [PACKAGE [PACKAGE ...]]
 
 An AUR helper (and library) in Python 3.
 
 positional arguments:
-  PACKAGE               packages to build
+  PACKAGE             AUR/ABS packages to build
 
 optional arguments:
-  -h, --help            show this help message and exit
-  -V, --version         show version number and quit
+  -h, --help          show this help message and exit
+  -V, --version       show version number and quit
 
 options:
-  -c, --clean           clean up work files after build
-  -C, --nocolors        don't use colors in output
-  --debug               display debug messages
-  -d, --nodepcheck      don't check dependencies (may break makepkg)
-  -D, --vcsupgrade      upgrade all the VCS/date-versioned packages
-  -v, --novalidation    don't check if packages were installed after build
-  -w, --buildonly       don't install packages after building
-  -P PROTOCOL, --protocol PROTOCOL
-                        choose protocol (default: http)
-  -S, --sync            pacman-like mode
-  -y, --refresh         (dummy)
+  -c, --clean         clean up work files after build
+  -C, --nocolors      don't use colors in output
+  --debug             display debug messages
+  -d, --nodepcheck    don't check dependencies (may break makepkg)
+  -D, --vcsupgrade    upgrade all the VCS/date-versioned packages
+  -v, --novalidation  don't check if packages were installed after build
+  -w, --buildonly     don't install packages after building
+  -S, --sync          pacman-like mode
+  -y, --refresh       (dummy)
 
 operations:
-  -i, --info            view package information
-  -s, --search          search the AUR for matching strings
-  -u, --sysupgrade      upgrade installed AUR packages
+  -i, --info          view package information
+  -s, --search        search the AUR for matching strings
+  -u, --sysupgrade    upgrade installed AUR packages
+
+Also accepting ABS packages.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Kwpolska <kwpolska@kwpolska.tk>
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: CHANGELOG
 

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -1,43 +1,140 @@
 ==============================
-Appendix D. Contribution rules
+Appendix A. Contribution rules
 ==============================
 :Author: Kwpolska <kwpolska@kwpolska.tk>
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
+
+.. index:: contributing
 
 Do you want to contribute to this project?  Great!  I’d love to see some help,
-but you need to comply with some easy rules.
+but you must comply with some rules.
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
+NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and
+"OPTIONAL" in this document are to be interpreted as described in
+RFC 2119.
 
+---------------
 Issue reporting
-===============
+---------------
+
+.. index:: issues
 
-GitHub Issues are the best way to report an issue.  If you do not have an
+GitHub Issues are the recommended way to report an issue.  If you do not have an
 account there, get one or mail me.
 
-When pasting console sessions, please paste them fully, *prompt-to-prompt*, to
-see all the messages and your input.  Trim only stuff that you are 1000% sure
-that is not related to the project in question.
+When pasting console sessions, you must paste them fully,
+*prompt-to-prompt*, to see all the messages and your input.
+Trim only stuff that you are 1000% sure that is not related
+to the project in question.
+
+--------------------------------------------
+General preparations, rules and pull process
+--------------------------------------------
+
+Prepare
+=======
+
+A GitHub account is recommended.  Patches by mail are accepted, but working
+with you through there is a better way.
+
+Fork the repo first.  Non-GitHub people, ``git clone``.
+
+.. _Rules:
+
+Rules
+=====
+
+1. Commits must have short, informative and logical messages.  Signoffs and
+   long messages are recommended.  “fixes #xxx” is required if an issue
+   exists.
+2. The following fancy Unicode characters should be used when
+   needed: ``— “ ” ‘ ’``
+3. The ellipsis (``…``) character must not be used in program output for
+   humans, but may be used elsewhere.
+4. I’m a Grammar Nazi.
+
+Request a Pull
+==============
+
+Done?  Go hit the **Pull Request** button over on GitHub!  And if you don’t
+use GitHub, ``git format-patch``.  Other formats are not accepted.
+
+Your commit should be pulled up in a (longer) while.  If I like it.  Because
+some commits may be bad.  So, do your best not to do those bad commits.
+
+---------------------------------------
+Details for specific contribution types
+---------------------------------------
+
+Code (Python)
+=============
+
+1. PEP 8.  ``pip install pep8`` is recommended.
+2. ``./tests.py``.
+3. Localize all the strings (``_('string')``)
+4. Strings must be quoted using ``'str'``.  Multi-line strings, ``"""str"""``.
+   Use the latter only if needed.  Otherwise, do:
+
+.. code-block:: python
+   :linenos:
+
+   string = ('A very, very, very long string '
+             'that’s broken up into multiple lines.')
+
+   string = _('A very, very, very log string '
+              'that’s broken up into multiple lines '
+              'and that is localized through gettext.'))
+
+5. ``str.format``.  Braces should be empty or contain a name that is later
+   passed on to the function.  The format function should be inserted *after*
+   the parenthesis for string localization.  For example:
+
+.. code-block:: python
+   :linenos:
+
+   string = _('{} is awesome').format('PKGBUILDer')
+   string = _('{sth} is awesome').format(sth='PKGBUILDer')
+
+6. Documentation is important.  Please take care of it.
+
+Code (non-Python)
+=================
 
-Code contributions
-==================
+Rejected.
 
-Pythonista?  Great!  There are a few things you need to do first.
+Non-code contributions
+======================
 
- * A GitHub account is mandatory.  Period.  Patches by mail are not accepted.
-   Sorry.
- * Fork the repo and work on it.
+Those are accepted.  No specific rules exist.  And don’t remove any files
+without my permission (``docs/*.8.gz`` in particular).
 
-And these are the rules used while writing code or commiting:
+Localization
+============
 
- * PEP 8.  ``pip install pep8`` may help you.
- * Commits should be logical.  Signoffs and long messages are welcome.  “fixes
-   #xxx” is mandatory if an issue exists.
- * ``./tests.py``.
+.. index:: locale
 
-Done?  Go hit the **Pull Request** button over on GitHub!  Your commit should
-be pulled up in the next few moments.
+1. Run ``mkdir -p locale/[CODE]/LC_MESSAGES`` in your terminal, replacing
+   ``[CODE]`` by your language code, as in /usr/share/locale.
+2. Copy the ``/messages.pot`` file to
+   ``locale/[CODE]/LC_MESSAGES/[PROJECT].po`` (replace ``[PROJECT]`` with the
+   project name, all-lowercase)
+3. Do your work.  The comments will inform you where this string is, and the
+   ones starting with 'TRANSLATORS:' are for you to read and make use of.
+   Other comments come from my code and you should not care about them.  And
+   if it is directed for translators, let me know.  The Poedit_ app may be
+   of help.  Please take care of the headers at the top of the file (with a
+   text editor, do not use Poedit for that!)  and modify them.  The
+   Last-Translator, Language-Team and Language are important, the others are
+   auto-generated anyways.  The general :ref:`Rules` apply, please take care
+   of it!
+4. Commit (``-s/--signoff`` is required here).
+5. Your translation will be added in the next release, or, if a release isn’t
+   planned in the near future, a new release will be made.  Your addition will
+   be appreciated.  Note that I cannot translate new strings, and, as a result,
+   I might ask you for additions in the future.
 
-The ones who want to localize, look at the localization guide, also part of the
-documentation.
+.. _Poedit: http://www.poedit.net/
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kwpolska <kwpolska@kwpolska.tk>
 pkgname=pkgbuilder
-pkgver=2.1.5.5
+pkgver=2.1.5.6
 pkgrel=1
 pkgdesc='A Python AUR helper/library.'
 arch=('any')
@@ -9,7 +9,7 @@ license=('BSD')
 depends=('python' 'pyalpm>=0.5.1-1' 'python-requests')
 options=(!emptydirs)
 source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6a230962f12b1437e885c451a283106f')
+md5sums=('8f0d6b2944c80ff5edb33361dfd282df')
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"

diff --git a/PKGBUILD-git b/PKGBUILD-git
@@ -1,6 +1,6 @@
 # Maintainer: Kwpolska <kwpolska@kwpolska.tk>
 pkgname=pkgbuilder-git
-pkgver=20121017
+pkgver=20121028
 pkgrel=1
 pkgdesc='A Python AUR helper/library.  Version from git.'
 arch=('any')

diff --git a/README b/README
@@ -3,8 +3,8 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 =====================================================
 :Info: This is the README file for PKGBUILDer.
 :Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index: README
 

diff --git a/README.rst b/README.rst
@@ -3,8 +3,8 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 =====================================================
 :Info: This is the README file for PKGBUILDer.
 :Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index: README
 

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Kwpolska <kwpolska@kwpolska.tk>
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: CHANGELOG
 

diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
@@ -4,8 +4,8 @@ Appendix A. Contribution rules
 :Author: Kwpolska <kwpolska@kwpolska.tk>
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: contributing
 

diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst
@@ -3,8 +3,8 @@ Appendix B. License for PKGBUILDer
 ==================================
 :Info: This is the license for PKGBUILDer.
 :Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: LICENSE
 

diff --git a/docs/README.rst b/docs/README.rst
@@ -3,8 +3,8 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 =====================================================
 :Info: This is the README file for PKGBUILDer.
 :Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index: README
 

diff --git a/docs/TODO.rst b/docs/TODO.rst
@@ -3,8 +3,8 @@ Appendix E. TODO for PKGBUILDer
 ===============================
 :Author: Kwpolska
 :Copyright: See Appendix B.
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: TODO
 

diff --git a/docs/aur.rst b/docs/aur.rst
@@ -4,8 +4,8 @@ aur module (AUR class)
 :Author: Kwpolska
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: AUR; RPC
 .. index:: RPC

diff --git a/docs/build.rst b/docs/build.rst
@@ -4,8 +4,8 @@ build module (Build class)
 :Author: Kwpolska
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: Build
 .. versionadded:: 2.1.0.0

diff --git a/docs/conf.py b/docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '2.1.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.5.5'
+release = '2.1.5.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/main.rst b/docs/main.rst
@@ -4,8 +4,8 @@ main module
 :Author: Kwpolska
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
+:Date: 2012-10-28
+:Version: 2.1.5.6
 
 .. index:: main
 .. versionadded:: 2.1.3.0

diff --git a/docs/pb.8.gz b/docs/pb.8.gz
diff --git a/docs/pb.rst b/docs/pb.rst
@@ -6,9 +6,9 @@ PBWrapper
 :Author: Kwpolska <kwpolska@kwpolska.tk>
 :Copyright: © 2011-2012, Kwpolska.
 :License: BSD (see /LICENSE or Appendix B.)
-:Date: 2012-10-17
-:Version: 2.1.5.5
-:Wrapper Version: 0.2.0
+:Date: 2012-10-28
+:Version: 2.1.5.6
+:Wrapper Version: 0.2.1
 :Manual section: 8
 :Manual group: PKGBUILDer manual