rbbt-util 6.0.3 → 6.0.5

data/lib/rbbt/knowledge_base.rb

@@ -1,35 +1,38 @@
-require 'rbbt/annotations'
-require 'rbbt/association'
-require 'rbbt/association/item'
-require 'rbbt/knowledge_base/entity'
-require 'rbbt/knowledge_base/query'
-require 'rbbt/knowledge_base/syndicate'
+require_relative 'refactor'
+Rbbt.require_instead 'scout/knowledge_base'
 
-class KnowledgeBase
-
-  attr_accessor :namespace, :dir, :databases, :indices, :registry, :format, :entity_options
-  def initialize(dir, namespace = nil)
-    @dir = Path.setup(dir.dup)
-
-    @namespace = namespace
-    @format = IndiferentHash.setup({})
-
-    @registry ||= IndiferentHash.setup({})
-    @entity_options = IndiferentHash.setup({})
-
-    @indices = IndiferentHash.setup({})
-    @databases = IndiferentHash.setup({})
-    @identifiers = IndiferentHash.setup({})
-    @fields = {}
-    @descriptions = {}
-    @databases = {}
-  end
-
-  def self.load(dir)
-    KnowledgeBase.new dir
-  end
-
-  def setup(name, matches, reverse = false)
-    AssociationItem.setup matches, self, name, reverse
-  end
-end
+#require 'rbbt/annotations'
+#require 'rbbt/association'
+#require 'rbbt/association/item'
+#require 'rbbt/knowledge_base/entity'
+#require 'rbbt/knowledge_base/query'
+#require 'rbbt/knowledge_base/syndicate'
+#
+#class KnowledgeBase
+#
+#  attr_accessor :namespace, :dir, :databases, :indices, :registry, :format, :entity_options
+#  def initialize(dir, namespace = nil)
+#    @dir = Path.setup(dir.dup)
+#
+#    @namespace = namespace
+#    @format = IndiferentHash.setup({})
+#
+#    @registry ||= IndiferentHash.setup({})
+#    @entity_options = IndiferentHash.setup({})
+#
+#    @indices = IndiferentHash.setup({})
+#    @databases = IndiferentHash.setup({})
+#    @identifiers = IndiferentHash.setup({})
+#    @fields = {}
+#    @descriptions = {}
+#    @databases = {}
+#  end
+#
+#  def self.load(dir)
+#    KnowledgeBase.new dir
+#  end
+#
+#  def setup(name, matches, reverse = false)
+#    AssociationItem.setup matches, self, name, reverse
+#  end
+#end

data/lib/rbbt/tsv/excel.rb

@@ -1,5 +1,5 @@
-require_relative '../refactor'
 Rbbt.require_instead 'scout/tsv'
+require_relative '../refactor'
 require 'spreadsheet'
 require 'rubyXL'
 

data/lib/rbbt/util/filecache.rb

@@ -12,7 +12,7 @@ module FileCache
 
   def self.cachedir=(cachedir)
     CACHEDIR.replace cachedir
-    FileUtils.mkdir_p CACHEDIR unless File.exist? CACHEDIR
+    Open.mkdir CACHEDIR unless Open.exist? CACHEDIR
   end
 
   def self.cachedir

data/lib/rbbt/util/migrate.rb

@@ -2,16 +2,16 @@ module Rbbt
 
   def self.migrate_source_paths(path, resource = Rbbt, source = nil)
     if source
-      lpath, *paths = Misc.ssh_run(source, <<-EOF).split("\n")
+      lpath, *paths = SSHLine.ruby(source, <<-EOF).split("\n")
 require 'rbbt-util'
 path = "#{path}"
 if Open.exists?(path)
-  path = #{resource.to_s}.identify(path)
+  path = Path.setup(#{resource.to_s}.identify(path))
 else
   path = Path.setup(path)
 end
 puts path
-puts path.glob_all.collect{|p| File.directory?(p) ? p + "/" : p } * "\n"
+puts path.find_all.collect{|p| File.directory?(p) ? p + "/" : p } * "\n"
       EOF
 
       [path, paths.collect{|p| [source, p] * ":"}, lpath]
@@ -36,7 +36,7 @@ puts path.glob_all.collect{|p| File.directory?(p) ? p + "/" : p } * "\n"
 
   def self.migrate_target_path(path, search_path = 'user', resource = Rbbt, target = nil)
     if target
-      Misc.ssh_run(target, <<-EOF).split("\n").first
+      SSHLine.ruby(target, <<-EOF).split("\n").first
 require 'rbbt-util'
 path = "#{path}"
 resource = #{resource.to_s}

data/lib/rbbt/util/misc/system.rb

@@ -1,90 +1,92 @@
-module Misc
-
-  def self.hostname
-    @hostanem ||= `hostname`.strip
-  end
-
-  def self.pid_exists?(pid)
-    return false if pid.nil?
-    begin
-      Process.getpgid(pid.to_i)
-      true
-    rescue Errno::ESRCH
-      false
-    end
-  end
-
-  def self.env_add(var, value, sep = ":", prepend = true)
-    ENV[var] ||= ""
-    return if ENV[var] =~ /(#{sep}|^)#{Regexp.quote value}(#{sep}|$)/
-      if prepend
-        ENV[var] = value + sep + ENV[var]
-      else
-        ENV[var] += sep + ENV[var]
-      end
-  end
-
-  def self.with_env(var, value, &block)
-    var = var.to_s
-    value = value.to_s
-    current = ENV[var]
-    begin
-      ENV[var] = value
-      yield
-    ensure
-      ENV[var] = current
-    end
-  end
-
-  def self.common_path(dir, file)
-    file = File.expand_path file
-    dir = File.expand_path dir
-
-    return true if file == dir
-    while File.dirname(file) != file
-      file = File.dirname(file)
-      return true if file == dir
-    end
-
-    return false
-  end
-
-
-  def self.relative_link(source, target_dir)
-    path = "."
-    current = target_dir
-    while ! Misc.common_path current, source
-      current = File.dirname(current)
-      path = File.join(path, '..')
-      return nil if current == "/"
-    end
-
-    File.join(path, Misc.path_relative_to(current, source))
-  end
-
-  # WARN: probably not thread safe...
-  def self.in_dir(dir)
-    old_pwd = FileUtils.pwd
-    res = nil
-    begin
-      FileUtils.mkdir_p dir unless File.exist?(dir)
-      FileUtils.cd dir
-      res = yield
-    ensure
-      FileUtils.cd old_pwd
-    end
-    res
-  end
-
-  def self.is_filename?(string, need_to_exists = true)
-    return false if string.nil?
-    return true if defined? Path and Path === string
-    return true if string.respond_to? :exists
-    return true if String === string and ! string.include?("\n") and string.split("/").select{|p| p.length > 265}.empty? and (! need_to_exists || File.exist?(string))
-    return false
-  end
-
-  class << self
-    alias filename? is_filename?
-  end
-end
+require_relative 'refactor'
+Rbbt.require_instead 'scout/misc/format'
+#module Misc
+#
+#  def self.hostname
+#    @hostanem ||= `hostname`.strip
+#  end
+#
+#  def self.pid_exists?(pid)
+#    return false if pid.nil?
+#    begin
+#      Process.getpgid(pid.to_i)
+#      true
+#    rescue Errno::ESRCH
+#      false
+#    end
+#  end
+#
+#  def self.env_add(var, value, sep = ":", prepend = true)
+#    ENV[var] ||= ""
+#    return if ENV[var] =~ /(#{sep}|^)#{Regexp.quote value}(#{sep}|$)/
+#      if prepend
+#        ENV[var] = value + sep + ENV[var]
+#      else
+#        ENV[var] += sep + ENV[var]
+#      end
+#  end
+#
+#  def self.with_env(var, value, &block)
+#    var = var.to_s
+#    value = value.to_s
+#    current = ENV[var]
+#    begin
+#      ENV[var] = value
+#      yield
+#    ensure
+#      ENV[var] = current
+#    end
+#  end
+#
+#  def self.common_path(dir, file)
+#    file = File.expand_path file
+#    dir = File.expand_path dir
+#
+#    return true if file == dir
+#    while File.dirname(file) != file
+#      file = File.dirname(file)
+#      return true if file == dir
+#    end
+#
+#    return false
+#  end
+#
+#
+#  def self.relative_link(source, target_dir)
+#    path = "."
+#    current = target_dir
+#    while ! Misc.common_path current, source
+#      current = File.dirname(current)
+#      path = File.join(path, '..')
+#      return nil if current == "/"
+#    end
+#
+#    File.join(path, Misc.path_relative_to(current, source))
+#  end
+#
+#  # WARN: probably not thread safe...
+#  def self.in_dir(dir)
+#    old_pwd = FileUtils.pwd
+#    res = nil
+#    begin
+#      FileUtils.mkdir_p dir unless File.exist?(dir)
+#      FileUtils.cd dir
+#      res = yield
+#    ensure
+#      FileUtils.cd old_pwd
+#    end
+#    res
+#  end
+#
+#  def self.is_filename?(string, need_to_exists = true)
+#    return false if string.nil?
+#    return true if defined? Path and Path === string
+#    return true if string.respond_to? :exists
+#    return true if String === string and ! string.include?("\n") and string.split("/").select{|p| p.length > 265}.empty? and (! need_to_exists || File.exist?(string))
+#    return false
+#  end
+#
+#  class << self
+#    alias filename? is_filename?
+#  end
+#end

data/lib/rbbt/workflow/refactor/export.rb

@@ -1,66 +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
+#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/rbbt/workflow/refactor/recursive.rb

@@ -1,64 +1,64 @@
-module Workflow
-  def rec_inputs(task_name)
-    tasks[task_name].recursive_inputs.collect{|name, _| name }
-  end
-
-  def rec_input_types(task_name)
-    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
-      name, type, desc, default, options = l
-      acc.merge!(name => type) unless acc.include?(name)
-      acc
-    end
-  end
-
-
-  def rec_input_descriptions(task_name)
-    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
-      name, type, desc, default, options = l
-      acc.merge!(name => desc)  unless desc.nil? || acc.include?(name)
-      acc
-    end
-  end
-
-  def rec_input_defaults(task_name)
-    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
-      name, type, desc, default, options = l
-      acc.merge!(name => default)  unless default.nil? || acc.include?(name)
-      acc
-    end
-  end
-
-  def rec_input_options(task_name)
-    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
-      name, type, desc, default, options = l
-      acc.merge!(name => options) unless options.nil? unless acc.include?(name)
-      acc
-    end
-  end
-
-
-  def rec_input_use(task_name)
-    input_use = {}
-    task = self.tasks[task_name]
-    task.inputs.each do |name,_| 
-      input_use[name] ||= {} 
-      input_use[name][self] ||= []
-      input_use[name][self] << task_name
-    end
-
-    task.deps.inject(input_use) do |acc,p|
-      workflow, task_name = p
-      next if task_name.nil?
-      workflow.rec_input_use(task_name).each do |name,uses|
-        acc[name] ||= {}
-        uses.each do |workflow, task_names|
-          acc[name][workflow] ||= []
-          acc[name][workflow].concat(task_names)
-        end
-      end
-      acc
-    end if task.deps
-
-    input_use
-  end
-end
+#module Workflow
+#  def rec_inputs(task_name)
+#    tasks[task_name].recursive_inputs.collect{|name, _| name }
+#  end
+#
+#  def rec_input_types(task_name)
+#    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
+#      name, type, desc, default, options = l
+#      acc.merge!(name => type) unless acc.include?(name)
+#      acc
+#    end
+#  end
+#
+#
+#  def rec_input_descriptions(task_name)
+#    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
+#      name, type, desc, default, options = l
+#      acc.merge!(name => desc)  unless desc.nil? || acc.include?(name)
+#      acc
+#    end
+#  end
+#
+#  def rec_input_defaults(task_name)
+#    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
+#      name, type, desc, default, options = l
+#      acc.merge!(name => default)  unless default.nil? || acc.include?(name)
+#      acc
+#    end
+#  end
+#
+#  def rec_input_options(task_name)
+#    tasks[task_name].recursive_inputs.inject({}) do |acc,l|
+#      name, type, desc, default, options = l
+#      acc.merge!(name => options) unless options.nil? unless acc.include?(name)
+#      acc
+#    end
+#  end
+#
+#
+#  def rec_input_use(task_name)
+#    input_use = {}
+#    task = self.tasks[task_name]
+#    task.inputs.each do |name,_| 
+#      input_use[name] ||= {} 
+#      input_use[name][self] ||= []
+#      input_use[name][self] << task_name
+#    end
+#
+#    task.deps.inject(input_use) do |acc,p|
+#      workflow, task_name = p
+#      next if task_name.nil?
+#      workflow.rec_input_use(task_name).each do |name,uses|
+#        acc[name] ||= {}
+#        uses.each do |workflow, task_names|
+#          acc[name][workflow] ||= []
+#          acc[name][workflow].concat(task_names)
+#        end
+#      end
+#      acc
+#    end if task.deps
+#
+#    input_use
+#  end
+#end