scout-gear 10.11.6 → 10.11.8

data/lib/scout/workflow/step/info.rb

@@ -30,7 +30,8 @@ class Step
   end
 
   def save_info(info = nil)
-    Persist.save(@info = info, info_file, SERIALIZER)
+    purged = Annotation.purge(@info = info)
+    Persist.save(purged, info_file, SERIALIZER)
     @info_load_time = Time.now
   end
 
@@ -82,6 +83,7 @@ class Step
 
           if start && eend
             time = eend - start
+            Log.warn "No issue time #{self.path}" if issued.nil?
             total_time = eend - issued
             if total_time - time > 1
               time_str = "#{Misc.format_seconds_short(time)} (#{Misc.format_seconds_short(total_time)})"
@@ -93,7 +95,7 @@ class Step
             message = Log.color(:time, time_str)
           end
         end
-        report_status value, message 
+        report_status value, message
       end
 
       if key == :message
@@ -136,7 +138,7 @@ class Step
   def set_info(key, value)
     merge_info(key => value)
   end
-  
+
   def report_status(status, message = nil)
     if message.nil?
       Log.info [Log.color(:status, status, true), Log.color(:task, task_name, true), Log.color(:path, path)] * " "
@@ -184,22 +186,6 @@ class Step
     ! (done? && status == :done) && (info[:pid] && Misc.pid_alive?(info[:pid]))
   end
 
-  def overriden?
-    @overriden = overriden_task || overriden_workflow || overriden_deps.any? if @overriden.nil?
-    @overriden
-  end
-
-  def overriden_deps
-    dependencies.select{|d| d.overriden? }
-  end
-
-  def recursive_overriden_deps
-    overriden_deps = dependencies.select{|d| 
-      d.overriden? 
-    }
-    (overriden_deps + overriden_deps.collect{|d| d.recursive_overriden_deps }).flatten.uniq
-  end
-
   def exception
     return nil unless info[:exception]
     begin

data/lib/scout/workflow/step/inputs.rb

@@ -3,7 +3,7 @@ class Step
     if clean_name != name
       #hash = name[clean_name.length..-1]
       #inputs_dir += hash
-      Log.medium "Saving job inputs to: #{Log.fingerprint inputs_dir}"
+      Log.medium "Saving job inputs to: #{Log.fingerprint inputs_dir} #{Log.fingerprint provided_inputs}"
       self.task.save_inputs(inputs_dir, provided_inputs)
     else
       Log.medium "Saving no input job: #{Log.fingerprint inputs_dir}"

data/lib/scout/workflow/step/progress.rb

@@ -27,9 +27,9 @@ class Step
   end
 
   def monitor_stream(stream, options = {}, &block)
-    case options[:bar] 
+    case options[:bar]
     when TrueClass
-      bar = progress_bar 
+      bar = progress_bar
     when Hash
       bar = progress_bar options[:bar]
     when Numeric

data/lib/scout/workflow/step/provenance.rb

@@ -58,10 +58,10 @@ class Step
     str = if ! (Open.remote?(path) || Open.ssh?(path)) && (Open.exists?(path) && $main_mtime && path_mtime && ($main_mtime - path_mtime) < -2)
             prov_status_msg(status.to_s) << " " << [workflow, task, path, input_str].compact * " " << " (#{Log.color(:red, "Mtime out of sync") })"
           else
-            prov_status_msg(status.to_s) << " " << [workflow, task, path, input_str].compact * " " 
+            prov_status_msg(status.to_s) << " " << [workflow, task, path, input_str].compact * " "
           end
 
-    if $inputs and $inputs.any? 
+    if $inputs and $inputs.any?
       job_inputs = Step.new(path).recursive_inputs.to_hash
       IndiferentHash.setup(job_inputs)
 
@@ -119,7 +119,7 @@ class Step
     step.dependencies.each do |dep|
       if dep.input_dependencies.any?
         dep.input_dependencies.each do |id|
-          input_name, _dep = dep.recursive_inputs.select{|f,d| 
+          input_name, _dep = dep.recursive_inputs.select{|f,d|
             d == id || (String === d && d.start_with?(id.files_dir)) || (Array === d && d.include?(id))
           }.keys.last
           if input_name
@@ -135,7 +135,7 @@ class Step
     indent = prov_indent(step, offset, input_dependencies)
     str << indent + this_step_msg if ENV["SCOUT_ORIGINAL_STACK"] == 'true'
 
-    step.dependencies.dup.tap{|l| 
+    step.dependencies.dup.tap{|l|
       l.reverse! if ENV["SCOUT_ORIGINAL_STACK"] == 'true'
     }.each do |dep|
       path = dep.path

data/lib/scout/workflow/step/status.rb

@@ -5,7 +5,7 @@ class Step
       begin
         s = Misc.abort_child pid, true
         Log.medium "Aborted pid #{path} #{s}"
-      rescue 
+      rescue
         Log.debug("Aborted job #{pid} was not killed: #{$!.message}")
       end
     else
@@ -17,35 +17,49 @@ class Step
   end
 
   def recoverable_error?
-    self.error? && ! (ScoutException === self.exception)
+    self.error? && ! (ENV['SCOUT_NO_RECOVERABLE_ERROR'].to_s.downcase == 'true') && ! (ScoutException === self.exception)
   end
 
   def newer_dependencies
+    rec_dependencies = self.rec_dependencies
+    rec_dependencies = rec_dependencies.select{|dep| Open.exists?(dep.info_file) }
+    rec_dependencies = rec_dependencies.reject{|dep| dep.error? && ! dep.recoverable_error? }
     newer = rec_dependencies.select{|dep| Path.newer?(self.path, dep.path) }
     newer += input_dependencies.select{|dep| Path.newer?(self.path, dep.path) }
     newer += rec_dependencies.collect{|dep| dep.input_dependencies }.flatten.select{|dep| Path.newer?(self.path, dep.path) }
     newer
   end
 
+  def cleaned_dependencies
+    return []
+    rec_dependencies = self.rec_dependencies
+    cleaned = rec_dependencies.select{|dep| dep.info[:status] == :cleaned }
+    cleaned += input_dependencies.select{|dep| dep.info[:status] == :cleaned }
+    cleaned += rec_dependencies.collect{|dep| dep.input_dependencies }.flatten.select{|dep| dep.info[:status] == :cleaned }
+    cleaned
+  end
+
   def updated?
     return false if self.error? && self.recoverable_error?
-    return true if (self.done? || (self.error? && ! self.recoverable_error?)) && ! ENV["SCOUT_UPDATE"]
+    return true if (self.done? || (self.error? && ! self.recoverable_error?)) && ! ENV["SCOUT_UPDATE"].to_s.downcase == 'true'
     newer = newer_dependencies
+    cleaned = cleaned_dependencies
 
     Log.low "Newer deps found for #{Log.fingerprint self}: #{Log.fingerprint newer}" if newer.any?
-    newer.empty?
+    Log.low "Cleaned deps found for #{Log.fingerprint self}: #{Log.fingerprint cleaned}" if cleaned.any?
+    newer.empty? && cleaned.empty?
   end
 
   def clean
     Log.debug "Cleaning job files: #{path}"
-    @take_stream = nil 
+    @take_stream = nil
     @result = nil
     @info = nil
     @info_load_time = nil
     @done = nil
-    Open.rm path if Open.exist_or_link?(path)
-    Open.rm tmp_path if Open.exist_or_link?(tmp_path)
-    Open.rm info_file if Open.exist_or_link?(info_file)
+    Open.rm path if Open.exist_or_link?(path) && Path.can_write?(path)
+    Open.rm tmp_path if Open.exist_or_link?(tmp_path) && Path.can_write?(tmp_path)
+    Open.rm info_file if Open.exist_or_link?(info_file) && Path.can_write?(info_file)
     Open.rm_rf files_dir if Open.exist_or_link?(files_dir)
     self
   end
@@ -59,7 +73,7 @@ class Step
     dependencies.each do |dep|
       dep.recursive_clean
     end
-    clean
+    clean if Open.exists?(self.info_file)
   end
 
   def canfail?

data/lib/scout/workflow/step.rb

@@ -13,17 +13,18 @@ require_relative 'step/inputs'
 require_relative 'step/children'
 require_relative 'step/archive'
 
-class Step 
+class Step
 
   attr_accessor :path, :inputs, :dependencies, :id, :task, :tee_copies, :non_default_inputs, :provided_inputs, :compute, :overriden_task, :overriden_workflow, :workflow, :exec_context, :overriden
-  def initialize(path = nil, inputs = nil, dependencies = nil, id = nil, non_default_inputs = nil, provided_inputs = nil, compute = nil, exec_context: nil, &task)
+  def initialize(path = nil, inputs = nil, dependencies = nil, id = nil, non_default_inputs = nil, provided_inputs = nil, compute = nil, overriden = nil, exec_context: nil, &task)
     @path = path
     @inputs = inputs
     @dependencies = dependencies
     @id = id
     @non_default_inputs = non_default_inputs
     @provided_inputs = provided_inputs
-    @compute = compute 
+    @compute = compute
+    @overriden = overriden unless overriden.nil?
     @task = task
     @mutex = Mutex.new
     @tee_copies = 1
@@ -36,12 +37,12 @@ class Step
 
   def provided_inputs
     @provided_inputs ||= begin
-                  if info_file && Open.exists?(info_file)
-                    info[:provided_inputs]
-                  else
-                    {}
-                  end
-                end
+                           if info_file && Open.exists?(info_file)
+                             info[:provided_inputs]
+                           else
+                             {}
+                           end
+                         end
   end
 
   def non_default_inputs
@@ -97,7 +98,7 @@ class Step
     return @id if @id
     return info[:clean_name] if info.include? :clean_name
     if m = name.match(/(.+?)(?:_[a-z0-9]{32})?(?:\..*)?$/)
-      return m[1] 
+      return m[1]
     end
     return name.split(".").first
   end
@@ -189,9 +190,10 @@ class Step
       end
     end
 
-
     return @result || self.load if done?
+
     prepare_dependencies
+
     begin
 
 
@@ -200,7 +202,7 @@ class Step
 
 
         reset_info :status => :setup, :issued => Time.now,
-          :pid => Process.pid, :pid_hostname => Misc.hostname, 
+          :pid => Process.pid, :pid_hostname => Misc.hostname,
           :task_name => task_name, :workflow => workflow.to_s,
           :provided_inputs => IndiferentHash.serializable(provided_inputs),
           :non_default_inputs => non_default_inputs,
@@ -313,7 +315,7 @@ class Step
   end
 
   def streaming?
-    @take_stream || IO === @result || StringIO === @result 
+    @take_stream || IO === @result || StringIO === @result
   end
 
   def stream
@@ -344,16 +346,16 @@ class Step
   end
 
   def consume_all_streams
-    threads = [] 
+    threads = []
     while @result && streaming? && stream = self.stream
       threads << Open.consume_stream(stream, true)
     end
 
     threads.compact!
 
-    threads.each do |t| 
+    threads.each do |t|
       begin
-        t.join 
+        t.join
       rescue Exception
         threads.compact.each{|t| t.raise(Aborted); t.join }
         raise $!
@@ -388,7 +390,7 @@ class Step
 
     raise self.exception if self.exception
 
-    raise "Error in job #{self.path}" if self.error? or self.aborted? 
+    raise "Error in job #{self.path}" if self.error? or self.aborted?
 
     self
   end

data/lib/scout/workflow/task/dependencies.rb

@@ -2,7 +2,7 @@ module Task
   def dependencies(id, provided_inputs, non_default_inputs = [], compute = {})
     return [] if deps.nil?
     dependencies = []
-    
+
     provided_inputs ||= {}
 
     # Helper function
@@ -66,8 +66,15 @@ module Task
 
       if provided_inputs.include?(overriden = [workflow.name, task] * "#")
         dep = provided_inputs[overriden]
-        dep = Step.new dep unless Step === dep
-        dep = dep.dup
+        dep = case dep
+              when Step
+                dep
+              when String
+                Step.new dep
+              when Symbol
+                dependencies.select{|dep| dep.task_name == dep }.last
+              end
+
         dep.type = workflow.tasks[task].type
         dep.overriden_task = task
         dep.overriden_workflow = workflow

data/lib/scout/workflow/task/info.rb

@@ -42,8 +42,8 @@ module Workflow
   def rec_input_use(task_name)
     input_use = {}
     task = self.tasks[task_name]
-    task.inputs.each do |name,_| 
-      input_use[name] ||= {} 
+    task.inputs.each do |name,_|
+      input_use[name] ||= {}
       input_use[name][self] ||= []
       input_use[name][self] << task_name
     end
@@ -69,7 +69,7 @@ module Workflow
     raise "No '#{name}' task in '#{self.name}' Workflow" if task.nil?
     id = File.join(self.name, name.to_s)
     @task_info ||= {}
-    @task_info[id] ||= begin 
+    @task_info[id] ||= begin
                          description = task.description
                          returns = task.returns
 

data/lib/scout/workflow/task/inputs.rb

@@ -1,11 +1,15 @@
 require 'scout/named_array'
 module Task
   def self.format_input(value, type, options = {})
+    return nil if value.nil?
     return value if IO === value || StringIO === value || Step === value
 
-    if String === value && ! [:path, :file, :folder, :binary, :tsv].include?(type) && ! (options &&  (options[:noload] || options[:stream] || options[:nofile] || options[:asfile]))
+    return value.to_i if type == :integer && ! value.nil?
+    return value.to_f if type == :float && ! value.nil?
+
+    if String === value && Path.is_filename?(value) && ! [:path, :file, :folder, :binary, :tsv].include?(type) && ! (options &&  (options[:noload] || options[:stream] || options[:nofile] || options[:asfile]))
       if Open.exists?(value) && ! Open.directory?(value)
-        Persist.load(value, type) 
+        Persist.load(value, type)
       else
         Persist.deserialize(value, type)
       end
@@ -13,6 +17,8 @@ module Task
       if m = type.to_s.match(/(.*)_array/)
         if Array === value
           value.collect{|v| self.format_input(v, m[1].to_sym, options) }
+        else
+          value
         end
       else
         value
@@ -96,7 +102,7 @@ module Task
       basename += "-#{digest}"
     end
     new_file = File.join(directory, 'saved_input_files', basename)
-    relative_file = File.join('.', 'saved_input_files', basename) 
+    relative_file = File.join('.', 'saved_input_files', basename)
     Open.link orig_file, new_file
     relative_file
   end
@@ -104,7 +110,7 @@ module Task
   def self.save_input(directory, name, type, value)
     input_file = File.join(directory, name.to_s)
 
-    if Path.is_filename?(value) 
+    if Path.is_filename?(value)
       if type == :path
         Open.write(input_file + ".as_path", value)
       elsif Path.step_file?(value)
@@ -114,7 +120,7 @@ module Task
         Open.write(input_file + ".as_file", relative_file)
       end
     elsif Step === value
-      Open.write(input_file + ".as_step", value.short_path)
+      Open.write(input_file + ".as_step", value.identify_path)
     elsif type == :file
       relative_file = save_file_input(value, directory)
       Persist.save(relative_file, input_file, :file)
@@ -153,8 +159,8 @@ module Task
         value.sub!(/^\./, File.dirname(filename)) if value.start_with?("./")
         value
       elsif filename.end_with?('.as_step')
-        value = Open.read(filename).strip
-        Step.load value
+        value = Path.setup Open.read(filename).strip
+        Step.load value.find
       elsif filename.end_with?('.as_path')
         value = Open.read(filename).strip
         Path.setup value
@@ -183,7 +189,7 @@ module Task
     self.recursive_inputs.each do |p|
       name, type, desc, value, options = p
       next if seen.include?(name)
-      filename = File.join(directory, name.to_s) 
+      filename = File.join(directory, name.to_s)
       value = Task.load_input_from_file(filename, type, options)
       inputs[name] = value unless value.nil?
       seen << name

data/lib/scout/workflow/task.rb

@@ -44,10 +44,23 @@ module Task
 
     memory_inputs = nil if Array === memory_inputs && memory_inputs.compact.empty?
     memory_inputs = nil if Hash === memory_inputs && memory_inputs.empty?
-    Persist.memory("Task job #{self.name}", repo: Workflow.job_cache, other: {task: self.name, id: id, provided_inputs: memory_inputs}) do
+    Persist.memory("Task job #{self.name}", repo: Workflow.job_cache, other: {workflow: self.workflow, task: self.name, id: id, provided_inputs: memory_inputs}) do
+
+      #{{{ Provided inputs and ID
       provided_inputs, id = id, nil if (provided_inputs.nil? || provided_inputs.empty?) && (Hash === id || Array === id)
       provided_inputs = {} if provided_inputs.nil?
-      IndiferentHash.setup(provided_inputs)
+      IndiferentHash.setup(provided_inputs) if Hash === provided_inputs
+
+      provided_inputs = load_inputs(provided_inputs.delete(:load_inputs)).merge(provided_inputs) if Hash === provided_inputs && provided_inputs[:load_inputs]
+
+      provided_input_names = case provided_inputs
+                             when nil
+                               []
+                             when Array
+                               inputs.collect{|name,*| name }[0..provided_inputs.length]
+                             when Hash
+                               provided_inputs.keys
+                             end
 
       jobname_input = nil
       inputs.each do |name,type,desc,default,input_options|
@@ -56,12 +69,14 @@ module Task
       end
 
       id = provided_inputs[jobname_input] if jobname_input && id.nil?
-      #id = provided_inputs[:id] if provided_inputs.include?(:id)
+      id = DEFAULT_NAME if id.nil?
+      id = Path.sanitize_filename(id, 150)
 
+      #{{{ Missing inputs
       missing_inputs = []
       self.inputs.each do |input,type,desc,val,options|
         next unless options && options[:required]
-        missing_inputs << input unless provided_inputs.include?(input)
+        missing_inputs << input unless provided_input_names.include?(input.to_s) || provided_input_names.include?(input.to_sym)
       end if self.inputs
 
       if missing_inputs.length == 1
@@ -72,25 +87,32 @@ module Task
         raise ParameterException, "Inputs #{Misc.humanize_list(missing_inputs)} are required but were not provided or are nil"
       end
 
-      provided_inputs = load_inputs(provided_inputs.delete(:load_inputs)).merge(provided_inputs) if Hash === provided_inputs && provided_inputs[:load_inputs]
-
+      #{{{ Process inputs
       job_inputs, non_default_inputs, input_digest_str = process_inputs provided_inputs, id
+      non_default_inputs.uniq!
+      NamedArray.setup(job_inputs, @inputs.collect{|i| i[0] }) if @inputs
+      step_provided_inputs = Hash === provided_inputs ? provided_inputs.slice(*non_default_inputs) : provided_inputs
 
+      #{{{ Dependencies
       compute = {}
       dependencies = dependencies(id, provided_inputs, non_default_inputs, compute)
 
-      non_default_inputs.uniq!
-
-      non_default_inputs.delete_if{|k| k.to_s.include? "#" } unless dependencies.select{|d| d.overriden? }.any?
+      #{{{ Overrides
+      override_inputs = provided_input_names.select{|k| (String === k) && k.include?("#")  }
+      overriden = override_inputs.any? && dependencies.select{|dep| dep.overrider? || dep.overriden? }.any?
 
-      id = DEFAULT_NAME if id.nil?
+      non_default_inputs.delete_if{|input| override_inputs.include? input }
+      non_default_provided_inputs = non_default_inputs & provided_input_names
+      non_default_provided_inputs.delete jobname_input if provided_inputs[jobname_input] == id
 
-      sanitized_id = Path.sanitize_filename(id, 150)
-      if non_default_inputs.any? && !(non_default_inputs == [jobname_input] && provided_inputs[jobname_input] == id)
+      #{{{ Hash and Path
+      if overriden || non_default_provided_inputs.any?
         hash = Misc.digest(:inputs => input_digest_str, :dependencies => dependencies)
-        name = [sanitized_id, hash] * "_"
+        Log.debug "ID #{self.name} #{id} - #{hash}: #{Log.fingerprint(:input_digest => input_digest_str, :non_default_inputs => non_default_inputs, :dependencies => dependencies, overriden: override_inputs)}"
+        name = [id, hash] * "_"
       else
-        name = sanitized_id
+        Log.debug "ID #{self.name} #{id} - Clean"
+        name = id
       end
 
       extension = self.extension
@@ -110,17 +132,10 @@ module Task
       end
 
       path = directory[name]
-
       path = path.set_extension(extension) if extension
 
-      if hash
-        Log.debug "ID #{self.name} #{id} - #{hash}: #{Log.fingerprint(:input_digest => input_digest_str, :non_default_inputs => non_default_inputs, :dependencies => dependencies)}"
-      else
-        Log.debug "ID #{self.name} #{id} - Clean"
-      end
-      NamedArray.setup(job_inputs, @inputs.collect{|i| i[0] }) if @inputs
       step_provided_inputs = Hash === provided_inputs ? provided_inputs.slice(*non_default_inputs) : provided_inputs
-      Step.new path.find, job_inputs, dependencies, id, non_default_inputs, step_provided_inputs, compute, &self
+      Step.new path.find, job_inputs, dependencies, id, non_default_inputs, step_provided_inputs, compute, overriden, &self
     end
   end
 

data/lib/scout/workflow/usage.rb

@@ -5,19 +5,19 @@ module Task
     str = StringIO.new
 
     if description
-      title, paragraph = description.split("\n\n")
+      title, _, paragraph = description.partition("\n\n")
       if title.length < Misc::MAX_TTY_LINE_WIDTH
         title = self.name.to_s + " - " + title
         str.puts Log.color :yellow, title
         str.puts Log.color :yellow, "-" * title.length
         if paragraph
-          str.puts "\n" << Misc.format_paragraph(paragraph) 
+          str.puts "\n" << Misc.format_paragraph(paragraph)
         end
       else
         title = self.name.to_s
         str.puts Log.color :yellow, title
         str.puts Log.color :yellow, "-" * title.length
-        str.puts "\n" << Misc.format_paragraph(description) 
+        str.puts "\n" << Misc.format_paragraph(description)
       end
     else
       title = self.name.to_s
@@ -92,7 +92,7 @@ module Task
       str.puts
       str.puts Log.color(:magenta, "Input select options")
       selects.collect{|p| p}.uniq.each do |input,options|
-        str.puts 
+        str.puts
         str.puts Log.color(:blue, input.to_s + ": ") << Misc.format_paragraph(options.collect{|o| Array === o ? o.first.to_s : o.to_s} * ", ") << "\n"
       end
     end
@@ -164,7 +164,7 @@ module Workflow
   end
 
   def _prov_tasks(tree)
-    tasks = [] 
+    tasks = []
     heap = tree.values
     heap = [tree]
     while heap.any?
@@ -199,7 +199,7 @@ module Workflow
       else
         description += ";" + task_name.to_s
       end
-      
+
       seen << [workflow, task_name]
     end
     description
@@ -212,9 +212,9 @@ module Workflow
 
     offset_str = " " * offset
 
-    lines << offset_str 
+    lines << offset_str
 
-    tree.each do |p,dtree| 
+    tree.each do |p,dtree|
       next if seen.include?(p)
       seen.push(p)
       workflow, task = p
@@ -233,7 +233,7 @@ module Workflow
       str.puts Log.color :magenta, title
       str.puts Log.color :magenta, "=" * title.length
     else
-      str.puts Log.color :magenta, self.name 
+      str.puts Log.color :magenta, self.name
       str.puts Log.color :magenta, "=" * self.name.length
     end
 
@@ -244,14 +244,14 @@ module Workflow
     elsif task.nil?
 
       if self.documentation[:description] and not self.documentation[:description].empty?
-        str.puts Misc.format_paragraph self.documentation[:description] 
+        str.puts Misc.format_paragraph self.documentation[:description]
         str.puts
       end
 
       str.puts Log.color :magenta, "## TASKS"
       if self.documentation[:task_description] and not self.documentation[:task_description].empty?
         str.puts
-        str.puts Misc.format_paragraph self.documentation[:task_description] 
+        str.puts Misc.format_paragraph self.documentation[:task_description]
       end
       str.puts
 
@@ -276,7 +276,7 @@ module Workflow
 
         prov_string = prov_string(dep_tree(name))
         str.puts Misc.format_paragraph Log.color(:blue, "->" + prov_string) if prov_string && ! prov_string.empty?
-      end 
+      end
 
     else
 
@@ -302,7 +302,7 @@ module Workflow
               offset, workflow, task_name =  m.values_at 1, 2, 3
               str.puts [offset, Log.color(:magenta, workflow), "#", Log.color(:yellow, task_name)] * ""
           else
-            str.puts Log.color :blue, line 
+            str.puts Log.color :blue, line
           end
         end
         str.puts

data/lib/scout/workflow/util.rb

@@ -18,7 +18,7 @@ module Workflow
   end
 
   def all_tasks
-    tasks.keys
+    tasks.nil? ? [] : tasks.keys
   end
 
   def self.list

data/lib/scout/workflow.rb

@@ -27,9 +27,9 @@ module Workflow
     end
 
     def workflow_dir
-      @workflow_dir || 
-        ENV["SCOUT_WORKFLOW_DIR"] || 
-        begin 
+      @workflow_dir ||
+        ENV["SCOUT_WORKFLOW_DIR"] ||
+        begin
           workflow_dir_config = Path.setup("etc/workflow_dir")
           if workflow_dir_config.exists?
             Path.setup(workflow_dir_config.read.strip)
@@ -40,9 +40,9 @@ module Workflow
     end
 
     def workflow_repo
-      @workflow_repo || 
-        ENV["SCOUT_WORKFLOW_REPO"] || 
-        begin 
+      @workflow_repo ||
+        ENV["SCOUT_WORKFLOW_REPO"] ||
+        begin
           workflow_repo_config = Path.setup("etc/workflow_repo")
           if workflow_repo_config.exists?
             workflow_repo_config.read.strip