Squashed 'repos/robbyrussell/oh-my-zsh/' changes from e55c715..75b9030

75b9030 Merge pull request #3731 from NHDaly/patch-1 8301040 Merge pull request #3683 from jameswomack/fix_3640 d4918ae Fixed Typo. 1b6af54 Merge pull request #3692 from XerWandeRer/master b28abd5 Merge pull request #3694 from houjunchen/django 0dde994 [Modify] Update django.plugin.zsh for Django 1.7.6 a414b5e Update _adb c58c623 Use camelCase for npm aliases git-subtree-dir: repos/robbyrussell/oh-my-zsh git-subtree-split: 75b9030f48a55a42849cc68b0fc5b92d66d236ac

Squashed 'repos/robbyrussell/oh-my-zsh/' changes from e55c715..75b9030
75b9030 Merge pull request #3731 from NHDaly/patch-1 8301040 Merge pull request #3683 from jameswomack/fix_3640 d4918ae Fixed Typo. 1b6af54 Merge pull request #3692 from XerWandeRer/master b28abd5 Merge pull request #3694 from houjunchen/django 0dde994 [Modify] Update django.plugin.zsh for Django 1.7.6 a414b5e Update _adb c58c623 Use camelCase for npm aliases git-subtree-dir: repos/robbyrussell/oh-my-zsh git-subtree-split: 75b9030f48a55a42849cc68b0fc5b92d66d236ac
mj · mj · mj
1 parent c1f898c545
Showing 4 changed files with 225 additions and 56 deletions Side-by-side Diff
README.markdown
plugins/adb/_adb
plugins/django/django.plugin.zsh
plugins/npm/npm.plugin.zsh
@@ -3,7 +3,7 @@
  
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
  
-__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interace with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
+__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interface with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
  
 To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on twitter.
  
@@ -21,6 +21,7 @@ _1st_arguments=(
 'push:copy file/dir to device'
 'shell:run remote shell interactively'
 'sync:copy host->device only if changed (-l means list but dont copy)'
+‘tcpip:restart host adb in tcpip mode’
 'uninstall:remove this app package from the device'
 'version:show version num'
 )
@@ -2,59 +2,114 @@
  
 typeset -ga nul_args
 nul_args=(
+  '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))'
   '--settings=-[the Python path to a settings module.]:file:_files'
-  '--pythonpath=-[a directory to add to the Python path.]::directory:_directories'
+  '--pythonpath=-[a directory to add to the Python path.]:directory:_directories'
   '--traceback[print traceback on exception.]'
+  "--no-color[Don't colorize the command output.]"
   "--version[show program's version number and exit.]"
   {-h,--help}'[show this help message and exit.]'
 )
  
-_managepy-adminindex(){
+typeset -ga start_args
+start_args=(
+  '--template=-[The path or URL to load the template from.]:directory:_directories'
+  '--extension=-[The file extension(s) to render (default: "py").]'
+  '--name=-[The file name(s) to render.]:file:_files'
+)
+
+typeset -ga db_args
+db_args=(
+  '--database=-[Nominates a database. Defaults to the "default" database.]'
+)
+
+typeset -ga noinput_args
+noinput_args=(
+  '--noinput[tells Django to NOT prompt the user for input of any kind.]'
+)
+
+typeset -ga no_init_data_args
+no_init_data_args=(
+  '--no-initial-data[Tells Django not to load any initial data after database synchronization.]'
+)
+
+typeset -ga tag_args
+tag_args=(
+  '--tag=-[Run only checks labeled with given tag.]'
+  '--list-tags[List available tags.]'
+)
+
+_managepy-check(){
   _arguments -s : \
-    $nul_args \
-    '*::directory:_directories' && ret=0
+    $tag_args \
+    $nul_args && ret=0
+}
+
+_managepy-changepassword(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
 }
  
 _managepy-createcachetable(){
   _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-createsuperuser(){
+  _arguments -s : \
+    '--username=-[Specifies the login for the superuser.]' \
+    '--email=-[Specifies the email for the superuser.]' \
+    $noinput_args \
+    $db_args \
     $nul_args && ret=0
 }
  
 _managepy-collectstatic(){
   _arguments -s : \
-    '--link=-[Create a symbolic link to each file instead of copying.]:' \
-    '--noinput=-[Do NOT prompt the user for input of any kind.]:' \
-    '--no-post-process=-[Do NOT post process collected files.]:' \
-    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]:' \
-    '--dry-run=-[Do everything except modify the filesystem.]:' \
-    '--clear=-[Clear the existing files using the storage before trying to copy or link the original file.]:' \
-    '--link=-[Create a symbolic link to each file instead of copying.]:' \
-    '--no-default-ignore=-[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]:' \
+    '--link[Create a symbolic link to each file instead of copying.]' \
+    '--no-post-process[Do NOT post process collected files.]' \
+    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]' \
+    '--dry-run[Do everything except modify the filesystem.]' \
+    '--clear[Clear the existing files using the storage before trying to copy or link the original file.]' \
+    '--link[Create a symbolic link to each file instead of copying.]' \
+    '--no-default-ignore[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]' \
+    $noinput_args \
     $nul_args && ret=0
 }
  
 _managepy-dbshell(){
   _arguments -s : \
+    $db_args \
     $nul_args && ret=0
 }
  
 _managepy-diffsettings(){
   _arguments -s : \
+    "--all[Display all settings, regardless of their value.]"
     $nul_args && ret=0
 }
  
 _managepy-dumpdata(){
   _arguments -s : \
-    '--format=-[specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
-    '--indent=-[specifies the indent level to use when pretty-printing output.]:' \
+    '--format=-[Specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
+    '--indent=-[Specifies the indent level to use when pretty-printing output.]' \
+    '--exclude=-[An app_label or app_label.ModelName to exclude (use multiple --exclude to exclude multiple apps/models).]' \
+    '--natural-foreign[Use natural foreign keys if they are available.]' \
+    '--natural-primary[Use natural primary keys if they are available.]' \
+    "--all[Use Django's base manager to dump all models stored in the database.]" \
+    '--pks=-[Only dump objects with given primary keys.]' \
+    $db_args \
     $nul_args \
     '*::appname:_applist' && ret=0
 }
  
 _managepy-flush(){
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $no_init_data_args \
+    $db_args \
+    $noinput_args \
     $nul_args && ret=0
 }
  
@@ -75,32 +130,61 @@ _managepy_cmds(){
  
 _managepy-inspectdb(){
   _arguments -s : \
+    $db_args \
     $nul_args && ret=0
 }
  
 _managepy-loaddata(){
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--ignorenonexistent[Ignores entries in the serialized data for fields that do not currently exist on the model.]' \
+    '--app=-[Only look for fixtures in the specified app.]:appname:_applist' \
     '*::file:_files' \
+    $db_args \
     $nul_args && ret=0
 }
  
-_managepy-reset(){
+_managepy-makemessages(){
   _arguments -s : \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
-    '*::appname:_applist' \
+    '--locale=-[Creates or updates the message files for the given locale(s) (e.g. pt_BR).]' \
+    '--domain=-[The domain of the message files (default: "django").]' \
+    '--all[Updates the message files for all existing locales.]' \
+    '--extension=-[The file extension(s) to examine (default: "html,txt", or "js" if the domain is "djangojs").]' \
+    '--symlinks[Follows symlinks to directories when examining source code and templates for translation strings.]' \
+    '--ignore=-[Ignore files or directories matching this glob-style pattern.]' \
+    "--no-default-ignore[Don't ignore the common glob-style patterns 'CVS', '.*', '*~' and '*.pyc'.]" \
+    "--no-wrap[Don't break long message lines into several lines.]" \
+    "--no-location[Don't write '#: filename:line' lines.]" \
+    '--no-obsolete[emove obsolete message strings.]' \
+    '--keep-pot[Keep .pot file after making messages.]' \
+    $nul_args && ret=0
+}
+_managepy-makemigrations(){
+  _arguments -s : \
+    '--dry-run[Just show what migrations would be made]' \
+    '--merge[Enable fixing of migration conflicts.]' \
+    '--empty[Create an empty migration.]' \
+    $noinput_args \
+    $nul_args && ret=0
+}
+_managepy-migrate(){
+  _arguments -s : \
+    '--fake[Mark migrations as run without actually running them]' \
+    '--list[Show a list of all known migrations and which are applied]' \
+    $no_init_data_args \
+    $noinput_args \
+    $db_args \
     $nul_args && ret=0
 }
  
 _managepy-runfcgi(){
   local state
-  
+
   local fcgi_opts
   fcgi_opts=(
     'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
     'host[hostname to listen on..]:'
     'port[port to listen on.]:'
-    'socket[UNIX socket to listen on.]::file:_files'
+    'socket[UNIX socket to listen on.]:file:_files'
     'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
     'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
     'maxspare[max number of spare processes / threads.]:'
@@ -112,7 +196,7 @@ _managepy-runfcgi(){
     'outlog[write stdout to this file.]:file:_files'
     'errlog[write stderr to this file.]:file:_files'
   )
-  
+
   _arguments -s : \
     $nul_args \
     '*: :_values "FCGI Setting" $fcgi_opts' && ret=0
@@ -120,72 +204,148 @@ _managepy-runfcgi(){
  
 _managepy-runserver(){
   _arguments -s : \
-    '--noreload[tells Django to NOT use the auto-reloader.]' \
-    '--adminmedia[specifies the directory from which to serve admin media.]:directory:_files' \
+    '--ipv6[Tells Django to use an IPv6 address.]' \
+    '--nothreading[Tells Django to NOT use threading.]' \
+    '--noreload[Tells Django to NOT use the auto-reloader.]' \
+    '--nostatic[Tells Django to NOT automatically serve static files at STATIC_URL.]' \
+    '--insecure[Allows serving static files even if DEBUG is False.]' \
     $nul_args && ret=0
 }
  
 _managepy-shell(){
   _arguments -s : \
-    '--plain[tells Django to use plain Python, not IPython.]' \
+    '--plain[Tells Django to use plain Python, not IPython.]' \
+    '--no-startup[When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.]' \
+    '--interface=-[Specify an interactive interpreter interface.]:INTERFACE:((ipython bpython))' \
+    $nul_args && ret=0
+}
+
+_managepy-sql(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlall(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlclear(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlcustom(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-dropindexes(){
+  _arguments -s : \
+    $db_args \
     $nul_args && ret=0
 }
  
-_managepy-sql(){}
-_managepy-sqlall(){}
-_managepy-sqlclear(){}
-_managepy-sqlcustom(){}
-_managepy-sqlflush(){}
-_managepy-sqlindexes(){}
-_managepy-sqlinitialdata(){}
-_managepy-sqlreset(){}
-_managepy-sqlsequencereset(){}
-_managepy-startapp(){}
-_managepy-startproject(){}
+_managepy-sqlflush(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlindexes(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlinitialdata(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-sqlsequencereset(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-squashmigrations(){
+  _arguments -s : \
+    '--no-optimize[Do not try to optimize the squashed operations.]' \
+    $noinput_args \
+    $nul_args && ret=0
+}
+
+_managepy-startapp(){
+  _arguments -s : \
+    $start_args \
+    $nul_args && ret=0
+}
+_managepy-startproject(){
+  _arguments -s : \
+    $start_args \
+    $nul_args && ret=0
+}
  
 _managepy-syncdb() {
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $noinput_args \
+    $no_init_data_args \
+    $db_args \
     $nul_args && ret=0
 }
  
 _managepy-test() {
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    '--failfast[Tells Django to stop running the test suite after first failed test.]' \
+    '--testrunner=-[Tells Django to use specified test runner class instead of the one specified by the TEST_RUNNER setting.]' \
+    '--liveserver=-[Overrides the default address where the live server (used with LiveServerTestCase) is expected to run from. The default value is localhost:8081.]' \
+    '--top-level-directory=-[Top level of project for unittest discovery.]' \
+    '--pattern=-[The test matching pattern. Defaults to test*.py.]:' \
+    $noinput_args \
     '*::appname:_applist' \
     $nul_args && ret=0
 }
  
 _managepy-testserver() {
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
     '--addrport=-[port number or ipaddr:port to run the server on.]' \
+    '--ipv6[Tells Django to use an IPv6 address.]' \
+    $noinput_args \
     '*::fixture:_files' \
     $nul_args && ret=0
 }
  
 _managepy-validate() {
   _arguments -s : \
+    $tag_args \
     $nul_args && ret=0
 }
  
 _managepy-commands() {
   local -a commands
-  
+
   commands=(
-    'adminindex:prints the admin-index template snippet for the given app name(s).'
-    'createcachetable:creates the table needed to use the SQL cache backend.'
+    "changepassword:Change a user's password for django.contrib.auth."
+    'check:Checks the entire Django project for potential problems.'
+    'compilemessages:Compiles .po files to .mo files for use with builtin gettext support.'
+    'createcachetable:Creates the table needed to use the SQL cache backend.'
+    'createsuperuser:Used to create a superuser.'
     'collectstatic:Collect static files in a single location.'
-    'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
-    "diffsettings:displays differences between the current settings.py and Django's default settings."
+    'dbshell:Runs the command-line client for the current DATABASE_ENGINE.'
+    "diffsettings:Displays differences between the current settings.py and Django's default settings."
     'dumpdata:Output the contents of the database as a fixture of the given format.'
     'flush:Executes ``sqlflush`` on the current database.'
     'help:manage.py help.'
     'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
     'loaddata:Installs the named fixture(s) in the database.'
-    'reset:Executes ``sqlreset`` for the given app(s) in the current database.'
+    'makemessages:Runs over the entire source tree of the current directory and pulls out all strings marked for translation.'
+    'makemigrations:Creates new migration(s) for apps.'
+    'migrate:Updates database schema. Manages both apps with migrations and those without.'
     'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
     'runserver:Starts a lightweight Web server for development.'
     'shell:Runs a Python interactive interpreter.'
@@ -193,11 +353,12 @@ _managepy-commands() {
     'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
     'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
     'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
+    'sqldropindexes:Prints the DROP INDEX SQL statements for the given model module name(s).'
     'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
     'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
     "sqlinitialdata:RENAMED: see 'sqlcustom'"
-    'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
     'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
+    'squashmigrations:Squashes an existing set of migrations (from first until specified) into a single new one.'
     "startapp:Creates a Django app directory structure for the given app name in this project's directory."
     "startproject:Creates a Django project directory structure for the given project name in this current directory."
     "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
@@ -205,7 +366,7 @@ _managepy-commands() {
     'testserver:Runs a development server with data from the given fixture(s).'
     'validate:Validates all installed models.'
   )
-  
+
   _describe -t commands 'manage.py command' commands && ret=0
 }
  
@@ -223,7 +384,7 @@ _applist() {
  
 _managepy() {
   local curcontext=$curcontext ret=1
-  
+
   if ((CURRENT == 2)); then
     _managepy-commands
   else
 eval "$(npm completion 2>/dev/null)"
  
-# Install and save to dependencies
-alias npms="npm i -S "
  
-# Install and save to dev-dependencies
-alias npmd="npm i -D "
+# npm package names are lowercase
+# - https://twitter.com/substack/status/23122603153150361
+# Thus, we've used camelCase for the following aliases:
+
+# Install and save to dependencies in your package.json
+# npms is used by https://www.npmjs.com/package/npms
+alias npmS="npm i -S "
+
+# Install and save to dev-dependencies in your package.json
+# npmd is used by https://github.com/dominictarr/npmd
+alias npmD="npm i -D "
...	...	@@ -3,7 +3,7 @@
3	3
4	4	Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
5	5
6		-__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interace with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
	6	+__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interface with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
7	7
8	8	To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on twitter.
9	9
...	...	@@ -21,6 +21,7 @@ _1st_arguments=(
21	21	'push:copy file/dir to device'
22	22	'shell:run remote shell interactively'
23	23	'sync:copy host->device only if changed (-l means list but dont copy)'
	24	+‘tcpip:restart host adb in tcpip mode’
24	25	'uninstall:remove this app package from the device'
25	26	'version:show version num'
26	27	)
...	...	@@ -2,59 +2,114 @@
2	2
3	3	typeset -ga nul_args
4	4	nul_args=(
	5	+ '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))'
5	6	'--settings=-[the Python path to a settings module.]:file:_files'
6		- '--pythonpath=-[a directory to add to the Python path.]::directory:_directories'
	7	+ '--pythonpath=-[a directory to add to the Python path.]:directory:_directories'
7	8	'--traceback[print traceback on exception.]'
	9	+ "--no-color[Don't colorize the command output.]"
8	10	"--version[show program's version number and exit.]"
9	11	{-h,--help}'[show this help message and exit.]'
10	12	)
11	13
12		-_managepy-adminindex(){
	14	+typeset -ga start_args
	15	+start_args=(
	16	+ '--template=-[The path or URL to load the template from.]:directory:_directories'
	17	+ '--extension=-[The file extension(s) to render (default: "py").]'
	18	+ '--name=-[The file name(s) to render.]:file:_files'
	19	+)
	20	+
	21	+typeset -ga db_args
	22	+db_args=(
	23	+ '--database=-[Nominates a database. Defaults to the "default" database.]'
	24	+)
	25	+
	26	+typeset -ga noinput_args
	27	+noinput_args=(
	28	+ '--noinput[tells Django to NOT prompt the user for input of any kind.]'
	29	+)
	30	+
	31	+typeset -ga no_init_data_args
	32	+no_init_data_args=(
	33	+ '--no-initial-data[Tells Django not to load any initial data after database synchronization.]'
	34	+)
	35	+
	36	+typeset -ga tag_args
	37	+tag_args=(
	38	+ '--tag=-[Run only checks labeled with given tag.]'
	39	+ '--list-tags[List available tags.]'
	40	+)
	41	+
	42	+_managepy-check(){
13	43	_arguments -s : \
14		- $nul_args \
15		- '*::directory:_directories' && ret=0
	44	+ $tag_args \
	45	+ $nul_args && ret=0
	46	+}
	47	+
	48	+_managepy-changepassword(){
	49	+ _arguments -s : \
	50	+ $db_args \
	51	+ $nul_args && ret=0
16	52	}
17	53
18	54	_managepy-createcachetable(){
19	55	_arguments -s : \
	56	+ $db_args \
	57	+ $nul_args && ret=0
	58	+}
	59	+
	60	+_managepy-createsuperuser(){
	61	+ _arguments -s : \
	62	+ '--username=-[Specifies the login for the superuser.]' \
	63	+ '--email=-[Specifies the email for the superuser.]' \
	64	+ $noinput_args \
	65	+ $db_args \
20	66	$nul_args && ret=0
21	67	}
22	68
23	69	_managepy-collectstatic(){
24	70	_arguments -s : \
25		- '--link=-[Create a symbolic link to each file instead of copying.]:' \
26		- '--noinput=-[Do NOT prompt the user for input of any kind.]:' \
27		- '--no-post-process=-[Do NOT post process collected files.]:' \
28		- '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]:' \
29		- '--dry-run=-[Do everything except modify the filesystem.]:' \
30		- '--clear=-[Clear the existing files using the storage before trying to copy or link the original file.]:' \
31		- '--link=-[Create a symbolic link to each file instead of copying.]:' \
32		- '--no-default-ignore=-[Do not ignore the common private glob-style patterns "CVS", "." and "~".]:' \
	71	+ '--link[Create a symbolic link to each file instead of copying.]' \
	72	+ '--no-post-process[Do NOT post process collected files.]' \
	73	+ '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]' \
	74	+ '--dry-run[Do everything except modify the filesystem.]' \
	75	+ '--clear[Clear the existing files using the storage before trying to copy or link the original file.]' \
	76	+ '--link[Create a symbolic link to each file instead of copying.]' \
	77	+ '--no-default-ignore[Do not ignore the common private glob-style patterns "CVS", "." and "~".]' \
	78	+ $noinput_args \
33	79	$nul_args && ret=0
34	80	}
35	81
36	82	_managepy-dbshell(){
37	83	_arguments -s : \
	84	+ $db_args \
38	85	$nul_args && ret=0
39	86	}
40	87
41	88	_managepy-diffsettings(){
42	89	_arguments -s : \
	90	+ "--all[Display all settings, regardless of their value.]"
43	91	$nul_args && ret=0
44	92	}
45	93
46	94	_managepy-dumpdata(){
47	95	_arguments -s : \
48		- '--format=-[specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
49		- '--indent=-[specifies the indent level to use when pretty-printing output.]:' \
	96	+ '--format=-[Specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
	97	+ '--indent=-[Specifies the indent level to use when pretty-printing output.]' \
	98	+ '--exclude=-[An app_label or app_label.ModelName to exclude (use multiple --exclude to exclude multiple apps/models).]' \
	99	+ '--natural-foreign[Use natural foreign keys if they are available.]' \
	100	+ '--natural-primary[Use natural primary keys if they are available.]' \
	101	+ "--all[Use Django's base manager to dump all models stored in the database.]" \
	102	+ '--pks=-[Only dump objects with given primary keys.]' \
	103	+ $db_args \
50	104	$nul_args \
51	105	'*::appname:_applist' && ret=0
52	106	}
53	107
54	108	_managepy-flush(){
55	109	_arguments -s : \
56		- '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
57		- '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
	110	+ $no_init_data_args \
	111	+ $db_args \
	112	+ $noinput_args \
58	113	$nul_args && ret=0
59	114	}
60	115
...	...	@@ -75,32 +130,61 @@ _managepy_cmds(){
75	130
76	131	_managepy-inspectdb(){
77	132	_arguments -s : \
	133	+ $db_args \
78	134	$nul_args && ret=0
79	135	}
80	136
81	137	_managepy-loaddata(){
82	138	_arguments -s : \
83		- '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
	139	+ '--ignorenonexistent[Ignores entries in the serialized data for fields that do not currently exist on the model.]' \
	140	+ '--app=-[Only look for fixtures in the specified app.]:appname:_applist' \
84	141	'*::file:_files' \
	142	+ $db_args \
85	143	$nul_args && ret=0
86	144	}
87	145
88		-_managepy-reset(){
	146	+_managepy-makemessages(){
89	147	_arguments -s : \
90		- '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
91		- '*::appname:_applist' \
	148	+ '--locale=-[Creates or updates the message files for the given locale(s) (e.g. pt_BR).]' \
	149	+ '--domain=-[The domain of the message files (default: "django").]' \
	150	+ '--all[Updates the message files for all existing locales.]' \
	151	+ '--extension=-[The file extension(s) to examine (default: "html,txt", or "js" if the domain is "djangojs").]' \
	152	+ '--symlinks[Follows symlinks to directories when examining source code and templates for translation strings.]' \
	153	+ '--ignore=-[Ignore files or directories matching this glob-style pattern.]' \
	154	+ "--no-default-ignore[Don't ignore the common glob-style patterns 'CVS', '.', '~' and '*.pyc'.]" \
	155	+ "--no-wrap[Don't break long message lines into several lines.]" \
	156	+ "--no-location[Don't write '#: filename:line' lines.]" \
	157	+ '--no-obsolete[emove obsolete message strings.]' \
	158	+ '--keep-pot[Keep .pot file after making messages.]' \
	159	+ $nul_args && ret=0
	160	+}
	161	+_managepy-makemigrations(){
	162	+ _arguments -s : \
	163	+ '--dry-run[Just show what migrations would be made]' \
	164	+ '--merge[Enable fixing of migration conflicts.]' \
	165	+ '--empty[Create an empty migration.]' \
	166	+ $noinput_args \
	167	+ $nul_args && ret=0
	168	+}
	169	+_managepy-migrate(){
	170	+ _arguments -s : \
	171	+ '--fake[Mark migrations as run without actually running them]' \
	172	+ '--list[Show a list of all known migrations and which are applied]' \
	173	+ $no_init_data_args \
	174	+ $noinput_args \
	175	+ $db_args \
92	176	$nul_args && ret=0
93	177	}
94	178
95	179	_managepy-runfcgi(){
96	180	local state
97		-
	181	+
98	182	local fcgi_opts
99	183	fcgi_opts=(
100	184	'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
101	185	'host[hostname to listen on..]:'
102	186	'port[port to listen on.]:'
103		- 'socket[UNIX socket to listen on.]::file:_files'
	187	+ 'socket[UNIX socket to listen on.]:file:_files'
104	188	'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
105	189	'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
106	190	'maxspare[max number of spare processes / threads.]:'
...	...	@@ -112,7 +196,7 @@ _managepy-runfcgi(){
112	196	'outlog[write stdout to this file.]:file:_files'
113	197	'errlog[write stderr to this file.]:file:_files'
114	198	)
115		-
	199	+
116	200	_arguments -s : \
117	201	$nul_args \
118	202	'*: :_values "FCGI Setting" $fcgi_opts' && ret=0
...	...	@@ -120,72 +204,148 @@ _managepy-runfcgi(){
120	204
121	205	_managepy-runserver(){
122	206	_arguments -s : \
123		- '--noreload[tells Django to NOT use the auto-reloader.]' \
124		- '--adminmedia[specifies the directory from which to serve admin media.]:directory:_files' \
	207	+ '--ipv6[Tells Django to use an IPv6 address.]' \
	208	+ '--nothreading[Tells Django to NOT use threading.]' \
	209	+ '--noreload[Tells Django to NOT use the auto-reloader.]' \
	210	+ '--nostatic[Tells Django to NOT automatically serve static files at STATIC_URL.]' \
	211	+ '--insecure[Allows serving static files even if DEBUG is False.]' \
125	212	$nul_args && ret=0
126	213	}
127	214
128	215	_managepy-shell(){
129	216	_arguments -s : \
130		- '--plain[tells Django to use plain Python, not IPython.]' \
	217	+ '--plain[Tells Django to use plain Python, not IPython.]' \
	218	+ '--no-startup[When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.]' \
	219	+ '--interface=-[Specify an interactive interpreter interface.]:INTERFACE:((ipython bpython))' \
	220	+ $nul_args && ret=0
	221	+}
	222	+
	223	+_managepy-sql(){
	224	+ _arguments -s : \
	225	+ $db_args \
	226	+ $nul_args && ret=0
	227	+}
	228	+
	229	+_managepy-sqlall(){
	230	+ _arguments -s : \
	231	+ $db_args \
	232	+ $nul_args && ret=0
	233	+}
	234	+
	235	+_managepy-sqlclear(){
	236	+ _arguments -s : \
	237	+ $db_args \
	238	+ $nul_args && ret=0
	239	+}
	240	+
	241	+_managepy-sqlcustom(){
	242	+ _arguments -s : \
	243	+ $db_args \
	244	+ $nul_args && ret=0
	245	+}
	246	+
	247	+_managepy-dropindexes(){
	248	+ _arguments -s : \
	249	+ $db_args \
131	250	$nul_args && ret=0
132	251	}
133	252
134		-_managepy-sql(){}
135		-_managepy-sqlall(){}
136		-_managepy-sqlclear(){}
137		-_managepy-sqlcustom(){}
138		-_managepy-sqlflush(){}
139		-_managepy-sqlindexes(){}
140		-_managepy-sqlinitialdata(){}
141		-_managepy-sqlreset(){}
142		-_managepy-sqlsequencereset(){}
143		-_managepy-startapp(){}
144		-_managepy-startproject(){}
	253	+_managepy-sqlflush(){
	254	+ _arguments -s : \
	255	+ $db_args \
	256	+ $nul_args && ret=0
	257	+}
	258	+
	259	+_managepy-sqlindexes(){
	260	+ _arguments -s : \
	261	+ $db_args \
	262	+ $nul_args && ret=0
	263	+}
	264	+
	265	+_managepy-sqlinitialdata(){
	266	+ _arguments -s : \
	267	+ $nul_args && ret=0
	268	+}
	269	+
	270	+_managepy-sqlsequencereset(){
	271	+ _arguments -s : \
	272	+ $db_args \
	273	+ $nul_args && ret=0
	274	+}
	275	+
	276	+_managepy-squashmigrations(){
	277	+ _arguments -s : \
	278	+ '--no-optimize[Do not try to optimize the squashed operations.]' \
	279	+ $noinput_args \
	280	+ $nul_args && ret=0
	281	+}
	282	+
	283	+_managepy-startapp(){
	284	+ _arguments -s : \
	285	+ $start_args \
	286	+ $nul_args && ret=0
	287	+}
	288	+_managepy-startproject(){
	289	+ _arguments -s : \
	290	+ $start_args \
	291	+ $nul_args && ret=0
	292	+}
145	293
146	294	_managepy-syncdb() {
147	295	_arguments -s : \
148		- '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
149		- '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
	296	+ $noinput_args \
	297	+ $no_init_data_args \
	298	+ $db_args \
150	299	$nul_args && ret=0
151	300	}
152	301
153	302	_managepy-test() {
154	303	_arguments -s : \
155		- '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
156		- '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
	304	+ '--failfast[Tells Django to stop running the test suite after first failed test.]' \
	305	+ '--testrunner=-[Tells Django to use specified test runner class instead of the one specified by the TEST_RUNNER setting.]' \
	306	+ '--liveserver=-[Overrides the default address where the live server (used with LiveServerTestCase) is expected to run from. The default value is localhost:8081.]' \
	307	+ '--top-level-directory=-[Top level of project for unittest discovery.]' \
	308	+ '--pattern=-[The test matching pattern. Defaults to test*.py.]:' \
	309	+ $noinput_args \
157	310	'*::appname:_applist' \
158	311	$nul_args && ret=0
159	312	}
160	313
161	314	_managepy-testserver() {
162	315	_arguments -s : \
163		- '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
164	316	'--addrport=-[port number or ipaddr:port to run the server on.]' \
	317	+ '--ipv6[Tells Django to use an IPv6 address.]' \
	318	+ $noinput_args \
165	319	'*::fixture:_files' \
166	320	$nul_args && ret=0
167	321	}
168	322
169	323	_managepy-validate() {
170	324	_arguments -s : \
	325	+ $tag_args \
171	326	$nul_args && ret=0
172	327	}
173	328
174	329	_managepy-commands() {
175	330	local -a commands
176		-
	331	+
177	332	commands=(
178		- 'adminindex:prints the admin-index template snippet for the given app name(s).'
179		- 'createcachetable:creates the table needed to use the SQL cache backend.'
	333	+ "changepassword:Change a user's password for django.contrib.auth."
	334	+ 'check:Checks the entire Django project for potential problems.'
	335	+ 'compilemessages:Compiles .po files to .mo files for use with builtin gettext support.'
	336	+ 'createcachetable:Creates the table needed to use the SQL cache backend.'
	337	+ 'createsuperuser:Used to create a superuser.'
180	338	'collectstatic:Collect static files in a single location.'
181		- 'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
182		- "diffsettings:displays differences between the current settings.py and Django's default settings."
	339	+ 'dbshell:Runs the command-line client for the current DATABASE_ENGINE.'
	340	+ "diffsettings:Displays differences between the current settings.py and Django's default settings."
183	341	'dumpdata:Output the contents of the database as a fixture of the given format.'
184	342	'flush:Executes ``sqlflush`` on the current database.'
185	343	'help:manage.py help.'
186	344	'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
187	345	'loaddata:Installs the named fixture(s) in the database.'
188		- 'reset:Executes ``sqlreset`` for the given app(s) in the current database.'
	346	+ 'makemessages:Runs over the entire source tree of the current directory and pulls out all strings marked for translation.'
	347	+ 'makemigrations:Creates new migration(s) for apps.'
	348	+ 'migrate:Updates database schema. Manages both apps with migrations and those without.'
189	349	'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
190	350	'runserver:Starts a lightweight Web server for development.'
191	351	'shell:Runs a Python interactive interpreter.'
...	...	@@ -193,11 +353,12 @@ _managepy-commands() {
193	353	'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
194	354	'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
195	355	'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
	356	+ 'sqldropindexes:Prints the DROP INDEX SQL statements for the given model module name(s).'
196	357	'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
197	358	'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
198	359	"sqlinitialdata:RENAMED: see 'sqlcustom'"
199		- 'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
200	360	'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
	361	+ 'squashmigrations:Squashes an existing set of migrations (from first until specified) into a single new one.'
201	362	"startapp:Creates a Django app directory structure for the given app name in this project's directory."
202	363	"startproject:Creates a Django project directory structure for the given project name in this current directory."
203	364	"syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
...	...	@@ -205,7 +366,7 @@ _managepy-commands() {
205	366	'testserver:Runs a development server with data from the given fixture(s).'
206	367	'validate:Validates all installed models.'
207	368	)
208		-
	369	+
209	370	_describe -t commands 'manage.py command' commands && ret=0
210	371	}
211	372
...	...	@@ -223,7 +384,7 @@ _applist() {
223	384
224	385	_managepy() {
225	386	local curcontext=$curcontext ret=1
226		-
	387	+
227	388	if ((CURRENT == 2)); then
228	389	_managepy-commands
229	390	else
1	1	eval "$(npm completion 2>/dev/null)"
2	2
3		-# Install and save to dependencies
4		-alias npms="npm i -S "
5	3
6		-# Install and save to dev-dependencies
7		-alias npmd="npm i -D "
	4	+# npm package names are lowercase
	5	+# - https://twitter.com/substack/status/23122603153150361
	6	+# Thus, we've used camelCase for the following aliases:
	7	+
	8	+# Install and save to dependencies in your package.json
	9	+# npms is used by https://www.npmjs.com/package/npms
	10	+alias npmS="npm i -S "
	11	+
	12	+# Install and save to dev-dependencies in your package.json
	13	+# npmd is used by https://github.com/dominictarr/npmd
	14	+alias npmD="npm i -D "