Merge branch 'v1.0' into v2

Author: smurfix

flask_script/__init__.py

@@ -5,14 +5,13 @@
 import re
 import sys
 import types
-import inspect
 import warnings
 
 import argparse
 
 from flask import Flask
 
-from ._compat import text_type, iteritems, izip
+from ._compat import iteritems
 from .commands import Group, Option, Command, Server, Shell
 from .cli import prompt, prompt_pass, prompt_bool, prompt_choices
 
@@ -266,44 +265,7 @@ def command(self, func):
 
         """
 
-        args, varargs, keywords, defaults = inspect.getargspec(func)
-
-        options = []
-
-        # first arg is always "app" : ignore
-
-        defaults = defaults or []
-        kwargs = dict(izip(*[reversed(l) for l in (args, defaults)]))
-
-        for arg in args:
-
-            if arg in kwargs:
-
-                default = kwargs[arg]
-
-                if isinstance(default, bool):
-                    options.append(Option('-%s' % arg[0],
-                                          '--%s' % arg,
-                                          action="store_true",
-                                          dest=arg,
-                                          required=False,
-                                          default=default))
-                else:
-                    options.append(Option('-%s' % arg[0],
-                                          '--%s' % arg,
-                                          dest=arg,
-                                          type=text_type,
-                                          required=False,
-                                          default=default))
-
-            else:
-                options.append(Option(arg, type=text_type))
-
-        command = Command()
-        command.run = func
-        command.__doc__ = func.__doc__
-        command.option_list = options
-
+        command = Command(func)
         self.add_command(func.__name__, command)
 
         return func

flask_script/commands.py

@@ -5,12 +5,14 @@
 import code
 import warnings
 import string
+import inspect
 
 import argparse
 
 from flask import _request_ctx_stack
 
 from .cli import prompt, prompt_pass, prompt_bool, prompt_choices
+from ._compat import izip, text_type
 
 
 class InvalidCommand(Exception):
@@ -90,11 +92,56 @@ def __init__(self, *args, **kwargs):
 class Command(object):
     """
     Base class for creating commands.
+
+    :param func:  Initialize this command by introspecting the function.
     """
 
     option_list = []
     add_help = True
 
+    def __init__(self, func=None):
+        if func is None:
+            return
+
+        args, varargs, keywords, defaults = inspect.getargspec(func)
+        if inspect.ismethod(func):
+            args = args[1:]
+            
+        options = []
+        
+        # first arg is always "app" : ignore
+        
+        defaults = defaults or []
+        kwargs = dict(izip(*[reversed(l) for l in (args, defaults)]))
+        
+        for arg in args:
+        
+            if arg in kwargs:
+            
+                default = kwargs[arg]
+                
+                if isinstance(default, bool):
+                    options.append(Option('-%s' % arg[0],
+                                          '--%s' % arg,
+                                          action="store_true",
+                                          dest=arg,
+                                          required=False,
+                                          default=default))
+                else:                     
+                    options.append(Option('-%s' % arg[0],
+                                          '--%s' % arg,
+                                          dest=arg,
+                                          type=text_type,
+                                          required=False,
+                                          default=default))
+                                          
+            else:
+                options.append(Option(arg, type=text_type))
+                
+        self.run = func
+        self.__doc__ = func.__doc__
+        self.option_list = options
+
     @property
     def description(self):
         description = self.__doc__ or ''

tests.py

@@ -280,6 +280,22 @@ def hello(name):
         out, err = capsys.readouterr()
         assert 'hello joe' in out
 
+    def test_method_command_decorator_with_pos_arg(self, capsys):
+
+        manager = Manager(self.app)
+
+        class SomeTest(object):
+            def hello(self,name):
+                print('hello ' + name)
+        sometest = SomeTest()
+        manager.command(sometest.hello)
+
+        assert 'hello' in manager._commands
+
+        code = run('manage.py hello joe', lambda: manager.run())
+        out, err = capsys.readouterr()
+        assert 'hello joe' in out
+
     def test_command_decorator_with_options(self, capsys):
 
         manager = Manager(self.app)