rbbt-util 5.26.119 → 5.26.120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05da786f18d5e3213b63cd8b393636dcbe958b2037d6a2e442b8685e67f5879
-  data.tar.gz: bd4c2295c35596a1a412428af79a08a121247e3435a5fb019bfe40860ba8672f
+  metadata.gz: f9ec3c2938773e8fd856054ef528f4003eee1ad8c9861cbf2bfedd191b3b0355
+  data.tar.gz: c5bf8a057f4f121ae3c23ec17e20ea58b2e86ce751f19f5119bf309c476a56de
 SHA512:
-  metadata.gz: bdd5b632c8c5688f803bac8b8b7130a68ad7d005fe3eb39c30f560bff9503049ceadc45773abde44a3b51fafe0d68b2d388e04a53943b931246d3ac758cc70e4
-  data.tar.gz: aae462bea2017e83303781947e1b0fc446a5ae3fd877e790c21b6280f3b45dd7650190039a2fbcc76234d666e07eb6b6f657855d32ee8e0be1b0e2ed835ce637
+  metadata.gz: e3aceb75551882dafc2fb165cc35b855a7688052fa222837539633873a40e567b9fabf3513f520162ba13d86ba9af2ecca883cc3fff5b659044fe02cbb26b804
+  data.tar.gz: e22e5015ba5d35b65aa2c73006f75c3a745bf4c15f9f9dcde88545f956041d87c9d576eaebf75db416c7bea4f2a94bbe6db64d680cca03c7d3cab279f54dc04e

data/lib/rbbt/workflow/remote/ssh/driver.rb

@@ -1,7 +1,7 @@
 module SSHDriver
   def self.run(server, script)
     Log.debug "Run ssh script in #{server}:\n#{script}"
-    CMD.cmd("ssh '#{server}' 'shopt -s expand_aliases; bash -ic \"ruby\"' ", :in => script, :log => true).read
+    CMD.cmd("ssh '#{server}' 'shopt -s expand_aliases; bash -l -i -c \"ruby\"' ", :in => script, :log => true).read
   end
 
   #def self.run_log(server, script)

data/lib/rbbt/workflow/util/archive.rb

@@ -49,7 +49,7 @@ class Step
     end
   end
 
-  def self.job_files_for_archive(files, relocate = false)
+  def self.job_files_for_archive(files, recursive = false)
     job_files = Set.new
 
     jobs = files.collect do |file|  
@@ -65,8 +65,9 @@ class Step
       next unless File.exists?(step.path)
       job_files << step.path
       job_files << step.info_file if File.exists?(step.info_file)
-      job_files << step.files_dir if Dir.glob(step.files_dir + '/*').any?
+      job_files << step.files_dir.glob("**") if Dir.glob(step.files_dir + '/*').any?
       rec_dependencies = Set.new
+      next unless recursive
       deps = [step.path]
       seen = Set.new
       while deps.any?
@@ -75,8 +76,6 @@ class Step
         dep = Workflow.load_step path
         seen << dep.path
 
-        dep.relocated = !!relocate
-
         dep.load_dependencies_from_info
 
         dep.dependencies.each do |dep|
@@ -97,11 +96,11 @@ class Step
     job_files.to_a
   end
 
-  def self.archive(files, target = nil, relocate = true)
+  def self.archive(files, target = nil, recursive = true)
     target = self.path + '.tar.gz' if target.nil?
     target = File.expand_path(target) if String === target
 
-    job_files = job_files_for_archive files, relocate
+    job_files = job_files_for_archive files, recursive
     TmpFile.with_file do |tmpdir|
       job_files.each do |file|
         Step.link_job file, tmpdir
@@ -119,11 +118,12 @@ class Step
   end
 
   def self.migrate(path, search_path, options = {})
-
     resource=Rbbt
 
     other_rsync_args = options[:rsync]
-    relocate = options[:relocate]
+
+    recursive = options[:recursive]
+    recursive = false if recursive.nil?
 
     paths = if options[:source]
               SSHDriver.run(options[:source], <<-EOF).split("\n")
@@ -131,18 +131,21 @@ require 'rbbt-util'
 require 'rbbt/workflow'
 
 path = "#{path}"
-relocate = #{ relocate.to_s }
+recursive = #{ recursive.to_s }
+
 if File.exists?(path)
   path = #{resource.to_s}.identify(path)
 else
   path = Path.setup(path)
 end
+
 files = path.glob_all
-if #{options[:recursive].to_s == 'true'}
-  files = Step.job_files_for_archive(files, relocate)
-end
+
+files = Step.job_files_for_archive(files, recursive)
+
 puts files * "\n"
               EOF
+
             else
               if File.exists?(path)
                 path = resource.identify(path)
@@ -155,6 +158,7 @@ puts files * "\n"
               end
               files
             end
+    iii paths
 
     target = if options[:target] 
                target = SSHDriver.run(options[:target], <<-EOF).split("\n").first
@@ -218,9 +222,9 @@ puts resource[path].find(search_path)
     end
   end
 
-  def self.purge(path, relocate = false)
+  def self.purge(path, recursive = false)
     path = [path] if String === path
-    job_files = job_files_for_archive path, relocate
+    job_files = job_files_for_archive path, recursive
 
     job_files.each do |file|
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.119
+  version: 5.26.120
 platform: ruby
 authors:
 - Miguel Vazquez