miga-base 0.7.13.2 → 0.7.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36fd2b4078044d448feccc3a1c08f4299663692c3f564fd0d390808a2d2f07e7
-  data.tar.gz: b57924e0a40b316f186d5089455e1d2221f3e11f559d91c0d9f5d8e8e621b257
+  metadata.gz: 0160b454e26886637f28dea78ab57e66b1c53ee3fca610c64339f3265ce86afb
+  data.tar.gz: 6df1a7bfc7ebf0493265cd6be8f8600a575b3c20f07ec43f7c25b8de3035b5c8
 SHA512:
-  metadata.gz: 47038d85b7680fff3d74b176e1fc46125b0b76f5c7044c6ae3153f2192584e7934c480c901ab538a926ab9f5b2af9ac9d54c16ce88231043cb2e5bb0c0ad40d8
-  data.tar.gz: b1878fb728f2e3414e8c9ffdc8af436d50f66c64588ecbff4b991bb2df93528e7b4fd3177b47ad4a136e45a972ea07c2c48328234ec1b5579795311bcd20c2d6
+  metadata.gz: 00245e9a4d698ed335f1777bd1f9156ecc2ba325c4ef66f42f01f9e59c70e4bfb42a588a7be62271dd55df73e2fc737a29e24253487ba55e9d8645a43508d91c
+  data.tar.gz: 12c8beb33f81fc7114d957a59982d4bfab1deceb21db27dde1a93f474d4ab5918308ac04d351c86b9a71f8a6804e0311b3230ccbad16de320523246f1e7e3f9b

data/lib/miga/cli.rb

@@ -110,30 +110,9 @@ class MiGA::Cli < MiGA::MiGA
   end
 
   ##
-  # Reports the advance of a task at +step+ (String), the +n+ out of +total+.
-  # The advance is reported in powers of 1,024 if +bin+ is true, or powers of
-  # 1,000 otherwise.
-  # The report goes to $stderr iff --verborse
-  def advance(step, n = 0, total = nil, bin = true)
-    return unless self[:verbose]
-
-    adv = total.nil? ? (n == 0 ? '' : num_suffix(n, bin)) :
-      ('%.1f%% (%s/%s)' % [100.0 * n / total,
-                           num_suffix(n, bin), num_suffix(total, bin)])
-    $stderr.print("[%s] %s %s    \r" % [Time.now, step, adv])
-  end
-
-  def num_suffix(n, bin = false)
-    p = ''
-    { T: 4, G: 3, M: 2, K: 1 }.each do |k, x|
-      v = (bin ? 1024 : 1e3)**x
-      if n > v
-        n = '%.1f' % (n / v)
-        p = k
-        break
-      end
-    end
-    "#{n}#{p}"
+  # Same as MiGA::MiGA#advance, but checks if the CLI is verbose
+  def advance(*par)
+    super(*par) if self[:verbose]
   end
 
   ##

data/lib/miga/cli/action/browse.rb

@@ -15,12 +15,12 @@ class MiGA::Cli::Action::Browse < MiGA::Cli::Action
     p = cli.load_project
     create_empty_page(p)
     generate_project_page(p)
-    say 'Creating dataset pages'
+    cli.say 'Creating dataset pages'
     cli.load_project.each_dataset do |d|
       generate_dataset_page(p, d)
     end
     generate_datasets_index(p)
-    say "Open in your browser: #{File.join(p.path, 'index.html')}"
+    cli.say "Open in your browser: #{File.join(p.path, 'index.html')}"
   end
 
   private
@@ -28,7 +28,7 @@ class MiGA::Cli::Action::Browse < MiGA::Cli::Action
   ##
   # Create an empty page with necessary assets for project +p+
   def create_empty_page(p)
-    say 'Creating project page'
+    cli.say 'Creating project page'
     FileUtils.mkdir_p(browse_file(p, '.'))
     %w[favicon-32.png style.css].each do |i|
       FileUtils.cp(template_file(i), browse_file(p, i))
@@ -103,7 +103,7 @@ class MiGA::Cli::Action::Browse < MiGA::Cli::Action
   ##
   # Create pages for reference and query dataset indexes
   def generate_datasets_index(p)
-    say 'Creating index pages'
+    cli.say 'Creating index pages'
     data = format_dataset_index(p)
     data.each do |k, v|
       write_file(p, "#{k}_datasets.html") do

data/lib/miga/cli/action/classify_wf.rb

@@ -42,9 +42,7 @@ class MiGA::Cli::Action::ClassifyWf < MiGA::Cli::Action
         '--no-summaries',
         'Do not generate intermediate step summaries'
       ) { |v| cli[:summaries] = v }
-      opts_for_wf(
-        opt, 'Input genome assemblies (nucleotides, FastA)', qual: false
-      )
+      opts_for_wf(opt, 'Input genome assemblies (nucleotides, FastA)')
     end
   end
 

data/lib/miga/cli/action/daemon.rb

@@ -6,7 +6,7 @@ require 'miga/daemon'
 
 class MiGA::Cli::Action::Daemon < MiGA::Cli::Action
   def parse_cli
-    cli.defaults = { daemon_opts: [] }
+    cli.defaults = { daemon_opts: [], show_log: false }
     cli.expect_operation = true
     cli.parse do |opt|
       opt.separator 'Available operations:'
@@ -45,6 +45,10 @@ class MiGA::Cli::Action::Daemon < MiGA::Cli::Action
         '--json PATH',
         'Path to a custom daemon definition in json format'
       ) { |v| cli[:json] = v }
+      opt.on(
+        '--show-log',
+        'Display log on advance instead of the progress summary'
+      ) { |v| cli[:show_log] = v }
       cli.opt_common(opt)
 
       opt.separator 'Daemon options:'
@@ -73,6 +77,7 @@ class MiGA::Cli::Action::Daemon < MiGA::Cli::Action
     d = MiGA::Daemon.new(p, cli[:json])
     dopts = %i[latency maxjobs nodelist ppn shutdown_when_done]
     dopts.each { |k| d.runopts(k, cli[k]) }
+    d.show_log! if cli[:show_log]
     d.daemon(cli.operation, cli[:daemon_opts])
   end
 end

data/lib/miga/cli/action/quality_wf.rb

@@ -9,16 +9,13 @@ class MiGA::Cli::Action::QualityWf < MiGA::Cli::Action
 
   def parse_cli
     default_opts_for_wf
-    cli.defaults = { mytaxa: false }
+    cli.defaults = { mytaxa: false, min_qual: 'no' }
     cli.parse do |opt|
       opt.on(
         '-m', '--mytaxa-scan',
         'Perform MyTaxa scan analysis'
       ) { |v| cli[:mytaxa] = v }
-      opts_for_wf(
-        opt, 'Input genome assemblies (nucleotides, FastA)',
-        qual: false
-      )
+      opts_for_wf(opt, 'Input genome assemblies (nucleotides, FastA)')
     end
   end
 

data/lib/miga/cli/action/wf.rb

@@ -9,7 +9,7 @@ module MiGA::Cli::Action::Wf
     cli.defaults = {
       clean: false, regexp: MiGA::Cli.FILE_REGEXP,
       project_type: :genomes, dataset_type: :popgenome,
-      ncbi_draft: true
+      ncbi_draft: true, min_qual: 25.0
     }
   end
 
@@ -42,10 +42,10 @@ module MiGA::Cli::Action::Wf
     end
     if params[:qual]
       opt.on(
-        '--min-qual FLOAT', Float,
+        '--min-qual FLOAT',
         'Minimum genome quality to include in analysis',
-        'By default: 50.0'
-      ) { |v| cli[:min_qual] = v }
+        "By default: #{cli[:min_qual]}"
+      ) { |v| cli[:min_qual] = v == 'no' ? v : v.to_f }
     end
     if params[:cleanup]
       opt.on(

data/lib/miga/common.rb

@@ -6,6 +6,7 @@ require 'miga/json'
 require 'miga/common/base'
 require 'miga/common/path'
 require 'miga/common/format'
+require 'stringio'
 
 ##
 # Generic class used to handle system-wide information and methods, and parent
@@ -38,10 +39,42 @@ class MiGA::MiGA
   ##
   # Print +par+ ensuring new line at the end.
   # Date/time-stamp each line.
-  # If the first parameter is +IO+, the output is sent there,
+  # If the first parameter is +IO+ or +StringIO+ the output is sent there,
   # otherwise it's sent to +$stderr+
   def say(*par)
-    io = par.first.is_a?(IO) ? par.shift : $stderr
+    io = like_io?(par.first) ? par.shift : $stderr
     io.puts(*par.map { |i| "[#{Time.now}] #{i}" })
   end
+
+  ##
+  # Reports the advance of a task at +step+ (String), the +n+ out of +total+.
+  # The advance is reported in powers of 1,024 if +bin+ is true, or powers of
+  # 1,000 otherwise.
+  # The report goes to $stderr iff --verborse
+  def advance(step, n = 0, total = nil, bin = true)
+    adv = total.nil? ? (n == 0 ? '' : num_suffix(n, bin)) :
+      ('%.1f%% (%s/%s)' % [100.0 * n / total,
+                           num_suffix(n, bin), num_suffix(total, bin)])
+    $stderr.print("[%s] %s %s    \r" % [Time.now, step, adv])
+  end
+
+  ##
+  # Return formatted number +n+ with the appropriate units as
+  # powers of 1,000 (if +bin+ if false) or 1,024 (otherwise)
+  def num_suffix(n, bin = false)
+    p = ''
+    { T: 4, G: 3, M: 2, K: 1 }.each do |k, x|
+      v = (bin ? 1024 : 1e3)**x
+      if n > v
+        n = '%.1f' % (n / v)
+        p = k
+        break
+      end
+    end
+    "#{n}#{p}"
+  end
+
+  def like_io?(obj)
+    obj.is_a?(IO) || obj.is_a?(StringIO)
+  end
 end

data/lib/miga/daemon.rb

@@ -72,6 +72,7 @@ class MiGA::Daemon < MiGA::MiGA
     say '-----------------------------------'
     say 'MiGA:%s launched' % project.name
     say '-----------------------------------'
+    miga_say "Saving log to: #{output_file}" unless show_log?
     recalculate_status!
     load_status
     say 'Configuration options:'
@@ -111,10 +112,12 @@ class MiGA::Daemon < MiGA::MiGA
     say(*msg) if verbosity >= level
   end
 
+  alias miga_say say
+
   ##
   # Same as +l_say+ with +level = 1+
   def say(*msg)
-    super(*msg) if verbosity >= 1
+    super(logfh, *msg) if verbosity >= 1
   end
 
   ##
@@ -173,6 +176,12 @@ class MiGA::Daemon < MiGA::MiGA
       o = true if ds.ref?
       queue_job(:d, ds)
     end
+    unless show_log?
+      n = project.dataset_names.count
+      k = jobs_to_run.size + jobs_running.size
+      advance('Datasets:', n - k, n, false)
+      miga_say if k == 0
+    end
     o
   end
 
@@ -332,8 +341,9 @@ class MiGA::Daemon < MiGA::MiGA
       kill: %w[pid]
     }.each do |k, v|
       if !runopts(k).nil? && runopts(k) =~ /%(\d+\$)?[ds]/
-        runopts(k,
-                runopts(k).gsub(/%(\d+\$)?d/, '%\\1s') % v.map { |i| "{{#{i}}}" })
+        runopts(
+          k, runopts(k).gsub(/%(\d+\$)?d/, '%\\1s') % v.map { |i| "{{#{i}}}" }
+        )
       end
     end
     runopts(:format_version, 1)

data/lib/miga/daemon/base.rb

@@ -17,7 +17,7 @@ module MiGA::Daemon::Base
         if !force && v == 0 && k != :verbosity
           raise "Daemon's #{k} cannot be set to zero"
         end
-      when :shutdown_when_done
+      when :shutdown_when_done, :show_log
         v = !!v
       when :nodelist
         if v =~ /^\$/
@@ -73,4 +73,28 @@ module MiGA::Daemon::Base
   def verbosity
     runopts(:verbosity) || 1
   end
+
+  ##
+  # Writing file handler (IO) to the log file
+  def logfh
+    show_log? ? $stderr : (@logfh ||= File.open(output_file, 'w'))
+  end
+
+  ##
+  # Display log instead of the progress summary
+  def show_log!
+    @show_log = true
+  end
+
+  ##
+  # Display progress summary instead of the log
+  def show_summary!
+    @runopts[:show_log] = false
+  end
+
+  ##
+  # Display log instead of the progress summary?
+  def show_log?
+    @runopts[:show_log] ||= false
+  end
 end

data/lib/miga/version.rb

@@ -8,7 +8,7 @@ module MiGA
   # - Float representing the major.minor version.
   # - Integer representing gem releases of the current version.
   # - Integer representing minor changes that require new version number.
-  VERSION = [0.7, 13, 2]
+  VERSION = [0.7, 15, 0]
 
   ##
   # Nickname for the current major.minor version.
@@ -16,7 +16,7 @@ module MiGA
 
   ##
   # Date of the current gem release.
-  VERSION_DATE = Date.new(2020, 8, 4)
+  VERSION_DATE = Date.new(2020, 8, 12)
 
   ##
   # Reference of MiGA.

data/test/daemon_test.rb

@@ -9,7 +9,7 @@ class DaemonTest < Test::Unit::TestCase
   def setup
     initialize_miga_home(
       <<~DAEMON
-        { "maxjobs": 1, "ppn": 1, "latency": 2, "varsep": " ",
+        { "maxjobs": 1, "ppn": 1, "latency": 2, "varsep": " ", "show_log": true,
           "var": "{{key}}={{value}}", "cmd": "echo {{task_name}} >/dev/null",
           "alive": "echo 1 # {{pid}}", "type": "bash", "format_version": 1 }
       DAEMON

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 0.7.13.2
+  version: 0.7.15.0
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons