Added click support to Flask

Author: mitsuhiko

flask/__main__.py

@@ -11,5 +11,5 @@
 
 
 if __name__ == '__main__':
- from run import main
+ from cli import main
  main(as_module=True)

flask/app.py

@@ -34,6 +34,7 @@
  _default_template_ctx_processor
 from .signals import request_started, request_finished, got_request_exception, \
  request_tearing_down, appcontext_tearing_down
+from .cli import make_default_cli
 from ._compat import reraise, string_types, text_type, integer_types
 
 # a lock used for logger initialization
@@ -476,6 +477,12 @@ def __init__(self, import_name, static_path=None, static_url_path=None,
  None: [_default_template_ctx_processor]
  }
 
+ #: A list of shell context processor functions that should be run
+ #: when a shell context is created.
+ #:
+ #: .. versionadded:: 1.0
+ self.shell_context_processors = []
+
  #: all the attached blueprints in a dictionary by name. Blueprints
  #: can be attached multiple times so this dictionary does not tell
  #: you how often they got attached.
@@ -531,6 +538,14 @@ def __init__(self, import_name, static_path=None, static_url_path=None,
  endpoint='static',
  view_func=self.send_static_file)
 
+ #: The click command line context for this application. Commands
+ #: registered here show up in the ``flask`` command once the
+ #: application has been discovered. The default commands are
+ #: provided by Flask itself and can be overridden.
+ #:
+ #: This is an instance of a :class:`click.Group` object.
+ self.cli = make_default_cli(self)
+
  def _get_error_handlers(self):
  from warnings import warn
  warn(DeprecationWarning('error_handlers is deprecated, use the '
@@ -748,6 +763,18 @@ def update_template_context(self, context):
  # existing views.
  context.update(orig_ctx)
 
+ def make_shell_context(self):
+ """Returns the shell context for an interactive shell for this
+ application. This runs all the registered shell context
+ processors.
+
+ .. versionadded:: 1.0
+ """
+ rv = {'app': self, 'g': g}
+ for processor in self.shell_context_processors:
+ rv.update(processor())
+ return rv
+
  def run(self, host=None, port=None, debug=None, **options):
  """Runs the application on a local development server. If the
  :attr:`debug` flag is set the server will automatically reload
@@ -758,6 +785,11 @@ def run(self, host=None, port=None, debug=None, **options):
  ``use_evalex=False`` as parameter. This will keep the debugger's
  traceback screen active, but disable code execution.
 
+ It is not recommended to use this function for development with
+ automatic reloading as this is badly supported. Instead you should
+ be using the ``flask`` command line script's ``runserver``
+ support.
+
  .. admonition:: Keep in Mind
 
  Flask will suppress any server error with a generic error page
@@ -1091,7 +1123,7 @@ def page_not_found(error):
  Use :meth:`register_error_handler` instead of modifying
  :attr:`error_handler_spec` directly, for application wide error
  handlers.
- 
+
  .. versionadded:: 0.7
  One can now additionally also register custom exception types
  that do not necessarily have to be a subclass of the
@@ -1325,6 +1357,15 @@ def context_processor(self, f):
  self.template_context_processors[None].append(f)
  return f
 
+ @setupmethod
+ def shell_context_processor(self, f):
+ """Registers a shell context processor function.
+
+ .. versionadded:: 1.0
+ """
+ self.shell_context_processors.append(f)
+ return f
+
  @setupmethod
  def url_value_preprocessor(self, f):
  """Registers a function as URL value preprocessor for all view
@@ -1609,7 +1650,8 @@ def make_response(self, rv):
  # some extra logic involved when creating these objects with
  # specific values (like default content type selection).
  if isinstance(rv, (text_type, bytes, bytearray)):
- rv = self.response_class(rv, headers=headers, status=status_or_headers)
+ rv = self.response_class(rv, headers=headers,
+ status=status_or_headers)
  headers = status_or_headers = None
  else:
  rv = self.response_class.force_type(rv, request.environ)
@@ -1624,7 +1666,6 @@ def make_response(self, rv):
 
  return rv
 
-
  def create_url_adapter(self, request):
  """Creates a URL adapter for the given request. The URL adapter
  is created at a point where the request context is not yet set up