rbbt-util 5.37.14 → 5.37.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71e57b8333e2679b626a2e43ce4e048e41f4bc3a7b01a1de46802bc17fed488
-  data.tar.gz: 8d021811841d4d5d055ed24b50e4a3b824937d196b3cc3bbb7fb85cca02de0ba
+  metadata.gz: 565fc431e80f7167a95a8ad2c3499207c1422dacfe7ce1cd4cd2c1a4f0bad5c4
+  data.tar.gz: 34b393012cd4d58bcb9917cb2c45f8e0f23cefca73139647454b6affcb80cf57
 SHA512:
-  metadata.gz: 9edc9fe0972e2fee8cbec30daa72f837f8c08eae53c89a75602d3fac854fd03a75e462e43147cff48575c57aaea54120e9e3daf5c1f77253de89371ffbb08cce
-  data.tar.gz: fa22567041fdb11c9c05410f68775629166a5c5ab7fa6435ee7922eccc77e69d66f8a35d07b370dffbb21db8279835aef775a025c661cdc9e397a4ab95603513
+  metadata.gz: 854c7a84a92a654a987f5d1274dabd6d7564108d8a200eeb377321aa02361264d979f42f8e91350be2ed0074bd0f153b6dd66d7ea5f4597edca5b68edf2d8c0a
+  data.tar.gz: 34c765a22fed51dfaf873a0abcd0338f2a9ab15ed09bca0ac445075261ea040002e042312e62951c951bfc48d08162175cf697f9890e5b1a0c3ac58f2b0a03d0

data/lib/rbbt/resource/path.rb

@@ -71,7 +71,7 @@ module Path
 
   def glob(pattern = '*')
     if self.include? "*"
-      self.glob_all
+      self.glob_all pattern
     else
       return [] unless self.exists? 
       found = self.find
@@ -165,6 +165,10 @@ module Path
       return self
     end
 
+    if where == :all || where == 'all'
+      return find_all(caller_lib, paths)
+    end
+
     @path ||= {}
     rsearch_paths = (resource and resource.respond_to?(:search_paths)) ? resource.search_paths : nil 
     key = [where, caller_lib, rsearch_paths, paths].inspect

data/lib/rbbt/resource/util.rb

@@ -48,6 +48,8 @@ module Resource
   def set_software_env(software_dir = self.root.software)
     software_dir.opt.find_all.collect{|d| d.annotate(File.dirname(d)) }.reverse.each do |software_dir|
       next unless software_dir.exists?
+      Log.medium "Preparing software env at #{software_dir}"
+
       software_dir = File.expand_path(software_dir)
       opt_dir = File.join(software_dir, 'opt')
       bin_dir = File.join(opt_dir, 'bin')

data/lib/rbbt/util/simpleopt/setup.rb

@@ -3,6 +3,10 @@ require 'rbbt/util/simpleopt/get'
 require 'rbbt/util/simpleopt/doc'
 module SOPT
 
+  class << self
+    attr_accessor :original_argv
+  end
+
   def self.setup(str)
     parts = str.split(/\n\n+/)
 
@@ -24,6 +28,7 @@ module SOPT
     SOPT.description = description.strip if description
     SOPT.parse options  if options
 
+    SOPT.original_argv = ARGV.dup
     SOPT.consume
   end
 end

data/lib/rbbt/util/ssh.rb

@@ -0,0 +1,25 @@
+module RbbtSSH
+
+  def self.ssh(server, argv = nil, options = {})
+    server = server.sub(%r(^ssh:(//)?), '')
+
+    argv = [] if argv.nil?
+    argv = [argv] unless Array === argv
+
+    options = Misc.add_defaults options, :add_option_dashes => true
+
+    cmd_sections = [server]
+    cmd_sections << argv * " "
+    cmd_sections << CMD.process_cmd_options(options)
+
+    cmd = cmd_sections.compact * " "
+
+    CMD.cmd(:ssh, cmd, :pipe => true)
+  end
+
+  def self.command(server, command, argv = [], options = nil)
+    ssh(server, [command] + argv, options)
+  end
+
+end
+

data/lib/rbbt/workflow/step/accessor.rb

@@ -56,7 +56,16 @@ class Step
   end
 
   def self.info_file(path)
-    path.nil? ? nil : path + '.info'
+    return nil if path.nil?
+    info_file = path + '.info'
+    return info_file if Open.exist?(info_file)
+
+    if path.end_with?('.gz')
+      info_file_nogz = path.sub(/\.gz$/,'') + '.info'
+      return info_file_nogz if Open.exists?(info_file_nogz)
+    end
+
+    info_file
   end
 
   def self.tmp_path(path)

data/lib/rbbt/workflow/usage.rb

@@ -201,7 +201,7 @@ module Workflow
         description = description.split("\n\n").first
 
         next if abridge && ! final.include?(name)
-        puts Misc.format_definition_list_item(name.to_s, description, Log.terminal_width, 20, :yellow)
+        puts Misc.format_definition_list_item(name.to_s, description, Log.tty_size || 80, 20, :yellow)
 
         prov_string = prov_string(dep_tree(name))
         puts Misc.format_paragraph Log.color(:blue, "-> " + prov_string) if prov_string && ! prov_string.empty?
@@ -253,7 +253,7 @@ module Workflow
               puts Misc.format_definition_list_item(input, head, 1000, -1, :blue).gsub(/\n\s*\n/,"\n") 
               puts '...' if lines.length > 6
             else
-              puts Misc.format_definition_list_item(input, file.read, Log.terminal_width, 20, :blue)
+              puts Misc.format_definition_list_item(input, file.read, Log.tty_size, 20, :blue)
             end
           end
           puts

data/share/rbbt_commands/resource/find

@@ -1,20 +1,39 @@
 #!/usr/bin/env ruby
 
 require 'rbbt-util'
+require 'rbbt/util/simpleopt'
 require 'rbbt/resource'
 require 'rbbt/workflow'
+require 'rbbt/util/ssh'
 
-options = SOPT.get <<EOF
--W--workflows* Workflows to use; 'all' for all in Rbbt.etc.workflows:
--r--requires* Files to require; 'all' for all in Rbbt.etc.requires:
--h--help Help
-EOF
+$0 = "rbbt #{$previous_commands*" "} #{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Find files
+
+$ #{$0} [<options>] (<resource> <path>|<path>)
 
+-h--help Print this help
+-r--requires* Files to require; 'all' for all in Rbbt.etc.requires
+-lw--load_workflow* Files to require; 'all' for all in Rbbt.etc.requires
+-w--where* Where to look for the path
+
+EOF
 if options[:help]
-  puts SOPT.doc 
-  exit
+  if defined? rbbt_usage
+    rbbt_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
 end
 
+resource, path = ARGV
+path, resource = resource, nil
+
+raise MissingParameterException.new(:path) if path.nil?
+
 case options[:workflows]
 when nil, false, "false", "none"
 when "all"
@@ -39,18 +58,30 @@ else
   end
 end
 
-resource, path = ARGV
+location = nil
+where = options[:where]
+all = options[:all]
 
 begin
-  resource = Kernel.const_get(resource)
+  resource = Workflow.require_workflow resource
 rescue
   begin
-    resource = Workflow.require_workflow resource
+    resource = Kernel.const_get(resource)
   rescue
     raise "Resource not found: #{ resource }"
   end
-end
+end if resource
 
+path = (resource || Rbbt)[path]
 
-puts resource[path].find
+if where.nil? || where == 'all' || path.search_paths.include?(where.to_sym)
+  location = path.find(where)
 
+  if Array === location
+    puts location * "\n"
+  else
+    puts location
+  end
+else
+  puts RbbtSSH.command(where, $0, ARGV, options.merge("where" => :all)).read
+end

data/share/rbbt_commands/resource/glob

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require 'rbbt-util'
+require 'rbbt/util/simpleopt'
+require 'rbbt/resource'
+require 'rbbt/workflow'
+require 'rbbt/util/ssh'
+
+$0 = "rbbt #{$previous_commands*" "} #{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Find files in directories
+
+$ #{$0} [<options>] (<resource> <path>|<path>)
+
+-h--help Print this help
+-r--requires* Files to require; 'all' for all in Rbbt.etc.requires
+-lw--load_workflow* Files to require; 'all' for all in Rbbt.etc.requires
+-w--where* Where to look for the path
+
+EOF
+if options[:help]
+  if defined? rbbt_usage
+    rbbt_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
+end
+
+resource, path = ARGV
+path, resource = resource, nil
+
+raise MissingParameterException.new(:path) if path.nil?
+
+case options[:workflows]
+when nil, false, "false", "none"
+when "all"
+  Rbbt.etc.workflows.list.each do |workflow|
+    Workflow.require_workflow file
+  end if Rbbt.etc.workflows.exists?
+else
+  options[:workflows].split(/[ ,;|]/).each do |workflow|
+    Workflow.require_workflow workflow
+  end
+end
+
+case options[:requires]
+when nil, false, "false", "none"
+when "all"
+  Rbbt.etc.requires.list.each do |file|
+    require file
+  end if Rbbt.etc.requires.exists?
+else
+  options[:requires].split(/[ ,;|]/).each do |file|
+    require file
+  end
+end
+
+location = nil
+where = options[:where]
+all = options[:all]
+
+begin
+  resource = Workflow.require_workflow resource
+rescue
+  begin
+    resource = Kernel.const_get(resource)
+  rescue
+    raise "Resource not found: #{ resource }"
+  end
+end if resource
+
+path = (resource || Rbbt)[path]
+
+if where.nil? || where == 'all' || path.search_paths.include?(where.to_sym)
+  location = case where
+             when 'all'
+               path.glob_all("*")
+             when nil
+               path.glob_all
+             else
+               path.glob(where)
+             end
+
+  puts location * "\n"
+else
+  puts RbbtSSH.command(where, $0, ARGV, options.merge("where" => :all)).read
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.37.14
+  version: 5.37.16
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -310,6 +310,7 @@ files:
 - lib/rbbt/util/simpleopt/get.rb
 - lib/rbbt/util/simpleopt/parse.rb
 - lib/rbbt/util/simpleopt/setup.rb
+- lib/rbbt/util/ssh.rb
 - lib/rbbt/util/tar.rb
 - lib/rbbt/util/task/job.rb
 - lib/rbbt/util/tc_cache.rb
@@ -392,6 +393,7 @@ files:
 - share/rbbt_commands/resource/exists
 - share/rbbt_commands/resource/find
 - share/rbbt_commands/resource/get
+- share/rbbt_commands/resource/glob
 - share/rbbt_commands/resource/produce
 - share/rbbt_commands/resource/read
 - share/rbbt_commands/rsync