From bbecba509bee2687075341e6ffef2bb1772efc92 Mon Sep 17 00:00:00 2001
From: Sam Clements <sam@borntyping.co.uk>
Date: Thu, 6 Mar 2014 13:37:41 +0000
Subject: [PATCH] Fix everything

---
 cookiecutter.json                                  |  2 +-
 .../.gitignore                                     |  0
 .../README.rst                                     | 10 +++++-----
 .../setup.py                                       | 14 +++++++-------
 .../tox.ini                                        |  0
 .../{{cookiecutter.package_name}}}/__init__.py     |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename {{{cookiecutter.project_name}} => {{cookiecutter.package_name}}}/.gitignore (100%)
 rename {{{cookiecutter.project_name}} => {{cookiecutter.package_name}}}/README.rst (58%)
 rename {{{cookiecutter.project_name}} => {{cookiecutter.package_name}}}/setup.py (66%)
 rename {{{cookiecutter.project_name}} => {{cookiecutter.package_name}}}/tox.ini (100%)
 rename {{{cookiecutter.project_name}}/{{cookiecutter.project_name}} => {{cookiecutter.package_name}}/{{cookiecutter.package_name}}}/__init__.py (86%)

diff --git a/cookiecutter.json b/cookiecutter.json
index eef0865..3dec592 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -12,5 +12,5 @@
     
     "readme_pypi_badge": true,
     "readme_travis_badge": true,
-    "readme_travis_url": "https://travis-ci.org/borntyping/cookiecutter-pypackage-minimal",
+    "readme_travis_url": "https://travis-ci.org/borntyping/cookiecutter-pypackage-minimal"
 }
diff --git a/{{cookiecutter.project_name}}/.gitignore b/{{cookiecutter.package_name}}/.gitignore
similarity index 100%
rename from {{cookiecutter.project_name}}/.gitignore
rename to {{cookiecutter.package_name}}/.gitignore
diff --git a/{{cookiecutter.project_name}}/README.rst b/{{cookiecutter.package_name}}/README.rst
similarity index 58%
rename from {{cookiecutter.project_name}}/README.rst
rename to {{cookiecutter.package_name}}/README.rst
index 676bbf2..186a1fc 100644
--- a/{{cookiecutter.project_name}}/README.rst
+++ b/{{cookiecutter.package_name}}/README.rst
@@ -1,5 +1,5 @@
 {{ cookiecutter.package_name }}
-{{ len(cookiecutter.package_name) * "=" }}
+{{ cookiecutter.package_name|count * "=" }}
 
 {% if cookiecutter.readme_pypi_badge -%}
 .. image:: https://pypip.in/v/{{ cookiecutter.package_name }}/badge.png
@@ -7,7 +7,7 @@
     :alt: Latest PyPI version
 {%- endif %}
 
-{% if cookiecutter.readme_travis_badge and cookiecutter.readme_travis_url is not None -%}
+{% if cookiecutter.readme_travis_badge -%}
 .. image:: {{ cookiecutter.readme_travis_url }}.png
    :target: {{ cookiecutter.readme_travis_url }}
    :alt: Latest Travis CI build status
@@ -33,7 +33,7 @@ Licence
 Authors
 -------
 
-{{ cookiecutter.package_name }} was written by `{{ cookiecutter.author_name }} <{{ cookiecutter.author_email }}>`_.
-{% if cookiecutter.maintainer_name is not None -%}
-{{ cookiecutter.package_name }} was written by `{{ cookiecutter.maintainer_name }} <{{ cookiecutter.maintainer_email }}>`_.
+`{{ cookiecutter.package_name }}` was written by `{{ cookiecutter.author_name }} <{{ cookiecutter.author_email }}>`_.
+{% if cookiecutter.maintainer_name -%}
+`{{ cookiecutter.package_name }}` was written by `{{ cookiecutter.maintainer_name }} <{{ cookiecutter.maintainer_email }}>`_.
 {%- endif %}
diff --git a/{{cookiecutter.project_name}}/setup.py b/{{cookiecutter.package_name}}/setup.py
similarity index 66%
rename from {{cookiecutter.project_name}}/setup.py
rename to {{cookiecutter.package_name}}/setup.py
index e43c20e..7a7b8b8 100644
--- a/{{cookiecutter.project_name}}/setup.py
+++ b/{{cookiecutter.package_name}}/setup.py
@@ -1,26 +1,26 @@
 import setuptools
 
 setuptools.setup(
-    name='{{ cookiecutter.package_name }}',
-    version='{{ cookiecutter.package_version }}',
+    name="{{ cookiecutter.package_name }}",
+    version="{{ cookiecutter.package_version }}",
     url="{{ cookiecutter.package_url }}",
 
     author="{{ cookiecutter.author_name }}",
     author_email="{{ cookiecutter.author_email }}",
 
-    {% if cookiecutter.maintainer_name is not None -%}
+    {%- if cookiecutter.maintainer_name -%}
     maintainer="{{ cookiecutter.maintainer_name }}",
     maintainer_email="{{ cookiecutter.maintainer_email }}",
     {%- endif %}
 
-    description = "{{ cookiecutter.package_description }}",
-    long_description = open('README.rst').read(),
+    description="{{ cookiecutter.package_description }}",
+    long_description=open('README.rst').read(),
 
-    packages = setuptools.find_packages(),
+    packages=setuptools.find_packages(),
 
     install_requires=[],
 
-    classifiers = [
+    classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
diff --git a/{{cookiecutter.project_name}}/tox.ini b/{{cookiecutter.package_name}}/tox.ini
similarity index 100%
rename from {{cookiecutter.project_name}}/tox.ini
rename to {{cookiecutter.package_name}}/tox.ini
diff --git a/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/__init__.py b/{{cookiecutter.package_name}}/{{cookiecutter.package_name}}/__init__.py
similarity index 86%
rename from {{cookiecutter.project_name}}/{{cookiecutter.project_name}}/__init__.py
rename to {{cookiecutter.package_name}}/{{cookiecutter.package_name}}/__init__.py
index 7657d2b..f4a3b79 100644
--- a/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/__init__.py
+++ b/{{cookiecutter.package_name}}/{{cookiecutter.package_name}}/__init__.py
@@ -2,7 +2,7 @@
 
 __version__ = '{{ cookiecutter.package_version }}'
 __author__ = '{{ cookiecutter.author_name }} <{{ cookiecutter.author_email }}>'
-{% if cookiecutter.maintainer_name is not None -%}
+{%- if cookiecutter.maintainer_name -%}
 __maintainer__ = '{{ cookiecutter.maintainer_name }} <{{ cookiecutter.maintainer_email }}>'
 {%- endif %}
 __all__ = []