scout-gear 10.7.4 → 10.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92262edf62404f5935bf749d3ab71d2ce39ffc7292a1b3d860fd5dc712501fcb
-  data.tar.gz: 47f69a80c0a135d3a9b3b42558e7b91e766b7781ff2360cd8344ef9c0f7ac8b9
+  metadata.gz: 60a8c5a91d83e96aaa721154fa4f7fdd63d2699c691b8c99962c6ba5561365eb
+  data.tar.gz: 4b2303f3db25c1316286e8c6edbd8d76be66ba8b851626393f0c0b5ea34aac1d
 SHA512:
-  metadata.gz: 3d532c6a4ac2bd3d0b5584761531b0364f381c317a9864b85b22c7a23bd61dbf2b31d1655f5fc7085c893c843f1b3f36a1b23fffae4c4b9dc2253352f3f5febf
-  data.tar.gz: 50e36c694239f0d74528b9156435b8769d16ae172dd87029ee741c0002b8ef3606f5088fc2c8f881d413b78f1f00f66134f06fc14129da3015648546130809c6
+  metadata.gz: 0eb9761f9cc9acab8842372de6bbe9f69413bc9d6b2c1b05ebae6c51e40ca292fbce9edce27d1c5d26a7e298273e700881bdd39f8bac3441b1e9af604c443eb0
+  data.tar.gz: cb46e73a548bca55f41e088167eff7494691a6fdd61ed17f7a06f6a1a0257679441b7d62a56e67a376943e4e0a96acd39d3a4ee5888550c1721c5d79e4f7e6a4

data/.gitmodules

@@ -1,4 +0,0 @@
-[submodule "modules/rbbt-util"]
-	path = modules/rbbt-util
-	url = https://github.com/mikisvaz/rbbt-util.git
-	branch = scout

data/.vimproject

@@ -8,6 +8,7 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
    workflow.rb
    workflow=workflow{
     exceptions.rb
+    export.rb
     definition.rb
     documentation.rb
     usage.rb
@@ -38,6 +39,7 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
      trace.rb
      orchestrator.rb
     }
+    entity.rb
    }
    work_queue.rb
    work_queue=work_queue{
@@ -122,12 +124,6 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
     enrichment.rb
     list.rb
    }
-   offsite.rb
-   offsite=offsite{
-    ssh.rb
-    sync.rb
-    step.rb
-   }
    semaphore.rb
   }
   scout-gear.rb
@@ -144,7 +140,6 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
   doc
   update
   template
-  offsite
   kb=kb{
    config
    entities
@@ -186,7 +181,6 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
   scout=scout{
    test_association.rb
    test_entity.rb
-   test_offsite.rb
    test_semaphore.rb
    test_tsv.rb
    test_workflow.rb
@@ -248,12 +242,6 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
      test_tokyocabinet.rb
     }
    }
-   offsite=offsite{
-    test_ssh.rb
-    test_step.rb
-    test_sync.rb
-    test_task.rb
-   }
   }
  }
  share=share{

data/Rakefile

@@ -12,7 +12,7 @@ Juwelier::Tasks.new do |gem|
   gem.homepage = "http://github.com/mikisvaz/scout-gear"
   gem.license = "MIT"
   gem.summary = %Q{basic gear for scouts}
-  gem.description = %Q{Temporary files, logs, path, resources, persistence, workflows, TSV, etc.}
+  gem.description = %Q{Scout gear: workflow, TSVs, persistence, entities, associations, and knowledge_bases.}
   gem.email = "mikisvaz@gmail.com"
   gem.authors = ["Miguel Vazquez"]
 
@@ -26,10 +26,7 @@ Juwelier::Tasks.new do |gem|
   gem.add_runtime_dependency 'RubyInline'
   #gem.add_runtime_dependency 'tokyocabinet'
 
-  gem.add_development_dependency "rdoc", "~> 3.12"
-  gem.add_development_dependency "bundler", "~> 1.0"
   gem.add_development_dependency "juwelier", "~> 2.1.0"
-  gem.add_development_dependency "simplecov", ">= 0"
 end
 Juwelier::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-10.7.4
+10.7.5

data/lib/scout/association/index.rb

@@ -141,7 +141,7 @@ module Association
                        new.extend Index
                        new
                      else
-                       FileUtils.mkdir_p File.dirname(reverse_filename) unless File.exist?(File.dirname(reverse_filename))
+                       Open.mkdir File.dirname(reverse_filename) unless Open.exist?(File.dirname(reverse_filename))
 
                        new = Persist.open_tokyocabinet(reverse_filename, true, serializer, TokyoCabinet::BDB)
 

data/lib/scout/entity/identifiers.rb

@@ -64,13 +64,16 @@ module Entity
       Persist.memory("Entity index #{identity_type}: #{format} (from #{source || "All"})", :persist => true, :format => format, :source => source) do
         source ||= self.respond_to?(:format)? self.format : nil
 
+        saved_exception = nil
         begin
           index = TSV.translation_index(identifier_files, source, format, :persist => true)
           raise "No index from #{ Misc.fingerprint source } to #{ Misc.fingerprint format }: #{Misc.fingerprint identifier_files}" if index.nil?
           index.unnamed = true
           index
         rescue
-          raise $! if source.nil?
+          raise saved_exception || $! if source.nil?
+          Log.debug "Retrying identifier index without specifying source"
+          saved_exception = $!
           source = nil
           retry
         end
@@ -93,7 +96,7 @@ module Entity
 
     name = default if name.nil?
 
-    self.send(:include, Entity::Identified) unless Entity::Identified === self
+    self.send(:include, Entity::Identified) unless self.include?(Entity::Identified)
 
     self.format = all_fields
     @formats ||= []

data/lib/scout/entity/property.rb

@@ -148,7 +148,7 @@ module Entity
 
     def persist(name, type = :marshal, options = {})
       options = IndiferentHash.add_defaults options, persist: true,
-        dir: File.join(Entity.entity_property_cache, self.to_s, name.to_s)
+        dir: Entity.entity_property_cache[self.to_s][name.to_s]
       @persisted_methods ||= {}
       @persisted_methods[name] = [type, options]
     end

data/lib/scout/tsv/change_id/translate.rb

@@ -40,7 +40,7 @@ module TSV
           target_file = target_files.select{|file| fields = file_fields[file]; (fields & middle_fields).any? }.collect{|file,f| file }.first
           [source_file, middle_file, target_file]
         else
-          raise "Could not traverse identifier path from #{Log.fingerprint source} to #{Log.fingerprint target} in #{Log.fingerprint file_fields}"
+          raise "Could not traverse identifier path from #{Log.fingerprint source} to #{Log.fingerprint target}. #{file_fields.empty? ? "No identifier files" : Log.fingerprint(file_fields)}"
         end
       end
     end
@@ -55,7 +55,13 @@ module TSV
     files = [files] unless Array === files
 
     files.each do |file|
-      next if Path === file && ! Open.exist?(file)
+      #next if Path === file && ! Open.exist?(file)
+      begin
+        file = file.produce if Path === file
+      rescue
+        Log.warn $!.message
+        next
+      end
       file = file.find if Path === file
       file_fields[file] = all_fields(file)
     end

data/lib/scout/tsv/open.rb

@@ -151,6 +151,8 @@ module Open
                   res = block.call(line)
                   callback.call res if callback
                 end
+                obj.close
+                obj.join if obj.respond_to? :join
               else
                 Log.low "Traverse stream with parser #{Log.fingerprint obj}"
                 parser = options[:sep].nil? ? TSV::Parser.new(obj) : TSV::Parser.new(obj, sep: options[:sep])

data/lib/scout/workflow/entity.rb

@@ -0,0 +1,99 @@
+require 'scout/entity'
+require 'scout/workflow'
+
+module EntityWorkflow
+
+  def self.extended(base)
+    base.extend Workflow
+    base.extend Entity
+
+    base.instance_variable_set(:@annotation_inputs, IndiferentHash.setup({})) unless base.instance_variables.include?(:@annotation_inputs)
+    class << base
+      def annotation_input(name, type=nil, desc=nil, default=nil, options = {})
+        annotation name
+        annotation_inputs = self.instance_variable_get("@annotation_inputs")
+        annotation_inputs[name] = [type, desc, default, options]
+      end
+    end
+
+    base.helper :entity do
+      base.setup(clean_name.dup, inputs.to_hash)
+    end
+
+    base.helper :entity_list do 
+      list = inputs.last
+      list = list.load if Step === list
+      base.setup(list, inputs.to_hash)
+    end
+
+    base.property job: :both  do |task_name,options={}|
+      if Array === self && AnnotatedArray === self
+        base.job(task_name, "Default", options.merge(list: self))
+      else
+        base.job(task_name, self, options)
+      end
+    end
+  end
+
+  def property_task(task_name, property_type=:single, *args, &block)
+    task_name, result_type = task_name.keys.first, task_name.values.first if Hash === task_name
+
+    annotation_inputs = self.instance_variable_get("@annotation_inputs")
+    self.annotations.each do |annotation|
+      if annotation_inputs[annotation]
+        input annotation, *annotation_inputs[annotation]
+      else
+        input annotation
+      end
+    end
+    case property_type
+    when :single, :single2array
+      input :entity, :string, "#{self.to_s} identifier", nil, jobname: true
+      task(task_name => result_type, &block)
+    when :both
+      input :entity, :string, "#{self.to_s} identifier", nil, jobname: true
+      input :list, :array, "#{self.to_s} identifier list"
+      task(task_name => result_type, &block)
+    else
+      input :list, :array, "#{self.to_s} identifier list"
+      task(task_name => result_type, &block)
+    end
+
+    property task_name => property_type do |*args|
+      job = job(task_name, *args)
+      Array === job ? job.collect(&:run) : job.run
+    end
+  end
+
+  def entity_task(task_name, *args, &block)
+    property_task(task_name, :single, *args, &block)
+  end
+
+  def list_task(task_name, *args, &block)
+    property_task(task_name, :array, *args, &block)
+  end
+
+  def multiple_task(task_name, *args, &block)
+    property_task(task_name, :multiple, *args, &block)
+  end
+
+  def property_task_alias(task_name, property_type=:single, *args)
+    task_alias task_name, *args
+    property task_name => property_type do |*args|
+      job = job(task_name, *args)
+      Array === job ? job.collect(&:run) : job.run
+    end
+  end
+
+  def entity_task_alias(task_name, *args)
+    property_task_alias(task_name, :single, *args)
+  end
+
+  def list_task_alias(task_name, *args)
+    property_task_alias(task_name, :array, *args)
+  end
+
+  def multiple_task_alias(task_name, *args)
+    property_task_alias(task_name, :multiple, *args)
+  end
+end

data/lib/scout/workflow/export.rb

@@ -0,0 +1,66 @@
+module Workflow
+
+  annotation :asynchronous_exports, :synchronous_exports, :exec_exports, :stream_exports
+
+  def asynchronous_exports
+    @asynchronous_exports ||= []
+  end
+
+  def synchronous_exports
+    @synchronous_exports ||= []
+  end
+
+  def exec_exports
+    @exec_exports ||= []
+  end
+
+  def stream_exports
+    @exec_exports ||= []
+  end
+
+
+  def all_exports
+    asynchronous_exports + synchronous_exports + exec_exports + stream_exports
+  end
+
+  alias task_exports all_exports
+
+  def unexport(*names)
+    names = names.collect{|n| n.to_s} + names.collect{|n| n.to_sym}
+    names.uniq!
+    exec_exports.replace exec_exports - names if exec_exports
+    synchronous_exports.replace synchronous_exports - names if synchronous_exports
+    asynchronous_exports.replace asynchronous_exports - names if asynchronous_exports
+    stream_exports.replace stream_exports - names if stream_exports
+  end
+  
+  def export_exec(*names)
+    unexport *names
+    exec_exports.concat names
+    exec_exports.uniq!
+    exec_exports
+  end
+
+  def export_synchronous(*names)
+    unexport *names
+    synchronous_exports.concat names
+    synchronous_exports.uniq!
+    synchronous_exports
+  end
+
+  def export_asynchronous(*names)
+    unexport *names
+    asynchronous_exports.concat names
+    asynchronous_exports.uniq!
+    asynchronous_exports
+  end
+
+  def export_stream(*names)
+    unexport *names
+    stream_exports.concat names
+    stream_exports.uniq!
+    stream_exports
+  end
+
+  alias export export_asynchronous
+end

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

@@ -21,13 +21,13 @@ class Step
   end
 
   def files
-    Dir.glob(File.join(files_dir, '**', '*')).reject{|path| File.directory? path }.collect do |path| 
-      Misc.path_relative_to(files_dir, path) 
+    files_dir.glob("**/*").reject{|path| File.directory? path }.collect do |path|
+      Misc.path_relative_to(files_dir, path)
     end
   end
 
   def bundle_files
-    [path, info_file, Dir.glob(File.join(files_dir,"**/*"))].flatten.select{|f| Open.exist?(f) }
+    [path, info_file, files_dir.glob("**/*")].flatten.select{|f| Open.exist?(f) }
   end
 
   def copy_linked_files_dir

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

@@ -74,6 +74,11 @@ class Step
           issued = info[:issued]
           start = info[:start]
           eend = new_info[:end]
+
+          start = Time.parse start if String === start
+          eend = Time.parse eend if String === eend
+          issued = Time.parse issued if String === issued
+
           if start && eend
             time = eend - start
             total_time = eend - issued

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

@@ -108,12 +108,11 @@ class Step
     status = info[:status] || :missing
     status = status.to_sym if String === status
     status = :noinfo if status == :missing && Open.exist?(path)
-    status = "remote" if Open.remote?(path) || Open.ssh?(path)
+    status = :remote if Open.remote?(path) || Open.ssh?(path)
     name = info[:name] || File.basename(path)
     status = :unsync if status == :done and not Open.exist?(path)
     status = :notfound if status == :noinfo and not Open.exist?(path)
 
-
     this_step_msg = prov_report_msg(status, name, path, info, input)
 
     input_dependencies ||= {}

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

@@ -42,6 +42,7 @@ class Step
     @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)

data/lib/scout/workflow/step.rb

@@ -75,19 +75,21 @@ class Step
   def clean_name
     return @id if @id
     return info[:clean_name] if info.include? :clean_name
-    if m = name.match(/(.*?)(?:_[a-z0-9]{32})?(?:\..*)?/)
+    if m = name.match(/(.+?)(?:_[a-z0-9]{32})?(?:\..*)?$/)
       return m[1] 
     end
     return name.split(".").first
   end
 
   def task_name
+    return @task_name if @task_name
     @task_name ||= @task.name if @task.respond_to?(:name)
     @task_name ||= info[:task_name] if Open.exist?(info_file)
     @task_name ||= path.split("/")[-2]
   end
 
   def workflow
+    return @workflow if @workflow
     @workflow ||= @task.workflow if Task === @task
     @workflow ||= info[:workflow] if info_file && Open.exist?(info_file)
     @workflow ||= path.split("/")[-3]
@@ -181,7 +183,7 @@ class Step
         log :start
         @exec_result = exec
 
-        if @exec_result.nil? && File.exist?(self.tmp_path) && ! File.exist?(self.path)
+        if @exec_result.nil? && Open.exist?(self.tmp_path) && ! Open.exist?(self.path)
           Open.mv self.tmp_path, self.path
         else
           @exec_result = @exec_result.stream if @exec_result.respond_to?(:stream) && ! (TSV === @exec_result)
@@ -263,7 +265,7 @@ class Step
   end
 
   def done?
-    Open.exist?(path)
+    @done ||= Open.exist?(path)
   end
 
   def streaming?

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

@@ -186,7 +186,8 @@ module Task
       seen << name
     end
 
-    Dir.glob(File.join(directory, "*#*")).each do |file|
+    directory = Path.setup(directory.dup) unless Path === directory
+    directory.glob("*#*").each do |file|
       override_dep, _, extension = File.basename(file).partition(".")
 
       inputs[override_dep] = Task.load_input_from_file(file, :file)

data/lib/scout/workflow.rb

@@ -7,6 +7,8 @@ require_relative 'workflow/usage'
 require_relative 'workflow/deployment'
 require_relative 'workflow/exceptions'
 require_relative 'workflow/path'
+require_relative 'workflow/entity'
+require_relative 'workflow/export'
 
 require 'scout/resource'
 require 'scout/resource/scout'
@@ -50,7 +52,7 @@ module Workflow
 
   end
 
-  attr_accessor :libdir
+  attr_accessor :libdir, :knowledge_base
 
   def self.extended(base)
     self.workflows << base
@@ -70,7 +72,7 @@ module Workflow
 
   def self.install_workflow(workflow, base_repo_url = nil)
     case
-    when File.exist?(workflow)
+    when Open.exist?(workflow)
       update_workflow_dir(workflow)
     else
       Misc.in_dir(self.workflow_dir) do

data/lib/scout-gear.rb

@@ -1,5 +1,9 @@
 require 'scout-essentials'
 require_relative 'scout/tsv'
-require_relative 'scout/offsite'
 
 Path.path_maps[:scout_gear] = File.join(Path.caller_lib_dir(__FILE__), "{TOPLEVEL}/{SUBPATH}")
+
+Persist.cache_dir     = Scout.var.cache.persistence
+TmpFile.tmpdir        = Scout.tmp.find :user
+Resource.default_resource = Scout
+

data/scout-gear.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-gear 10.7.4 ruby lib
+# stub: scout-gear 10.7.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-gear".freeze
-  s.version = "10.7.4".freeze
+  s.version = "10.7.5".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Miguel Vazquez".freeze]
-  s.date = "2025-03-10"
-  s.description = "Temporary files, logs, path, resources, persistence, workflows, TSV, etc.".freeze
+  s.date = "2025-03-19"
+  s.description = "Scout gear: workflow, TSVs, persistence, entities, associations, and knowledge_bases.".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.executables = ["scout".freeze]
   s.extra_rdoc_files = [
@@ -51,11 +51,6 @@ Gem::Specification.new do |s|
     "lib/scout/knowledge_base/query.rb",
     "lib/scout/knowledge_base/registry.rb",
     "lib/scout/knowledge_base/traverse.rb",
-    "lib/scout/offsite.rb",
-    "lib/scout/offsite/exceptions.rb",
-    "lib/scout/offsite/ssh.rb",
-    "lib/scout/offsite/step.rb",
-    "lib/scout/offsite/sync.rb",
     "lib/scout/persist/engine.rb",
     "lib/scout/persist/engine/fix_width_table.rb",
     "lib/scout/persist/engine/packed_index.rb",
@@ -105,7 +100,9 @@ Gem::Specification.new do |s|
     "lib/scout/workflow/deployment/orchestrator.rb",
     "lib/scout/workflow/deployment/trace.rb",
     "lib/scout/workflow/documentation.rb",
+    "lib/scout/workflow/entity.rb",
     "lib/scout/workflow/exceptions.rb",
+    "lib/scout/workflow/export.rb",
     "lib/scout/workflow/path.rb",
     "lib/scout/workflow/step.rb",
     "lib/scout/workflow/step/archive.rb",
@@ -141,7 +138,6 @@ Gem::Specification.new do |s|
     "scout_commands/kb/show",
     "scout_commands/kb/traverse",
     "scout_commands/log",
-    "scout_commands/offsite",
     "scout_commands/rbbt",
     "scout_commands/resource/produce",
     "scout_commands/template",
@@ -176,10 +172,6 @@ Gem::Specification.new do |s|
     "test/scout/knowledge_base/test_query.rb",
     "test/scout/knowledge_base/test_registry.rb",
     "test/scout/knowledge_base/test_traverse.rb",
-    "test/scout/offsite/test_ssh.rb",
-    "test/scout/offsite/test_step.rb",
-    "test/scout/offsite/test_sync.rb",
-    "test/scout/offsite/test_task.rb",
     "test/scout/persist/engine/test_fix_width_table.rb",
     "test/scout/persist/engine/test_packed_index.rb",
     "test/scout/persist/engine/test_sharder.rb",
@@ -197,7 +189,6 @@ Gem::Specification.new do |s|
     "test/scout/test_association.rb",
     "test/scout/test_entity.rb",
     "test/scout/test_knowledge_base.rb",
-    "test/scout/test_offsite.rb",
     "test/scout/test_semaphore.rb",
     "test/scout/test_tsv.rb",
     "test/scout/test_work_queue.rb",
@@ -240,6 +231,7 @@ Gem::Specification.new do |s|
     "test/scout/workflow/task/test_inputs.rb",
     "test/scout/workflow/test_definition.rb",
     "test/scout/workflow/test_documentation.rb",
+    "test/scout/workflow/test_entity.rb",
     "test/scout/workflow/test_path.rb",
     "test/scout/workflow/test_step.rb",
     "test/scout/workflow/test_task.rb",
@@ -260,9 +252,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<net-ssh>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<matrix>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<RubyInline>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12".freeze])
-  s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0".freeze])
   s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0".freeze])
-  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
 end
 

data/test/scout/workflow/task/test_dependencies.rb

@@ -120,7 +120,7 @@ class TestTaskDependencies < Test::Unit::TestCase
     job = wf.job(:my_sum, :input1 => 2, :input2 => 3)
     assert_equal 5, job.run
 
-    TmpFile.with_file(4) do |file|
+    TmpFile.with_file("4") do |file|
       job = wf.job(:my_sum, :input1 => 2, :input2 => 3, "TaskInputs#step2"=> file)
       assert_equal 6, job.run
       assert_not_equal Task::DEFAULT_NAME, job.name
@@ -238,7 +238,7 @@ class TestTaskDependencies < Test::Unit::TestCase
       input :input1, :string
       task :step1 => :string do |i| i end
 
-      dep :step1, :input1 => 1  do |id,options|
+      dep :step1, :input1 => "1"  do |id,options|
         {:inputs => options}
       end
       task :step2 => :string do |i| step(:step1).load end
@@ -271,7 +271,7 @@ class TestTaskDependencies < Test::Unit::TestCase
       input :input1, :string
       task :step1 => :string do |i| i end
 
-      dep :step1, :input1 => 1  do |id,options|
+      dep :step1, :input1 => "1"  do |id,options|
         [{:inputs => options}]
       end
       input :input2, :string
@@ -289,7 +289,7 @@ class TestTaskDependencies < Test::Unit::TestCase
       input :input1, :string
       task :step1 => :string do |i| i end
 
-      dep :step1, :input1 => 1
+      dep :step1, :input1 => "1"
       input :input2, :string
       task :step2 => :string do |i| step(:step1).load end
     end
@@ -304,9 +304,9 @@ class TestTaskDependencies < Test::Unit::TestCase
     wf = Workflow.annonymous_workflow "TaskInputs" do
       input :input1, :integer, "", 1
       input :input2, :integer, "", 0
-      task :step1 => :string do |i1,i2| i1 + i2 end
+      task :step1 => :string do |i1,i2| (i1 + i2).to_s end
 
-      dep :step1, :input2 => 1
+      dep :step1, :input2 => "1"
       task :step2 => :string do |i| step(:step1).load end
 
       dep :step2
@@ -334,7 +334,7 @@ class TestTaskDependencies < Test::Unit::TestCase
         if i1 < 0
           raise ScoutException
         else
-          i1
+          i1.to_s
         end
       end
 

data/test/scout/workflow/test_definition.rb

@@ -64,7 +64,7 @@ class TestWorkflowDefinition < Test::Unit::TestCase
     refute Open.exist?(dep_path)
     Scout::Config::CACHE.replace old_cache
     assert_include job.archived_info, dep_path
-    assert_equal :done, job.archived_info[dep_path][:status]
+    assert_equal :done, job.archived_info[dep_path][:status].to_sym
   end
 
   def test_task_alias_remove_dep_partial
@@ -95,7 +95,7 @@ class TestWorkflowDefinition < Test::Unit::TestCase
     assert call_name.done?
     Scout::Config::CACHE.replace old_cache
     assert_include job.archived_info, call_name.path
-    assert_equal :done, job.archived_info[call_name.path][:status]
+    assert_equal :done, job.archived_info[call_name.path][:status].to_sym
   end
 end