Ticket #5212: apps_command_management.diff

AUTHORS

@@ -294 +294 @@
     ymasuda@ethercube.com
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
+    Alberto Paro <alberto@ingparo.it>
 
 A big THANK YOU goes to:
 

django/core/management/__init__.py

@@ -13 +13 @@
     ImportError if it doesn't exist.
     """
     # Let the ImportError propogate.
-    return getattr(__import__('django.core.management.commands.%s' % name, {}, {}, ['Command']), 'Command')()
+    return getattr(__import__(name, {}, {}, ['Command']), 'Command')()
 
 def call_command(name, *args, **options):
     """
@@ -26 +26 @@
         call_command('shell', plain=True)
         call_command('sqlall', 'myapp')
     """
-    klass = load_command_class(name)
+    klass = load_command_class('django.core.management.commands.%s' % name)
     return klass.execute(*args, **options)
 
 class ManagementUtility(object):
@@ -50 +50 @@
         """
         command_dir = os.path.join(__path__[0], 'commands')
         names = [f[:-3] for f in os.listdir(command_dir) if not f.startswith('_') and f.endswith('.py')]
-        return dict([(name, load_command_class(name)) for name in names])
+        return dict([(name, load_command_class('django.core.management.commands.%s' % name)) for name in names])
 
+    def add_app_commands(self, appname):
+        """
+        Populate the commands dictionary of all instances of all available Command classes in an application.
+    
+        This works by looking for and loading all Python modules in the
+        applicatication management.commands package.
+    
+        In a command with the same name is present an ApplicationException occurs.
+        """
+        def get_app_commands_dir(command_module,file_scope):
+            """ Detect the path from the module name"""
+            module_pos=command_module
+            for attr in file_scope.split('.')[1:]:
+                module_pos=getattr(module_pos,attr)
+            return os.path.split(module_pos.__file__)[0]
+        
+        # Search in the app for commands 
+        try:
+            command_module = __import__('%s.management.commands' % appname, {}, {})
+        except ImportError:
+            return
+        command_dir = get_app_commands_dir(command_module,'%s.management.commands' % appname)
+        names = [f[:-3] for f in os.listdir(command_dir) if not f.startswith('_') and f.endswith('.py')]
+
+        # Load the commands for the app 
+        for name in names:
+            if name in self.commands:
+                raise ApplicationException('The command "" defined in already exist. '\
+                                           'You cannot override an existing command' %\
+                                           (name, '%s.management.commands.%s' % (appname, name)))
+            else:
+                self.commands[name] = load_command_class('%s.management.commands.%s' % (appname, name))
+        
     def usage(self):
         """
         Returns a usage string, for use with optparse.
@@ -143 +176 @@
         # project_directory, not the current working directory (which is default).
         from django.core.management.commands.startapp import ProjectCommand
         self.commands['startapp'] = ProjectCommand(project_directory)
+        
+        # Import project management commands from installed apps
+        for app in django.conf.settings.INSTALLED_APPS:
+            self.add_app_commands(app)
 
+
 def setup_environ(settings_mod):
     """
     Configure the runtime environment. This can also be used by external