Commit a53d3747 authored by charlie-ablett's avatar charlie-ablett

Options are merged with incoming execution parameters at runtime.

parent 7de962c5
PATH
remote: .
specs:
ink_step (0.2.0)
ink_step (0.2.1)
awesome_print
httparty
rubyzip
......
......@@ -10,8 +10,8 @@ module InkStep
include Mixins::ShellMethods
attr_accessor :next_step, :errors, :status_code, :required_parameters, :process_step,
:started_at, :finished_at, :position, :chain_file_location, :successful, :notes
:process_log
:started_at, :finished_at, :position, :chain_file_location, :successful, :notes,
:process_log, :execution_parameters
INPUT_FILE_DIRECTORY_NAME = "input_files"
OUTPUT_FILE_DIRECTORY_NAME = "output_files"
......@@ -33,11 +33,14 @@ module InkStep
def execute(options: {})
@started_at = Time.now
check_parameters(options)
combined_parameters = options.merge(execution_parameters)
check_parameters(combined_parameters)
create_directory_if_needed(working_directory)
get_input_files
log_as_step "Using version #{version}"
perform_step(options: options)
log_as_step "Execution parameters:"
log_as_step combined_parameters
perform_step(options: combined_parameters)
rescue => e
raise_and_log_error(e)
@successful = false
......
module InkStep
VERSION = '0.2.0'
VERSION = '0.2.1'
end
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment