rbbt-util 5.26.11 → 5.26.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c3a5304ab04d9f3b75b8f26350ddcb26473ddb7e3448eeeb412c838b04cb5e
-  data.tar.gz: d709e752b74d99ebe5393a16fdab296a936998a8376536a9315ecf7c4e30263d
+  metadata.gz: 5a26934f329b7164d590e5e56b3c652395aed839642f30143c6f73cb42b4de12
+  data.tar.gz: ec812f3cd06f25081bfdcd0bff71a8382a8813d69ecb91ecf84a7df5c4d01899
 SHA512:
-  metadata.gz: 1877924f85a5db0f199cc6fb26be19af74c41a29070583984015757bdde8d487e380fd35deab8dca918a1ee00cca610dded6dd5cd427c2c63b8a09ab283ad6ed
-  data.tar.gz: 24b91de30df2ec4426b75373eb0bde9a0e267b58f3ee761b8590777a0ffbe0454a6f7a0db46aad012e368941bc4608ebb1da4d5633f098c0c534e07ce759fe66
+  metadata.gz: 1da22127c3b3674fd0c96d43d86355b1c79d9dcb75a7f6b82ed22f147530f6cef618b425cc556dcbe7ddd810e5c1ef05d44bef86c978f51ff29613ad8a0f33cd
+  data.tar.gz: c79ba4273b3c50625976d6a07cb9545bdd7a5e42380cab89cbe12f0ab28cd452238e61c937e16e558889f78e6f35f77b083413a389d7a44cd02e56b212880e35

data/lib/rbbt/monitor.rb

@@ -177,7 +177,8 @@ module Rbbt
 
                     CMD.cmd(cmd, :pipe => true).read.split("\n")
                   end
-          files = files.sort_by{|f| Open.mtime f}
+
+          files = files.sort_by{|f| Open.mtime(f) || Time.now}
           TSV.traverse files, :type => :array, :into => jobs, :_bar => "Finding jobs in #{ taskdir }" do |file|
             _files << file
             if m = file.match(/(.*)\.(info|pid|files)$/)

data/lib/rbbt/resource.rb

@@ -63,9 +63,6 @@ module Resource
       @resources[path] = [type, content || block]
 
       if type == :install
-        Log.debug "Preparing software: #{path}"
-        $set_software_env = false unless path.exists?
-        path.produce
         software_dir = path.resource.root.software
         set_software_env(software_dir) unless $set_software_env
         $set_software_env = true
@@ -192,6 +189,9 @@ module Resource
               run_rake(path, content, rake_dir)
             when :install
               Log.debug "Installing software: #{path}"
+
+              $set_software_env = false unless File.exists? path
+              
               software_dir = path.resource.root.software.find :user
               helper_file = File.expand_path(Rbbt.share.install.software.lib.install_helpers.find(:lib, caller_lib_dir(__FILE__)))
               #helper_file = File.expand_path(Rbbt.share.install.software.lib.install_helpers.find)
@@ -208,7 +208,8 @@ source "$INSTALL_HELPER_FILE"
               script = preamble + "\n" + Open.read(content)
               CMD.cmd_log('bash', :in => script)
 
-              set_software_env(software_dir)
+              set_software_env(software_dir) unless $set_software_env
+              $set_software_env = true
             else
               raise "Could not produce #{ resource }. (#{ type }, #{ content })"
             end

data/share/install/software/lib/install_helpers

@@ -382,6 +382,7 @@ setup(){
         pkg_dir="$(dirname $pkg_dir)/current"
     fi
 
+    echo $pkg_dir
     if [ -d "$pkg_dir/bin/" ]; then
 
         for exe in ` find "$pkg_dir/bin/" -maxdepth 1 -type f -executable`; do
@@ -406,11 +407,12 @@ setup(){
     ([ -d "$pkg_dir/lib" ]           && add2file "$OPT_DIR/.ld-paths" "$pkg_dir/lib")
     ([ -d "$pkg_dir/lib64" ]         && add2file "$OPT_DIR/.ld-paths" "$pkg_dir/lib64")
     ([ -d "$pkg_dir/lib/pkgconfig" ] && add2file "$OPT_DIR/.pkgconfig-paths" "$pkg_dir/lib/pkgconfig")
+    echo $name setup
 }
 
 #{{{ HELPERS
 
-prepare_src_pkg(){
+prepare_pkg(){
     local name="$1"
     local url="$2"
     shift;shift;
@@ -425,7 +427,7 @@ install_src(){
     shift;shift;
     local extra="$@"
 
-    prepare_src_pkg "$name" "$url"
+    prepare_pkg "$name" "$url"
     build "$name"  "$extra"
 }
 

data/share/rbbt_commands/stat/density

@@ -7,14 +7,18 @@ $0 = "rbbt #{$previous_commands*""} #{ File.basename(__FILE__) }" if $previous_c
 options = SOPT.setup <<EOF
 Calculate density 
 
-$ rbbt stat density <file>
+$ rbbt stat density <file> <plot>
 
 -h--help Help
+-m--max* Upper limit
 EOF
 
 SOPT.usage if options[:help]
 
 file = ARGV.shift
+plot = ARGV.shift
+
+file, plot = ["-", file] if plot.nil? and file.include? '.png'
 
 if file == '-' or file.nil?
   file = STDIN 
@@ -22,15 +26,26 @@ else
   file = Open.open file
 end
 
+
 values = file.read.split("\n").collect{|v| v.to_f}
+max = options[:max]
+
 
 res = TmpFile.with_file nil, :extension => 'png' do |tmp|
-  R.run <<-EOF
+  if max
+    R.run <<-EOF
+values = #{R.ruby2R values}
+d = density(values)
+rbbt.png_plot(filename = '#{plot || tmp}', 'plot(d, xlim=c(0,#{max})); abline(v=mean(values))')
+    EOF
+  else
+    R.run <<-EOF
 values = #{R.ruby2R values}
 d = density(values)
-rbbt.png_plot(filename = '#{tmp}', 'plot(d)')
-  EOF
+rbbt.png_plot(filename = '#{plot || tmp}', 'plot(d); abline(v=mean(values))')
+    EOF
+  end
 
-  `op '#{tmp}'` 
+  `op '#{plot || tmp}'` 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.11
+  version: 5.26.12
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake