From 123c1192709c37f889a6255f3024c14f2fd8a33e Mon Sep 17 00:00:00 2001 From: Chris Reeves Date: Sun, 19 May 2013 11:10:04 +0000 Subject: [PATCH] Fixing tests and renaming directories --- .../__init__.py | 0 .../config/__init__.py | 0 .../config/common/__init__.py | 0 .../config/common/settings.py | 0 .../config/dev/__init__.py | 0 .../config/dev/nginx.conf | 0 .../config/dev/settings.py | 0 .../context_processors.py | 0 .../public/css/main.css | 0 .../public/css/normalize.css | 0 .../public/img/cat.gif | Bin .../public/js/app.js | 0 .../public/less/main.less | 0 .../templates/404.html | 0 .../templates/500.html | 0 .../templates/base.html | 0 .../tests/__init__.py | 0 .../tests/test_example.py | 0 .../{__PROJECT_NAME__ => {{PROJECT_NAME}}}/urls.py | 0 tests/test_template.py | 4 ++-- .../dir_should_not_be_renamed.txt | 0 .../{{PROJECT_NAME}}.txt} | 0 .../this_dir_should_be_renamed.txt | 0 23 files changed, 2 insertions(+), 2 deletions(-) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/__init__.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/config/__init__.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/config/common/__init__.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/config/common/settings.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/config/dev/__init__.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/config/dev/nginx.conf (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/config/dev/settings.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/context_processors.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/public/css/main.css (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/public/css/normalize.css (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/public/img/cat.gif (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/public/js/app.js (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/public/less/main.less (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/templates/404.html (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/templates/500.html (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/templates/base.html (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/tests/__init__.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/tests/test_example.py (100%) rename examples/django/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/urls.py (100%) rename tests/test_template/{__NOT_IN_PLACEHOLDERS__ => {{NOT_IN_PLACEHOLDERS}}}/dir_should_not_be_renamed.txt (100%) rename tests/test_template/{__NOT_IN_PLACEHOLDERS__/__PROJECT_NAME__.txt => {{NOT_IN_PLACEHOLDERS}}/{{PROJECT_NAME}}.txt} (100%) rename tests/test_template/{__PROJECT_NAME__ => {{PROJECT_NAME}}}/this_dir_should_be_renamed.txt (100%) diff --git a/examples/django/__PROJECT_NAME__/__init__.py b/examples/django/{{PROJECT_NAME}}/__init__.py similarity index 100% rename from examples/django/__PROJECT_NAME__/__init__.py rename to examples/django/{{PROJECT_NAME}}/__init__.py diff --git a/examples/django/__PROJECT_NAME__/config/__init__.py b/examples/django/{{PROJECT_NAME}}/config/__init__.py similarity index 100% rename from examples/django/__PROJECT_NAME__/config/__init__.py rename to examples/django/{{PROJECT_NAME}}/config/__init__.py diff --git a/examples/django/__PROJECT_NAME__/config/common/__init__.py b/examples/django/{{PROJECT_NAME}}/config/common/__init__.py similarity index 100% rename from examples/django/__PROJECT_NAME__/config/common/__init__.py rename to examples/django/{{PROJECT_NAME}}/config/common/__init__.py diff --git a/examples/django/__PROJECT_NAME__/config/common/settings.py b/examples/django/{{PROJECT_NAME}}/config/common/settings.py similarity index 100% rename from examples/django/__PROJECT_NAME__/config/common/settings.py rename to examples/django/{{PROJECT_NAME}}/config/common/settings.py diff --git a/examples/django/__PROJECT_NAME__/config/dev/__init__.py b/examples/django/{{PROJECT_NAME}}/config/dev/__init__.py similarity index 100% rename from examples/django/__PROJECT_NAME__/config/dev/__init__.py rename to examples/django/{{PROJECT_NAME}}/config/dev/__init__.py diff --git a/examples/django/__PROJECT_NAME__/config/dev/nginx.conf b/examples/django/{{PROJECT_NAME}}/config/dev/nginx.conf similarity index 100% rename from examples/django/__PROJECT_NAME__/config/dev/nginx.conf rename to examples/django/{{PROJECT_NAME}}/config/dev/nginx.conf diff --git a/examples/django/__PROJECT_NAME__/config/dev/settings.py b/examples/django/{{PROJECT_NAME}}/config/dev/settings.py similarity index 100% rename from examples/django/__PROJECT_NAME__/config/dev/settings.py rename to examples/django/{{PROJECT_NAME}}/config/dev/settings.py diff --git a/examples/django/__PROJECT_NAME__/context_processors.py b/examples/django/{{PROJECT_NAME}}/context_processors.py similarity index 100% rename from examples/django/__PROJECT_NAME__/context_processors.py rename to examples/django/{{PROJECT_NAME}}/context_processors.py diff --git a/examples/django/__PROJECT_NAME__/public/css/main.css b/examples/django/{{PROJECT_NAME}}/public/css/main.css similarity index 100% rename from examples/django/__PROJECT_NAME__/public/css/main.css rename to examples/django/{{PROJECT_NAME}}/public/css/main.css diff --git a/examples/django/__PROJECT_NAME__/public/css/normalize.css b/examples/django/{{PROJECT_NAME}}/public/css/normalize.css similarity index 100% rename from examples/django/__PROJECT_NAME__/public/css/normalize.css rename to examples/django/{{PROJECT_NAME}}/public/css/normalize.css diff --git a/examples/django/__PROJECT_NAME__/public/img/cat.gif b/examples/django/{{PROJECT_NAME}}/public/img/cat.gif similarity index 100% rename from examples/django/__PROJECT_NAME__/public/img/cat.gif rename to examples/django/{{PROJECT_NAME}}/public/img/cat.gif diff --git a/examples/django/__PROJECT_NAME__/public/js/app.js b/examples/django/{{PROJECT_NAME}}/public/js/app.js similarity index 100% rename from examples/django/__PROJECT_NAME__/public/js/app.js rename to examples/django/{{PROJECT_NAME}}/public/js/app.js diff --git a/examples/django/__PROJECT_NAME__/public/less/main.less b/examples/django/{{PROJECT_NAME}}/public/less/main.less similarity index 100% rename from examples/django/__PROJECT_NAME__/public/less/main.less rename to examples/django/{{PROJECT_NAME}}/public/less/main.less diff --git a/examples/django/__PROJECT_NAME__/templates/404.html b/examples/django/{{PROJECT_NAME}}/templates/404.html similarity index 100% rename from examples/django/__PROJECT_NAME__/templates/404.html rename to examples/django/{{PROJECT_NAME}}/templates/404.html diff --git a/examples/django/__PROJECT_NAME__/templates/500.html b/examples/django/{{PROJECT_NAME}}/templates/500.html similarity index 100% rename from examples/django/__PROJECT_NAME__/templates/500.html rename to examples/django/{{PROJECT_NAME}}/templates/500.html diff --git a/examples/django/__PROJECT_NAME__/templates/base.html b/examples/django/{{PROJECT_NAME}}/templates/base.html similarity index 100% rename from examples/django/__PROJECT_NAME__/templates/base.html rename to examples/django/{{PROJECT_NAME}}/templates/base.html diff --git a/examples/django/__PROJECT_NAME__/tests/__init__.py b/examples/django/{{PROJECT_NAME}}/tests/__init__.py similarity index 100% rename from examples/django/__PROJECT_NAME__/tests/__init__.py rename to examples/django/{{PROJECT_NAME}}/tests/__init__.py diff --git a/examples/django/__PROJECT_NAME__/tests/test_example.py b/examples/django/{{PROJECT_NAME}}/tests/test_example.py similarity index 100% rename from examples/django/__PROJECT_NAME__/tests/test_example.py rename to examples/django/{{PROJECT_NAME}}/tests/test_example.py diff --git a/examples/django/__PROJECT_NAME__/urls.py b/examples/django/{{PROJECT_NAME}}/urls.py similarity index 100% rename from examples/django/__PROJECT_NAME__/urls.py rename to examples/django/{{PROJECT_NAME}}/urls.py diff --git a/tests/test_template.py b/tests/test_template.py index fd457d5..f8464ab 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -181,7 +181,7 @@ def test_directory_not_renamed_if_not_in_placeholders(self, t = Template(self.config) t.copy_template() self.assertTrue(os.path.isdir(os.path.join(t.project_root, - '__NOT_IN_PLACEHOLDERS__'))) + '{{NOT_IN_PLACEHOLDERS}}'))) rmtree(t.project_root) @patch('facio.template.Template.working_dir', new_callable=PropertyMock) @@ -190,6 +190,6 @@ def test_rename_files_in_placeholders(self, mock_working_dir): t = Template(self.config) t.copy_template() self.assertTrue(os.path.isfile(os.path.join( - t.project_root, '__NOT_IN_PLACEHOLDERS__', + t.project_root, '{{NOT_IN_PLACEHOLDERS}}', '%s.txt' % self.config.project_name))) rmtree(t.project_root) diff --git a/tests/test_template/__NOT_IN_PLACEHOLDERS__/dir_should_not_be_renamed.txt b/tests/test_template/{{NOT_IN_PLACEHOLDERS}}/dir_should_not_be_renamed.txt similarity index 100% rename from tests/test_template/__NOT_IN_PLACEHOLDERS__/dir_should_not_be_renamed.txt rename to tests/test_template/{{NOT_IN_PLACEHOLDERS}}/dir_should_not_be_renamed.txt diff --git a/tests/test_template/__NOT_IN_PLACEHOLDERS__/__PROJECT_NAME__.txt b/tests/test_template/{{NOT_IN_PLACEHOLDERS}}/{{PROJECT_NAME}}.txt similarity index 100% rename from tests/test_template/__NOT_IN_PLACEHOLDERS__/__PROJECT_NAME__.txt rename to tests/test_template/{{NOT_IN_PLACEHOLDERS}}/{{PROJECT_NAME}}.txt diff --git a/tests/test_template/__PROJECT_NAME__/this_dir_should_be_renamed.txt b/tests/test_template/{{PROJECT_NAME}}/this_dir_should_be_renamed.txt similarity index 100% rename from tests/test_template/__PROJECT_NAME__/this_dir_should_be_renamed.txt rename to tests/test_template/{{PROJECT_NAME}}/this_dir_should_be_renamed.txt