Commit 5b9dd541 authored by charlie-ablett's avatar charlie-ablett

Get combined parameters from external source for consistency

parent a53d3747
PATH
remote: .
specs:
ink_step (0.2.1)
ink_step (0.2.2)
awesome_print
httparty
rubyzip
......@@ -9,7 +9,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
awesome_print (1.7.0)
awesome_print (1.8.0)
diff-lcs (1.2.5)
httparty (0.15.5)
multi_xml (>= 0.5.2)
......
......@@ -11,7 +11,7 @@ module InkStep
attr_accessor :next_step, :errors, :status_code, :required_parameters, :process_step,
:started_at, :finished_at, :position, :chain_file_location, :successful, :notes,
:process_log, :execution_parameters
:process_log, :execution_parameters, :combined_parameters
INPUT_FILE_DIRECTORY_NAME = "input_files"
OUTPUT_FILE_DIRECTORY_NAME = "output_files"
......@@ -32,8 +32,8 @@ module InkStep
end
def execute(options: {})
@combined_parameters = options || {}
@started_at = Time.now
combined_parameters = options.merge(execution_parameters)
check_parameters(combined_parameters)
create_directory_if_needed(working_directory)
get_input_files
......@@ -86,8 +86,6 @@ module InkStep
@process_log ||= []
end
protected
def get_input_files
if position == 1
source = File.join(chain_file_location, INPUT_FILE_DIRECTORY_NAME)
......@@ -100,6 +98,8 @@ module InkStep
copy_files_recursively(source, working_directory)
end
protected
def log_as_step(message)
message_with_metadata = "#{Time.now.utc.strftime("%y-%m-%d %H:%M:%S")} [#{self.class.name}] - #{message}"
ap message_with_metadata
......
module InkStep
VERSION = '0.2.1'
VERSION = '0.2.2'
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