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

moved ad-hoc to use display

Browse source
This commit is contained in:
Brian Coca 2015-04-04 15:21:42 -04:00
parent af97e732a0
commit 5531b84360
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
v2/bin/ansible
View file

@ -40,8 +40,12 @@ from ansible.vars import VariableManager
class Cli(object):
''' code behind bin/ansible '''
def __init__(self):
pass
def __init__(self, display=None):
if display is None:
self.display = Display()
else:
self.display = display
def parse(self):
''' create an options parser for bin/ansible '''
@ -105,7 +109,7 @@ class Cli(object):
if options.listhosts:
for host in hosts:
print(' %s' % host.name)
self.display(' %s' % host.name)
sys.exit(0)
if ((options.module_name == 'command' or options.module_name == 'shell') and not options.module_args):
@ -157,22 +161,17 @@ class Cli(object):
########################################################
if __name__ == '__main__':
#callbacks.display("", log_only=True)
#callbacks.display(" ".join(sys.argv), log_only=True)
#callbacks.display("", log_only=True)
display = Display()
#display.display(" ".join(sys.argv), log_only=True)
try:
cli = Cli()
cli = Cli(display=display)
(options, args) = cli.parse()
result = cli.run(options, args)
except AnsibleError, e:
print(e)
sys.exit(cli.run(options, args))
except AnsibleError as e:
display.display("[ERROR]: %s" % e, color='red', stderr=True)
sys.exit(1)
except Exception, e:
# Generic handler for errors
print("ERROR: %s" % str(e))
except KeyboardInterrupt:
display.display("[ERROR]: interrupted", color='red', stderr=True)
sys.exit(1)
sys.exit(result)