Commands can run in any subdirectory of the app

chanfung032 · chanfung032 · commit 1099ef95e8e9 · 2013-06-19T11:27:56.000+08:00
diff --git a/dev_server/dev_server.py b/dev_server/dev_server.py
@@ -13,7 +13,14 @@
 import yaml
 from optparse import OptionParser
 
-app_root = os.getcwd()
+from sae.util import search_file_bottom_up
+
+app_root = search_file_bottom_up('config.yaml')
+if app_root is None:
+    print >> sys.stderr, \
+        'Error: Not an app directory(or any of the parent directories)'
+    sys.exit(1)
+if app_root != os.getcwd(): os.chdir(app_root)
 
 def setup_sae_environ(conf):
     # Add dummy pylibmc module
diff --git a/dev_server/sae/util.py b/dev_server/sae/util.py
@@ -13,3 +13,18 @@ def protect_secret(d):
     for k, v in d.items():
         if 'KEY' in k:
             half_secret(d, k)
+
+import os.path
+
+def search_file_bottom_up(name):
+    curdir = os.getcwd()
+
+    while True:
+        path = os.path.join(curdir, name)
+        if os.path.isfile(path):
+            return curdir
+        _curdir = os.path.dirname(curdir)
+        if _curdir == curdir:
+            return None
+        curdir = _curdir
+
diff --git a/dev_server/saecloud b/dev_server/saecloud
@@ -15,6 +15,8 @@ import hashlib
 import urllib
 import urllib2
 
+from sae.util import search_file_bottom_up
+
 UPLOAD_SERVER = 'http://upload.sae.sina.com.cn'
 DEPLOY_SERVER = 'http://deploy.sae.sina.com.cn'
 SVN_SERVER = 'https://svn.sinaapp.com/'
@@ -54,6 +56,13 @@ def deploy(args):
     opts = _get_svn_opts(args)
     cache = LOCAL_CACHE_DIR
 
+    if source is None:
+        source = search_file_bottom_up('config.yaml')
+        if source is None:
+            print >>sys.stderr,     \
+                'Error: Not an app directory(or any of the parent directories)'
+            return
+
     conf_file = os.path.join(source, 'config.yaml')
     try:
         conf =  yaml.load(open(conf_file))
@@ -313,7 +322,10 @@ def upload_data(args):
         uploadfile2(f, (appname, accesskey, secretkey), domain)
 
 def install(args):
-    dest = os.path.join(os.getcwd(), 'site-packages')
+    # If we are in an app directory, try to install the package in the
+    # standard directory.
+    parent_dir = search_file_bottom_up('config.yaml') or os.getcwd()
+    dest = os.path.join(parent_dir, 'site-packages')
 
     if not os.path.exists(dest):
         os.mkdir(dest)
@@ -379,7 +391,7 @@ def main():
 
     p = subparsers.add_parser('deploy', parents=[credentials], 
                               help='deploy source directory to SAE')
-    p.add_argument('dir', nargs='?', default='.', 
+    p.add_argument('dir', nargs='?', default=None,
                    help='the source code directory to deploy, default to current dir')
     p.set_defaults(func=deploy)
 
