Skip to content

🔨 Code refactoring #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2019
Merged

🔨 Code refactoring #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 21 additions & 36 deletions moban/plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,7 @@ def number_of_templated_files(self):
return self.templated_count

def render_to_file(self, template_file, data_file, output_file):
try:
data = self.context.get_data(data_file)
except Exception as exception:
# If data file doesn't exist:
# 1. Alert the user of their (potential) mistake
# 2. Attempt to use environment vars as data
reporter.report_error_message(str(exception))
reporter.report_using_env_vars()
data = os.environ
data = self.context.get_data(data_file)
template = self.engine.get_template(template_file)
template_abs_path = utils.get_template_path(
self.template_dirs, template_file
Expand Down Expand Up @@ -97,15 +89,7 @@ def _render_with_finding_template_first(self, template_file_index):
self.template_dirs, template_file
)
for (data_file, output) in data_output_pairs:
try:
data = self.context.get_data(data_file)
except Exception as exception:
# If data file doesn't exist:
# 1. Alert the user of their (potential) mistake
# 2. Attempt to use environment vars as data
reporter.report_error_message(exception)
reporter.report_using_env_vars()
data = os.environ
data = self.context.get_data(data_file)
flag = self.apply_template(
template_abs_path, template, data, output
)
Expand All @@ -116,15 +100,7 @@ def _render_with_finding_template_first(self, template_file_index):

def _render_with_finding_data_first(self, data_file_index):
for (data_file, template_output_pairs) in data_file_index.items():
try:
data = self.context.get_data(data_file)
except Exception as exception:
# If data file doesn't exist:
# 1. Alert the user of their (potential) mistake
# 2. Attempt to use environment vars as data
reporter.report_error_message(exception)
reporter.report_using_env_vars()
data = os.environ
data = self.context.get_data(data_file)
for (template_file, output) in template_output_pairs:
template = self.engine.get_template(template_file)
template_abs_path = utils.get_template_path(
Expand Down Expand Up @@ -207,15 +183,24 @@ def __init__(self, context_dirs):
)

def get_data(self, file_name):
file_extension = os.path.splitext(file_name)[1]
if file_extension == ".json":
data = utils.open_json(self.context_dirs, file_name)
elif file_extension in [".yml", ".yaml"]:
data = utils.open_yaml(self.context_dirs, file_name)
utils.merge(data, self.__cached_environ_variables)
else:
raise exceptions.IncorrectDataInput
return data
try:
file_extension = os.path.splitext(file_name)[1]
if file_extension == ".json":
data = utils.open_json(self.context_dirs, file_name)
elif file_extension in [".yml", ".yaml"]:
data = utils.open_yaml(self.context_dirs, file_name)
utils.merge(data, self.__cached_environ_variables)
else:
raise exceptions.IncorrectDataInput
return data
except Exception as exception:
# If data file doesn't exist:
# 1. Alert the user of their (potential) mistake
# 2. Attempt to use environment vars as data
reporter.report_error_message(str(exception))
reporter.report_using_env_vars()
data = os.environ
return data


def make_sure_all_pkg_are_loaded():
Expand Down