cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing up the hacking module_formatter code for v2

Browse source
This commit is contained in:
Florian Apolloner 2015-05-23 08:42:17 -05:00 committed by James Cammarata
parent 838ff32001
commit 3010190592
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hacking/module_formatter.py
View file

@ -33,8 +33,8 @@ import subprocess
import cgi import cgi
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
import ansible.utils from ansible.utils import module_docs
import ansible.utils.module_docs as module_docs from ansible.utils.vars import merge_hash
##################################################################################### #####################################################################################
# constants and paths # constants and paths
@ -135,7 +135,7 @@ def list_modules(module_dir, depth=0):
res = list_modules(d, depth + 1) res = list_modules(d, depth + 1)
for key in res.keys(): for key in res.keys():
if key in categories: if key in categories:
categories[key] = ansible.utils.merge_hash(categories[key], res[key]) categories[key] = merge_hash(categories[key], res[key])
res.pop(key, None) res.pop(key, None)
if depth < 2: if depth < 2:
@ -236,11 +236,11 @@ def process_module(module, options, env, template, outputname, module_map, alias
print "rendering: %s" % module print "rendering: %s" % module
# use ansible core library to parse out doc metadata YAML and plaintext examples # use ansible core library to parse out doc metadata YAML and plaintext examples
doc, examples, returndocs= ansible.utils.module_docs.get_docstring(fname, verbose=options.verbose) doc, examples, returndocs = module_docs.get_docstring(fname, verbose=options.verbose)
# crash if module is missing documentation and not explicitly hidden from docs index # crash if module is missing documentation and not explicitly hidden from docs index
if doc is None: if doc is None:
if module in ansible.utils.module_docs.BLACKLIST_MODULES: if module in module_docs.BLACKLIST_MODULES:
return "SKIPPED" return "SKIPPED"
else: else:
sys.stderr.write("*** ERROR: MODULE MISSING DOCUMENTATION: %s, %s ***\n" % (fname, module)) sys.stderr.write("*** ERROR: MODULE MISSING DOCUMENTATION: %s, %s ***\n" % (fname, module))
@ -278,6 +278,7 @@ def process_module(module, options, env, template, outputname, module_map, alias
if added and added_float < TO_OLD_TO_BE_NOTABLE: if added and added_float < TO_OLD_TO_BE_NOTABLE:
del doc['version_added'] del doc['version_added']
if 'options' in doc:
for (k,v) in doc['options'].iteritems(): for (k,v) in doc['options'].iteritems():
all_keys.append(k) all_keys.append(k)