Commits

Mikhail Korobov committed a7835b7

New options are renamed: _DIR options => absolute paths, _PATH options => relative paths

Comments (0)

Files changed (1)

fab_deploy/utils.py

         SERVER_ADMIN='example@example.com',
         VCS='hg',
 
-        PROJECT_DIR='',
+        PROJECT_PATH='',
         LOCAL_CONFIG='config.py',
         REMOTE_CONFIG_TEMPLATE='config.server.py',
 
-        CONFIG_TEMPLATES_DIRS=['config_templates'],
+        CONFIG_TEMPLATES_PATHS=['config_templates'],
 
-        PIP_REQUIREMENTS_DIR='reqs',
+        PIP_REQUIREMENTS_PATH='reqs',
         PIP_REQUIREMENTS='all.txt',
 
         # these options shouldn't be set by user
     return os.path.join(os.path.split(__file__)[0], fname)
 
 def _project_path(name=''):
-    return posixpath.join(env.conf.PROJECT_DIR, name)
+    return posixpath.join(env.conf.PROJECT_PATH, name)
 
 def _remote_project_path(name=''):
     return posixpath.join(env.conf.SRC_DIR, _project_path(name))
 def _pip_req_path(name):
     if not name.endswith(('.txt', '.pip',)):
         name += '.txt'
-    return posixpath.join(env.conf.PIP_REQUIREMENTS_DIR, name)
+    return posixpath.join(env.conf.PIP_REQUIREMENTS_PATH, name)
 
 def _config_template_path(name):
-    for dir in env.conf.CONFIG_TEMPLATES_DIRS:
+    for dir in env.conf.CONFIG_TEMPLATES_PATHS:
         path = os.path.join(dir, name)
         if os.path.exists(path):
             return path