Add new deploy command. serve now takes a port option, and commands can be chained i.e. build server or build deploy

Author: bnmnetp

runestone/__main__.py

@@ -5,9 +5,14 @@
 import getpass
 import six
 import click
+from paver.easy import sh
 from pkg_resources import resource_string, resource_filename
 
+@click.group(chain=True)
+def cli():
+    pass
 
+@cli.command()
 def init():
     template_base_dir = resource_filename('runestone', 'common/project_template')
     config_stuff = resource_string('runestone','common/project_template/conf.tmpl')
@@ -20,6 +25,7 @@ def init():
     while ' ' in conf_dict['project_name']:
         conf_dict['project_name'] = click.prompt("Project name: (one word, NO SPACES)")
     conf_dict['build_dir'] = click.prompt("Path to build dir ", default="./build")
+    conf_dict['dest'] = click.prompt("Path to deploy built site ", default="../../static")
     conf_dict['use_services'] = click.prompt("Use Runestone Web Services ", type=click.Choice(['true', 'false']), default="false")
     conf_dict['author'] = click.prompt("Your Name ", default=getpass.getuser())
     conf_dict['project_title'] = click.prompt("Title for this project ", default="Runestone Default")
@@ -50,13 +56,22 @@ def init():
 
     print("Done.  Type runestone build to build your project")
 
-def build():
+@cli.command()
+@click.option('--all/--not-all', default=False, help="build all")
+def build(all):
     from paver.tasks import main as paver_main
     os.chdir(findProjectRoot())
-    sys.argv[0] = "build"
-    paver_main()
-    
-def serve():
+
+    myargs = ['build']
+    if all:
+        myargs.append('--all')
+
+    paver_main(args=myargs)
+
+@cli.command()
+@click.option('--port', default=8000, help="port for server to listen on")
+@click.option('--listen', default="", help="address for server to listen on")
+def serve(port,listen):
     os.chdir(findProjectRoot())
     sys.path.insert(0,os.getcwd())
     try:
@@ -68,35 +83,47 @@ def serve():
     os.chdir(pavement.serving_dir)
 
 
-    PORT = 8000
     if six.PY2:
         import SimpleHTTPServer
         import SocketServer
         Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-        httpd = SocketServer.TCPServer(("", PORT), Handler)
+        httpd = SocketServer.TCPServer((listen, port), Handler)
     else:
         import http.server
         import socketserver
         Handler = http.server.SimpleHTTPRequestHandler
-        httpd = socketserver.TCPServer(("", PORT), Handler)
+        httpd = socketserver.TCPServer((listen, port), Handler)
 
-    print("serving at port", PORT)
+    print("serving at port", port)
     httpd.serve_forever()
 
+@cli.command()
+@click.option("--dest", default="", help="destination for deploy")
+def deploy(dest):
+    os.chdir(findProjectRoot())
+    sys.path.insert(0,os.getcwd())
+    try:
+        import pavement
+    except ImportError as ie:
+        print("Error, you must be in your project root directory")
+
+    if not dest:
+        try:
+            dest = pavement.dest
+        except:
+            raise IOError("No destination configured add dest to your pavement.py or use --dest")
+
+    click.echo('Deploying from ' + pavement.serving_dir + ' to ' + dest)
+    sh("rsync -rav --delete {} {}".format(pavement.serving_dir,dest))
+
 def main(args=None):
     if not args:
         args = sys.argv[1:]
-    foo_config = resource_filename('runestone', 'common')
-#    foo_string = resource_string('runestone', 'project/template/conf.tmpl')
-
-    if args[0] == "init":
-        init()
-    elif args[0] == "build":
-        build()
-    elif args[0] == "serve":
-        serve()
-    else:
-        print("Error:  I only understand init, build, and serve")
+    cli.add_command(init)
+    cli.add_command(build)
+    cli.add_command(serve)
+    cli.add_command(deploy)
+    cli()
 
 def findProjectRoot():
     start = os.getcwd()
@@ -106,7 +133,8 @@ def findProjectRoot():
             return start
         prevdir = start
         start = os.path.dirname(start)
-    raise NotADirectoryError("You must be in a runestone project to run runestone")
+    raise IOError("You must be in a runestone project to run runestone")
+
 
 if __name__ == "__main__":
-    sys.exit(main(sys.argv[1:]))
+    sys.exit(main(sys.argv[1:]))

runestone/common/project_template/pavement.tmpl

@@ -12,6 +12,7 @@ home_dir = os.getcwd()
 master_url = '%(master_url)s'
 master_app = 'runestone'
 serving_dir = "%(build_dir)s/%(project_name)s"
+dest = "%(dest)s"
 
 options(
     sphinx = Bunch(docroot=".",),