Merge branch 'release/0.8.6'

This commit is contained in:
beelit94 2017-05-15 11:15:31 +08:00
commit 3ae7f87df9
4 changed files with 11 additions and 10 deletions

View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.8.5 current_version = 0.8.6
commit = True commit = True
tag = False tag = False

View file

@ -12,7 +12,7 @@ python-terraform is a python module provide a wrapper of `terraform` command lin
## Usage ## Usage
#### For any terraform command #### For any terraform command
from python_terraform import Terraform from python_terraform import *
t = Terraform() t = Terraform()
return_code, stdout, stderr = t.<cmd_name>(*arguments, **options) return_code, stdout, stderr = t.<cmd_name>(*arguments, **options)
@ -20,13 +20,13 @@ python-terraform is a python module provide a wrapper of `terraform` command lin
to be able to call the method, you could call cmd_name by adding `_cmd` after command name, for example, to be able to call the method, you could call cmd_name by adding `_cmd` after command name, for example,
`import` here could be called by `import` here could be called by
from python_terraform import Terraform from python_terraform import *
t = Terraform() t = Terraform()
return_code, stdout, stderr = t.import_cmd(*arguments, **options) return_code, stdout, stderr = t.import_cmd(*arguments, **options)
or just call cmd method directly or just call cmd method directly
from python_terraform import Terraform from python_terraform import *
t = Terraform() t = Terraform()
return_code, stdout, stderr = t.cmd(<cmd_name>, *arguments, **options) return_code, stdout, stderr = t.cmd(<cmd_name>, *arguments, **options)
@ -93,19 +93,19 @@ In shell:
In python-terraform: In python-terraform:
from python_terraform import Terraform from python_terraform import *
tf = Terraform(working_dir='/home/test') tf = Terraform(working_dir='/home/test')
tf.apply(no_color=IsFlagged, refresh=False, var={'a':'b', 'c':'d'}) tf.apply(no_color=IsFlagged, refresh=False, var={'a':'b', 'c':'d'})
or or
from python_terraform import Terraform from python_terraform import *
tf = Terraform() tf = Terraform()
tf.apply('/home/test', no_color=IsFlagged, refresh=False, var={'a':'b', 'c':'d'}) tf.apply('/home/test', no_color=IsFlagged, refresh=False, var={'a':'b', 'c':'d'})
or or
from python_terraform import Terraform from python_terraform import *
tf = Terraform(working_dir='/home/test', variables={'a':'b', 'c':'d'}) tf = Terraform(working_dir='/home/test', variables={'a':'b', 'c':'d'})
tf.apply(no_color=IsFlagged, refresh=False) tf.apply(no_color=IsFlagged, refresh=False)
@ -117,7 +117,7 @@ In shell:
In python-terraform: In python-terraform:
from python_terraform import Terraform from python_terraform import *
tf = terraform(working_dir='/home/test') tf = terraform(working_dir='/home/test')
tf.fmt(diff=True) tf.fmt(diff=True)

View file

@ -294,8 +294,9 @@ class VariableFiles(object):
def create(self, variables): def create(self, variables):
with tempfile.NamedTemporaryFile('w+t', delete=False) as temp: with tempfile.NamedTemporaryFile('w+t', delete=False) as temp:
logging.debug('{0} is created'.format(temp.name)) log.debug('{0} is created'.format(temp.name))
self.files.append(temp) self.files.append(temp)
log.debug('variables wrote to tempfile: {0}'.format(str(variables)))
temp.write(json.dumps(variables)) temp.write(json.dumps(variables))
file_name = temp.name file_name = temp.name

View file

@ -20,7 +20,7 @@ except IOError:
setup( setup(
name=module_name, name=module_name,
version='0.8.5', version='0.8.6',
url='https://github.com/beelit94/python-terraform', url='https://github.com/beelit94/python-terraform',
license='MIT', license='MIT',
author='Freddy Tan', author='Freddy Tan',