rbbt-util 5.31.1 → 5.31.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61b346a2806a9f5c6f32dd2e972386ad2ebd5d748b4d71ac89fdeabc0250567b
-  data.tar.gz: faa0e2b8eee1eb1271406f16bf8b030ee4ecd3d83e6dfce205a5129e6676e2c9
+  metadata.gz: 34e7a247caa69fc1c5f63d78ed8dd0884f8a57bb85940f5331484482115b4169
+  data.tar.gz: 0c390b5aa9c71bf06f0964bb8a5f21b1a1d500c9865c442a7365532094949e15
 SHA512:
-  metadata.gz: 57f76043890f5ad9ecdf7b397f7803d59556bc39fe8110fd719db68192cda82542ccf072899f37f23fd497a03fe79b9d1119146c268e7571843dee9a35eeb506
-  data.tar.gz: 8b4b959e19804a206abb1a080d81866aa73388eee85d1c031021ed79e239df570b055a3f9d007fbe406eb372edd76ade85a556bf9d38dca16011b326efbf8117
+  metadata.gz: 47c595b2129fcdadc2caf5c7d3ae2c0ea005b5d0969c96eb49fef69a6773430dc02fc83f2abfed47492d4fa66c09b43c5ab3f28a4667465cb612d3aaff9261c7
+  data.tar.gz: 82db64ecc144b0d29169a6736bf9df736b3ccb3355117f3808a0b1c631b35f1ca5e91f36cfdd96a6e5c823767ace2b12ebb3666af068a794d859a15683917f00

data/lib/rbbt/hpc/batch.rb

@@ -11,30 +11,35 @@ module HPC
       env_cmd     = Misc.process_options options, :env_cmd
       development = Misc.process_options options, :development
 
+      if contain = options[:contain]
+        contain = File.expand_path(contain)
+        env_cmd ||= ""
+        env_cmd << " TMPDIR='#{contain}/.rbbt/tmp' "
+      end
+
       if options[:singularity]
 
         group, user, user_group, scratch_group_dir, projects_group_dir = options.values_at :group, :user, :user_group, :scratch_group_dir, :projects_group_dir
 
         singularity_img, singularity_opt_dir, singularity_ruby_inline = options.values_at :singularity_img, :singularity_opt_dir, :singularity_ruby_inline
 
-        singularity_cmd = %(singularity exec -e -B #{singularity_opt_dir}:/singularity_opt/ -B /apps/) 
+        singularity_cmd = %(singularity exec -e -B #{singularity_opt_dir}:/singularity_opt/ -B "#{singularity_ruby_inline}":"/.singularity_ruby_inline":rw ) 
 
-        if contain = options[:contain]
-          contain = File.expand_path(contain)
+        if contain && options[:hardened]
           singularity_cmd << %( -C -H "#{contain}" \
+-B "/.singularity_ruby_inline":"#{contain}/.singularity_ruby_inline":rw 
 -B "#{options[:batch_dir]}" \
 -B /scratch/tmp \
 #{ group != user_group ? "-B /gpfs/projects/#{user_group}" : "" } \
 -B #{scratch_group_dir} \
 -B #{projects_group_dir} \
--B "#{singularity_ruby_inline}":"#{contain}/.ruby_inline":rw  \
+-B /apps/ \
 -B ~/git:"#{contain}/git":ro \
 #{Open.exists?('~/.rbbt/software/opt/')? '-B ~/.rbbt/software/opt/:"/opt/":ro' : '' } \
 -B ~/.rbbt:"#{contain}/home/":ro)
-          singularity_cmd << " #{singularity_img} "
         end
-        env_cmd ||= ""
-        env_cmd << " TMPDIR='#{contain}/.rbbt/tmp' "
+
+        singularity_cmd << " #{singularity_img} "
       end
 
       if env_cmd
@@ -170,7 +175,7 @@ EOF
         batch_options[:wipe_container] ||= 'post'
       end
 
-      if batch_options[:contain] && ! batch_options[:singularity]
+      if batch_options[:contain] && ! batch_options[:hardened]
         options[:workdir_all] = batch_options[:contain]
       end
 
@@ -304,7 +309,7 @@ module load singularity
 mkdir -p "#{singularity_opt_dir}"
         EOF
 
-        if contain
+        if contain && options[:hardened]
 
           prepare_environment +=<<-EOF
 # Prepare container for singularity

data/lib/rbbt/hpc/lsf.rb

@@ -7,7 +7,8 @@ module HPC
 
     def self.batch_system_variables
       <<-EOF
-MAX_MEMORY=$LSB_MAX_MEM_RUSAGE || let MAX_MEMORY="$(grep MemTotal /proc/meminfo|grep -o "[[:digit:]]*") / 1024"
+[[ -z $LSB_MAX_MEM_RUSAGE ]] || MAX_MEMORY=$LSB_MAX_MEM_RUSAGE 
+[[ -z $MAX_MEMORY ]] && let MAX_MEMORY="$(grep MemTotal /proc/meminfo|grep -o "[[:digit:]]*") / 1024"
 BATCH_JOB_ID=$LSF_JOBID
 BATCH_SYSTEM=LSF
       EOF

data/lib/rbbt/resource/util.rb

@@ -33,9 +33,9 @@ end
 
 module Resource
   def set_software_env(software_dir)
-    software_dir.find_all.reverse.each do |software_dir|
+    software_dir.opt.find_all.reverse.each do |software_dir|
       next unless software_dir.exists?
-      software_dir = File.expand_path(software_dir)
+      software_dir = File.expand_path(File.dirname(software_dir))
       opt_dir = File.join(software_dir, 'opt')
       bin_dir = File.join(opt_dir, 'bin')
 

data/lib/rbbt/workflow/integration/ansible.rb

@@ -2,7 +2,7 @@ require_relative 'ansible/workflow'
 require 'rbbt/workflow/usage'
 
 module Ansible
-  def self.play(playbook, inventory = nil)
+  def self.play(playbook, inventory = nil, verbose = false)
     inventory = Rbbt.etc.ansible_inventory.find
     Log.with_severity 0 do
       TmpFile.with_file do |tmp|
@@ -10,7 +10,11 @@ module Ansible
           Open.write(tmp, [playbook].to_yaml)
           playbook = tmp
         end
-        CMD.cmd_log("ansible-playbook -i #{inventory} #{playbook}")
+        if verbose
+          CMD.cmd_log("ansible-playbook -i #{inventory} -v #{playbook}")
+        else
+          CMD.cmd_log("ansible-playbook -i #{inventory} #{playbook}")
+        end
       end
     end
   end
@@ -46,7 +50,7 @@ module Ansible
   def self.playbook(file, task = nil, options = {})
     task = 'default' if task.nil?
 
-    workflow = Workflow.require_workflow file
+    workflow = Workflow === file ? file : Workflow.require_workflow(file)
     task = workflow.tasks.keys.last if workflow.tasks[task].nil?
     workflow2playbook workflow, task, options
   end

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

@@ -99,6 +99,7 @@ class Step
         if String === value && File.exists?(value)
           Open.ln_s(value, path)
         else
+          value = value.collect{|v| v = "#{v}" if Path === v; v }if Array === value
           value = "#{value}" if Path === value
           Open.write(path + '.yaml', value.to_yaml)
         end
@@ -549,7 +550,7 @@ class Step
 
   def aborted?
     status = self.status
-    status == :aborted || ((status != :cleaned && status != :noinfo && status != :setup && status != :noinfo) && nopid?)
+    status == :aborted || ((status != :dependencies && status != :cleaned && status != :noinfo && status != :setup && status != :noinfo) && nopid?)
   end
 
   # {{{ INFO

data/share/install/software/lib/install_helpers

@@ -147,6 +147,8 @@ get_git(){
           git pull origin master
           git rebase master
           git stash apply
+          git submodule init
+          git submodule update
         fi
     else
       if [ $version == 'none' ];then
@@ -154,6 +156,10 @@ get_git(){
       else
         git clone --recursive "$url" "$name" -b $version
       fi
+
+      cd "$name" 
+      git submodule init
+      git submodule update
     fi
 
     clean_build

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.31.1
+  version: 5.31.7
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake