runserver: Improve handling of '-d' and '-r' switches

* debugger defaults to OFF because that's the safe choice
* reloader defaults to whatever the debugger default is
  if not set explicitly

Author: smurfix

flask_script/commands.py

@@ -317,12 +317,15 @@ class Server(Command):
 
     :param host: server host
     :param port: server port
-    :param use_debugger: if False, will no longer use Werkzeug debugger.
+    :param use_debugger: Flag whether to default to using the Werkzeug debugger.
                          This can be overriden in the command line
-                         by passing the **-d** flag.
-    :param use_reloader: if False, will no longer use auto-reloader.
+                         by passing the **-d** or **-D** flag.
+                         Defaults to False, for security.
+
+    :param use_reloader: Flag whether to use the auto-reloader.
+                         Default to True when debugging.
                          This can be overriden in the command line by
-                         passing the **-r** flag.
+                         passing the **-r**/**-R** flag.
     :param threaded: should the process handle each request in a separate
                      thread?
     :param processes: number of processes to spawn
@@ -332,14 +335,14 @@ class Server(Command):
 
     help = description = 'Runs the Flask development server i.e. app.run()'
 
-    def __init__(self, host='127.0.0.1', port=5000, use_debugger=True,
-                 use_reloader=True, threaded=False, processes=1,
+    def __init__(self, host='127.0.0.1', port=5000, use_debugger=False,
+                 use_reloader=None, threaded=False, processes=1,
                  passthrough_errors=False, **options):
 
         self.port = port
         self.host = host
         self.use_debugger = use_debugger
-        self.use_reloader = use_reloader
+        self.use_reloader = use_reloader if use_reloader is not None else use_debugger
         self.server_options = options
         self.threaded = threaded
         self.processes = processes
@@ -377,41 +380,49 @@ def get_options(self):
             options += (Option('-d', '--debug',
                                action='store_true',
                                dest='use_debugger',
-                               help="(no-op for compatibility)"),)
+                               help="(no-op for compatibility. USE '--no-debug' IN PRODCUTION CODE)",
+							   default=True),)
             options += (Option('-D', '--no-debug',
                                action='store_false',
                                dest='use_debugger',
-                               default=self.use_debugger),)
+							   help='disable the Werkzeug debugger',
+                               default=True),)
 
         else:
             options += (Option('-d', '--debug',
                                action='store_true',
                                dest='use_debugger',
-                               default=self.use_debugger),)
+							   help='enable the Werkzeug debugger (DO NOT use in production code)',
+                               default=False),)
             options += (Option('-D', '--no-debug',
                                action='store_false',
                                dest='use_debugger',
-                               help="(no-op for compatibility)"),)
+                               help="(no-op for compatibility)",
+                               default=False),)
 
         if self.use_reloader:
             options += (Option('-r', '--reload',
                                action='store_true',
                                dest='use_reloader',
-                               help="(no-op for compatibility)"),)
+                               help="(no-op for compatibility)",
+                               default=True),)
             options += (Option('-R', '--no-reload',
                                action='store_false',
                                dest='use_reloader',
-                               default=self.use_reloader),)
+							   help='do not monitor Python files for changes',
+                               default=True),)
 
         else:
             options += (Option('-r', '--reload',
                                action='store_true',
                                dest='use_reloader',
-                               default=self.use_reloader),)
+							   help='monitor Python files for changes',
+                               default=False),)
             options += (Option('-R', '--no-reload',
                                action='store_false',
                                dest='use_reloader',
-                               help="(no-op for compatibility)"),)
+                               help="(no-op for compatibility)",
+                               default=False),)
 
         return options
 

setup.py

@@ -27,7 +27,7 @@
 
 setup(
     name='Flask-Script',
-    version='2.0.3',
+    version='2.0.4',
     url='http://github.com/smurfix/flask-script',
 	download_url = 'https://github.com/smurfix/flask-script/tarball/v2.0.3',
     license='BSD',