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

Cleanups of command.py (#4526)

Browse source 
* Import module_utils at the top
* Fix python3 by marking literals combined with stdout/stderr as byte
  literals
* Mark parameters as type=path where appropriate
This commit is contained in:
Toshio Kuratomi 2016-08-24 08:27:36 -07:00 committed by Matt Clay
parent 4d7d3cdbb1
commit 9b7e866964
1 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/ansible/modules/commands/command.py
View file

@ -2,6 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>, and others # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>, and others
# (c) 2016, Toshio Kuratomi <tkuratomi@ansible.com>
# #
# This file is part of Ansible # This file is part of Ansible
# #
@ -18,15 +19,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
import copy
import sys
import datetime
import glob
import traceback
import re
import shlex
import os
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: command module: command
@ -103,6 +95,15 @@ EXAMPLES = '''
creates: /path/to/database creates: /path/to/database
''' '''
import datetime
import glob
import re
import shlex
import os
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.six import b
# Dict of options and their defaults # Dict of options and their defaults
OPTIONS = {'chdir': None, OPTIONS = {'chdir': None,
'creates': None, 'creates': None,
@ -164,10 +165,10 @@ def main():
argument_spec=dict( argument_spec=dict(
_raw_params = dict(), _raw_params = dict(),
_uses_shell = dict(type='bool', default=False), _uses_shell = dict(type='bool', default=False),
chdir = dict(), chdir = dict(type='path'),
executable = dict(), executable = dict(),
creates = dict(), creates = dict(type='path'),
removes = dict(), removes = dict(type='path'),
warn = dict(type='bool', default=True), warn = dict(type='bool', default=True),
) )
) )
@ -184,18 +185,17 @@ def main():
module.fail_json(rc=256, msg="no command given") module.fail_json(rc=256, msg="no command given")
if chdir: if chdir:
chdir = os.path.abspath(os.path.expanduser(chdir)) chdir = os.path.abspath(chdir)
os.chdir(chdir) os.chdir(chdir)
if creates: if creates:
# do not run the command if the line contains creates=filename # do not run the command if the line contains creates=filename
# and the filename already exists. This allows idempotence # and the filename already exists. This allows idempotence
# of command executions. # of command executions.
v = os.path.expanduser(creates) if glob.glob(creates):
if glob.glob(v):
module.exit_json( module.exit_json(
cmd=args, cmd=args,
stdout="skipped, since %s exists" % v, stdout="skipped, since %s exists" % creates,
changed=False, changed=False,
stderr=False, stderr=False,
rc=0 rc=0
@ -205,11 +205,10 @@ def main():
# do not run the command if the line contains removes=filename # do not run the command if the line contains removes=filename
# and the filename does not exist. This allows idempotence # and the filename does not exist. This allows idempotence
# of command executions. # of command executions.
v = os.path.expanduser(removes) if not glob.glob(removes):
if not glob.glob(v):
module.exit_json( module.exit_json(
cmd=args, cmd=args,
stdout="skipped, since %s does not exist" % v, stdout="skipped, since %s does not exist" % removes,
changed=False, changed=False,
stderr=False, stderr=False,
rc=0 rc=0
@ -229,14 +228,14 @@ def main():
delta = endd - startd delta = endd - startd
if out is None: if out is None:
out = '' out = b('')
if err is None: if err is None:
err = '' err = b('')
module.exit_json( module.exit_json(
cmd = args, cmd = args,
stdout = out.rstrip("\r\n"), stdout = out.rstrip(b("\r\n")),
stderr = err.rstrip("\r\n"), stderr = err.rstrip(b("\r\n")),
rc = rc, rc = rc,
start = str(startd), start = str(startd),
end = str(endd), end = str(endd),
@ -245,8 +244,5 @@ def main():
warnings = warnings warnings = warnings
) )
# import module snippets if __name__ == '__main__':
from ansible.module_utils.basic import * main()
from ansible.module_utils.splitter import *
main()