rbbt-util 5.26.68 → 5.26.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8ed0fc568f3cb1688d21b40a222d37b6e301c56c1eb18d6fb46838f880f4b5
-  data.tar.gz: dc964179d48405b167b03490cf1fa57d44e94c2811921473475ec51d762cd901
+  metadata.gz: ac29954e5bef02280ffae697ea26e1dfde43dd3fc53f9f574de35ddd7196aa65
+  data.tar.gz: fbce52172d122f2bce9084c0aed4cefa6b68c214f15a1ea99bf9ad763298b237
 SHA512:
-  metadata.gz: 61db65a33fe163ea64638de873211e5ebb63c56e0aa502e9e50cbe2ebdba8aba691b624802cc1b2abe22bafeaae2b50942f392a0e352c2d6eda854d478d6989e
-  data.tar.gz: 83bb4b7b4a7f19f3a815da2d57035a4cd25ec6a2998eccc9a8ce0b9f59bb47baecee28d30b7266178b1842cad3dd86b135ca1e5359e0ad3724f9208e210a55e0
+  metadata.gz: 582ce34c744828198d4f74e4a1d29c2be07c04e99521cac21a719a1e12b3c53cde1bc70b1a834395cba4a91e0771c5431a2268ea558df66318c48ddd48bcb631
+  data.tar.gz: e5ed71a66cb4e4194a1e4632b6dfda88e7e11f440615252a0ce98415d4c3433e00d942065ed6cbba34d32dbcd31fd538ec503a3bc7d4887538ca143bf5b6a727

data/lib/rbbt/monitor.rb

@@ -138,76 +138,80 @@ module Rbbt
     dirs.collect do |dir|
       next unless Open.exists? dir
 
-      workflowdirs = if (dir_sub_path = Open.find_repo_dir(workflowdir))
-                       repo_dir, sub_path = dir_sub_path
-                       Open.list_repo_files(*dir_sub_path).collect{|f| f.split("/").first}.uniq.collect{|f| File.join(repo_dir, f)}.uniq
-                     else
-                       dir.glob("*")
-                     end
-
-      workflowdirs.collect do |workflowdir|
-        workflow = File.basename(workflowdir)
-        next if workflows and not workflows.include? workflow
-
-        tasks_dirs = if (dir_sub_path = Open.find_repo_dir(workflowdir))
-                       repo_dir, sub_path = dir_sub_path
-                       Open.list_repo_files(*dir_sub_path).collect{|f| f.split("/").first}.uniq.collect{|f| File.join(repo_dir, f)}.uniq
-                     else
-                       workflowdir.glob("*")
-                     end
-
-        tasks_dirs.collect do |taskdir|
-          task = File.basename(taskdir)
-          next if tasks and not tasks.include? task
-
-
-          files = if (dir_sub_path = Open.find_repo_dir(taskdir))
-                    repo_dir, sub_path = dir_sub_path
-                    Open.list_repo_files(*dir_sub_path).reject do |f|
-                      f.include?("/.info/") ||
-                        f.include?(".files/") ||
-                        f.include?(".pid/") ||
-                        File.directory?(f)
-                    end.collect do |f|
-                      File.join(repo_dir, f)
-                    end
+      tasks_dirs = if dir == '.'
+                    ["."]
                   else
-                    #cmd = "find -L '#{ taskdir }/'  -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.notify' -not -name '\\.*' 2>/dev/null"
-                    cmd = "find -L '#{ taskdir }/' -not \\( -path \"#{taskdir}/.info/*\" -prune \\) -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.md5' -not -name '*.notify' -not -name '\\.*' \\( -not -type d -o -name '*.files' \\)  2>/dev/null"
-
-                    CMD.cmd(cmd, :pipe => true).read.split("\n")
+                    workflowdirs = if (dir_sub_path = Open.find_repo_dir(workflowdir))
+                                     repo_dir, sub_path = dir_sub_path
+                                     Open.list_repo_files(*dir_sub_path).collect{|f| f.split("/").first}.uniq.collect{|f| File.join(repo_dir, f)}.uniq
+                                   else
+                                     dir.glob("*")
+                                   end
+
+                    workflowdirs.collect do |workflowdir|
+                      workflow = File.basename(workflowdir)
+                      next if workflows and not workflows.include? workflow
+
+                      if (dir_sub_path = Open.find_repo_dir(workflowdir))
+                        repo_dir, sub_path = dir_sub_path
+                        Open.list_repo_files(*dir_sub_path).collect{|f| f.split("/").first}.uniq.collect{|f| File.join(repo_dir, f)}.uniq
+                      else
+                        workflowdir.glob("*")
+                      end
+                    end.compact.flatten
                   end
 
-          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)$/)
-              file = m[1]
-            end
-            next if seen.include? file
-            seen << file
+      tasks_dirs.collect do |taskdir|
+        task = File.basename(taskdir)
+        next if tasks and not tasks.include? task
 
-            name = file[taskdir.length+1..-1]
-            info_file = file + '.info'
 
-            info = {}
+        files = if (dir_sub_path = Open.find_repo_dir(taskdir))
+                  repo_dir, sub_path = dir_sub_path
+                  Open.list_repo_files(*dir_sub_path).reject do |f|
+                    f.include?("/.info/") ||
+                      f.include?(".files/") ||
+                      f.include?(".pid/") ||
+                      File.directory?(f)
+                  end.collect do |f|
+                    File.join(repo_dir, f)
+                  end
+                else
+                  #cmd = "find -L '#{ taskdir }/'  -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.notify' -not -name '\\.*' 2>/dev/null"
+                  cmd = "find -L '#{ taskdir }/' -not \\( -path \"#{taskdir}/.info/*\" -prune \\) -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.md5' -not -name '*.notify' -not -name '\\.*' \\( -not -type d -o -name '*.files' \\)  2>/dev/null"
+
+                  CMD.cmd(cmd, :pipe => true).read.split("\n")
+                end
+
+        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)$/)
+            file = m[1]
+          end
+          next if seen.include? file
+          seen << file
 
-            info[:workflow] = workflow
-            info[:task] = task
-            info[:name] = name
+          name = file[taskdir.length+1..-1]
+          info_file = file + '.info'
 
-            if Open.exists? file
-              info = info.merge(file_time(file))
-              info[:done] = true
-              info[:info_file] = Open.exist?(info_file) ? info_file : nil
-            else
-              info = info.merge({:info_file => info_file, :done => false})
-            end
+          info = {}
 
-            [file, info]
+          info[:workflow] = workflow
+          info[:task] = task
+          info[:name] = name
+
+          if Open.exists? file
+            info = info.merge(file_time(file))
+            info[:done] = true
+            info[:info_file] = Open.exist?(info_file) ? info_file : nil
+          else
+            info = info.merge({:info_file => info_file, :done => false})
           end
 
-        end.compact.flatten
+          [file, info]
+        end
+
       end.compact.flatten
     end.compact.flatten
     jobs
@@ -235,7 +239,7 @@ module Rbbt
         jobs[workflow][task] ||= {}
         files.each do |f|
           next if f =~ /\.lock$/
-            job = f.sub(/\.(info|files)/,'')
+          job = f.sub(/\.(info|files)/,'')
 
           jobs[workflow][task][job] ||= {}
           if jobs[workflow][task][job][:status].nil?
@@ -247,8 +251,8 @@ module Rbbt
                      rescue
                        {}
                      end
-            status = info[:status]
-            pid = info[:pid]
+              status = info[:status]
+              pid = info[:pid]
             end
 
             jobs[workflow][task][job][:pid] = pid if pid

data/lib/rbbt/util/cmd.rb

@@ -146,6 +146,8 @@ module CMD
     all_args << {} unless Hash === all_args.last
 
     level = all_args.last[:log] || 0
+    level = 0 if TrueClass === level
+    level = 10 if FalseClass === level
     level = level.to_i
 
     all_args.last[:log] = true

data/share/rbbt_commands/system/clean

@@ -79,7 +79,12 @@ puts
 puts Log.color(:magenta, "# Workflow clean")
 puts
 
-jobs = Rbbt.job_info workflow, task
+if workflow === ['.']
+  jobs = Rbbt.job_info ["all"], task, ['.']
+else
+  jobs = Rbbt.job_info workflow, task
+end
+
 workflows = {}
 
 TSV.traverse jobs do |file,i|

data/share/rbbt_commands/system/status

@@ -152,7 +152,12 @@ workflow = nil if workflow == ["all"]
 
 puts Log.color(:magenta, "# Workflows")
 
-jobs = Rbbt.job_info workflow, task
+if workflow === ['.']
+  jobs = Rbbt.job_info ["all"], task, ['.']
+else
+  jobs = Rbbt.job_info workflow, task
+end
+
 workflows = {}
 
 TSV.traverse jobs, :_bar => "Checking job status" do |file,info|

metadata

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