miga-base 0.7.10.0 → 0.7.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d61eb5847a28c4d83a43e6e47ff0738bb819218e677b9aa43de158b441e0ae
-  data.tar.gz: 46338ae15353b71fb6e7eff390c8bb976d1c11fc296bb83f33aab8ffba1a3fa8
+  metadata.gz: c57b841cc84841ebfd868af862204179e443d37eb4ec5550ea9ef7df63b9d933
+  data.tar.gz: 5512fe8305c2b6193f5d1a5c99e663ef480be32db2e8bdc7087826bdeeae5b35
 SHA512:
-  metadata.gz: 488e7888039bb9e08e7c257fdd7cb0cf34340766f73b9b46c28b332072f5f207f5dcfb0df08c98b27f5640158d3a14ae6d0f5ab19d78f3e9e1ef44e381d34e74
-  data.tar.gz: 992cfc225eeb2f4b8017260e66c67bc9df39a79757ecdb65e01766079e103385259c1eeb447fdc5e6b769990f96256d384dc4adddf184693a3bc94b8323b9a5a
+  metadata.gz: 63e095dded680c2a6d1519d8fc8788d4d44cf523fc84b9e67ee453dffb9f05c75e2acafc283b511f6b27638e678d53f7362b056f35d18d5b08893419c7d24302
+  data.tar.gz: efac7f7c3d65640b64dc6d9b32e3bd520faebda05a72f1b88a2ee4c11546b5366db1ac42ea296ba73fe1f7873244a9f64791a180c9094a374a7ebbf1c589d491

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

@@ -0,0 +1,214 @@
+# frozen_string_literal: true
+
+require 'miga/cli/action'
+
+# Action: miga browse
+class MiGA::Cli::Action::Browse < MiGA::Cli::Action
+  def parse_cli
+    cli.parse do |opt|
+      cli.defaults = { open: true }
+      cli.opt_object(opt, [:project])
+    end
+  end
+
+  def perform
+    p = cli.load_project
+    create_empty_page(p)
+    generate_project_page(p)
+    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')}"
+  end
+
+  private
+
+  ##
+  # Create an empty page with necessary assets for project +p+
+  def create_empty_page(p)
+    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))
+    end
+    write_file(p, 'about.html') do
+      build_from_template('about.html', citation: MiGA::MiGA.CITATION)
+    end
+  end
+
+  ##
+  # Create landing page for project +p+
+  def generate_project_page(p)
+    # Redirect page
+    write_file(p, '../index.html') { build_from_template('redirect.html') }
+
+    # Summaries
+    summaries = Dir["#{p.path}/*.tsv"].map do |i|
+      b = File.basename(i)
+      "<li><a href='../#{b}'>#{b}</a></li>"
+    end.join('')
+
+    # Project index page
+    data = {
+      project_active: 'active',
+      information: format_metadata(p),
+      summaries: summaries.empty? ? 'None' : "<ul>#{summaries}</ul>",
+      results: format_results(p)
+    }
+    write_file(p, 'index.html') { build_from_template('index.html', data) }
+  end
+
+  ##
+  # Create page for dataset +d+ within project +p+
+  def generate_dataset_page(p, d)
+    data = {
+      unmiga_name: d.name.unmiga_name,
+      information: format_metadata(d),
+      results: format_results(d)
+    }
+    write_file(p, "d_#{d.name}.html") do
+      build_from_template('dataset.html', data)
+    end
+  end
+
+  ##
+  # Create pages for reference and query dataset indexes
+  def generate_datasets_index(p)
+    say 'Creating index pages'
+    data = format_dataset_index(p)
+    data.each do |k, v|
+      write_file(p, "#{k}_datasets.html") do
+        v[:list] = 'None' if v[:list] == ''
+        build_from_template(
+          'datasets.html',
+          v.merge(:"#{k}_datasets_active" => 'active')
+        )
+      end
+    end
+  end
+
+  def format_dataset_index(p)
+    data = {
+      ref: { type_name: 'Reference', list: '' },
+      qry: { type_name: 'Query', list: '' }
+    }
+    p.each_dataset do |d|
+      data[d.ref? ? :ref : :qry][:list] +=
+        "<li><a href='d_#{d.name}.html'>#{d.name.unmiga_name}</a></li>"
+    end
+    data
+  end
+
+  ##
+  # Format +obj+ metadata as a table
+  def format_metadata(obj)
+    '<table class="table table-sm table-responsive">' +
+      obj.metadata.data.map do |k, v|
+        case k
+        when /^run_/, :plugins, :user
+          next
+        when :web_assembly_gz
+          v = "<a href='#{v}'>#{v[0..50]}...</a>"
+        when :datasets
+          v = v.size
+        end
+        "<tr><td class='text-right pr-4'><b>#{format_name(k)}</b></td>" \
+             "<td>#{v}</td></tr>"
+      end.compact.join('') +
+      '</table>'
+  end
+
+  ##
+  # Format +obj+ results as cards
+  def format_results(obj)
+    o = ''
+    obj.each_result do |key, res|
+      links = format_result_links(res)
+      stats = format_result_stats(res)
+      next unless links || stats
+      name = format_name(key)
+      url_doc =
+        'http://manual.microbial-genomes.org/part5/workflow#' +
+        key.to_s.tr('_', '-')
+      o += <<~CARD
+        <div class="col-md-6 mb-4">
+          <h3>#{name}</h3>
+          <div class='border-left p-3'>
+            #{stats}
+            #{links}
+          </div>
+          <div class='border-top p-2 bg-light'>
+            <a target=_blank href="#{url_doc}" class='p-2'>Learn more</a>
+          </div>
+        </div>
+      CARD
+    end
+    "<div class='row'>#{o}</div>"
+  end
+
+  def format_name(str)
+    str
+      .to_s.unmiga_name
+      .sub(/^./, &:upcase)
+      .gsub(/(Aai|Ani|Ogs|Cds|Ssu| db$| ssu )/, &:upcase)
+      .sub(/Haai/, 'hAAI')
+      .sub(/Mytaxa/, 'MyTaxa')
+      .sub(/ pvalue$/, ' p-value')
+      .sub(/contigs$/, 'Contigs')
+  end
+
+  def format_result_links(res)
+    links = []
+    res.each_file do |key, _|
+      name = format_name(key)
+      links << "<a href='../#{res.file_path(key, true)}'>#{name}</a><br/>"
+    end
+    links.empty? ? nil : links.join('')
+  end
+
+  def format_result_stats(res)
+    res.stats.map do |k, v|
+      v = [v, ''] unless v.is_a? Array
+      v[0] = ('%.3g' % v[0]) if v[0].is_a? Float
+      "<b>#{format_name(k)}:</b> #{v[0]}#{v[1]}<br/>"
+    end.join('') + '<br/>' unless res.stats.empty?
+  end
+
+  ##
+  # Write +file+ within the browse folder of project +p+ using the passed
+  # block output as content
+  def write_file(p, file)
+    File.open(browse_file(p, file), 'w') { |fh| fh.print yield }
+  end
+
+  ##
+  # Use a +template+ file to generate content with a hash of +data+ over the
+  # layout page if +layout+ is true
+  def build_from_template(template, data = {}, layout = true)
+    cont = File.read(template_file(template)).miga_variables(data)
+    return cont unless layout
+
+    build_from_template(
+      'layout.html',
+      data.merge(content: cont, project_name: cli.load_project.name),
+      false
+    )
+  end
+
+  ##
+  # Path to the template browse file
+  def template_file(file)
+    File.join(
+      MiGA::MiGA.root_path,
+      'lib', 'miga', 'cli', 'action', 'browse', file
+    )
+  end
+
+  ##
+  # Path to the browse file in the project
+  def browse_file(p, file)
+    File.join(p.path, 'browse', file)
+  end
+end

data/lib/miga/cli/action/browse/about.html

@@ -0,0 +1,31 @@
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">About MiGA</h1>
+<p>
+MiGA is developed and maintained by
+<a href='https://rodriguez-r.com/'>Luis M. Rodriguez-R</a>.
+
+The MiGA codebase is
+<a href='http://code.microbial-genomes.org/miga'>freely available</a> under the
+terms of the terms of the
+<a href='http://code.microbial-genomes.org/miga/blob/master/LICENSE'>Artistic License 2.0</a>.
+</p>
+
+<p>
+MiGA is the result of a collaboration between the
+<a href='http://enve-omics.gatech.edu/'>Kostas Lab</a>
+(<a href='http://www.gatech.edu/'>Georgia Institute of Technology</a>) and the
+<a href='http://rdp.cme.msu.edu/'>RDP team</a>
+(<a href='http://cme.msu.edu/'>Center for Microbial Ecology</a>,
+<a href='https://msu.edu/'>Michigan State University</a>).
+The MiGA project is funded by the
+<a href='http://nsf.gov/'>US National Science Foundation</a>
+(Awards <a href='http://nsf.gov/awardsearch/showAward?AWD_ID=1356288'>#1356288</a> &amp;
+<a href='https://xras.xsede.org/public/requests/31162-XSEDE-MCB190042-1190572'>#MCB190042</a>).
+</p>
+
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">Citation</h1>
+If you use MiGA in your work, consider citing:
+<blockquote class='border-left p-3'>
+{{citation}}
+</blockquote>
+
+

data/lib/miga/cli/action/browse/dataset.html

@@ -0,0 +1,5 @@
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">{{unmiga_name}}</h1>
+{{information}}
+
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">Results</h1>
+{{results}}

data/lib/miga/cli/action/browse/dataset_menu_item.html

@@ -0,0 +1,3 @@
+<li class="nav-item">
+  <a class="nav-link" href="ds_{{name}}.html">{{unmiga_name}}</a>
+</li>

data/lib/miga/cli/action/browse/datasets.html

@@ -0,0 +1,4 @@
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">{{type_name}} Datasets</h1>
+<ul>
+  {{list}}
+</ul>

data/lib/miga/cli/action/browse/index.html

@@ -0,0 +1,8 @@
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">Project Information</h1>
+{{information}}
+
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">Summaries</h1>
+{{summaries}}
+
+<h1 class="h2 border-bottom pt-3 pb-2 mb-3">Project Results</h1>
+{{results}}

data/lib/miga/cli/action/browse/layout.html

@@ -0,0 +1,57 @@
+<!doctype html>
+<head>
+  <meta charset="utf-8">
+  <title>MiGA | {{project_name}}</title>
+
+  <!-- Remote assets -->
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
+  <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+
+  <!-- Local assets -->
+  <link href="style.css" rel="stylesheet">
+  <link rel="icon" href="favicon-32.png" sizes="32x32" type="image/png">
+</head>
+<body>
+  <nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
+    <a class="navbar-brand col-md-12 col-lg-12 mr-0 px-3"
+          href="index.html">MiGA | {{project_name}}</a>
+    <button class="navbar-toggler position-absolute d-md-none collapsed"
+          type="button" data-toggle="collapse" data-target="#sidebarMenu"
+          aria-controls="sidebarMenu" aria-expanded="false"
+          aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+  </nav>
+  <div class="container-fluid">
+  <div class="row">
+    <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
+      <div class="sidebar-sticky pt-3">
+        <ul class="nav flex-column">
+          <li class="nav-item">
+            <a class="nav-link {{project_active}}" href="index.html">Project</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link {{ref_datasets_active}}"
+                  href="ref_datasets.html">Reference datasets</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link {{qry_datasets_active}}"
+                  href="qry_datasets.html">Query datasets</a>
+          </li>
+          <li class="nav-item border-top mt-4">
+            <a class="nav-link {{about_miga_active}}"
+                  href="about.html">About MiGA</a>
+          </li>
+        </ul>
+      </div>
+    </nav>
+
+    <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
+      {{content}}
+    </main>
+  </div>
+</div>
+</body>
+

data/lib/miga/cli/action/browse/redirect.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<head>
+  <title>MiGA Project</title>
+  <meta http-equiv = "refresh" content = "1; url = browse/index.html" />
+</head>
+<body>
+  <div style='font-size:200%; margin-top: 5em; text-align: center;'>
+    Redirecting to <a href='browse/index.html'>Project page</a>...
+  </div>
+</body>
+

data/lib/miga/cli/action/browse/style.css

@@ -0,0 +1,97 @@
+body {
+  font-size: .875rem;
+}
+
+/*
+ * Sidebar
+ */
+
+.sidebar {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 100; /* Behind the navbar */
+  padding: 48px 0 0; /* Height of navbar */
+  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
+}
+
+@media (max-width: 767.98px) {
+  .sidebar {
+    top: 3rem;
+  }
+}
+
+.sidebar-sticky {
+  position: relative;
+  top: 0;
+  height: calc(100vh - 48px);
+  padding-top: .5rem;
+  overflow-x: hidden;
+  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
+}
+
+@supports ((position: -webkit-sticky) or (position: sticky)) {
+  .sidebar-sticky {
+    position: -webkit-sticky;
+    position: sticky;
+  }
+}
+
+.sidebar .nav-link {
+  font-weight: 500;
+  color: #333;
+}
+
+.sidebar .nav-link .feather {
+  margin-right: 4px;
+  color: #999;
+}
+
+.sidebar .nav-link.active {
+  color: #007bff;
+}
+
+.sidebar .nav-link:hover .feather,
+.sidebar .nav-link.active .feather {
+  color: inherit;
+}
+
+.sidebar-heading {
+  font-size: .75rem;
+  text-transform: uppercase;
+}
+
+/*
+ * Navbar
+ */
+
+.navbar-brand {
+  padding-top: .75rem;
+  padding-bottom: .75rem;
+  font-size: 1rem;
+  background-color: rgba(0, 0, 0, .25);
+  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
+}
+
+.navbar .navbar-toggler {
+  top: .25rem;
+  right: 1rem;
+}
+
+.navbar .form-control {
+  padding: .75rem 1rem;
+  border-width: 0;
+  border-radius: 0;
+}
+
+.form-control-dark {
+  color: #fff;
+  background-color: rgba(255, 255, 255, .1);
+  border-color: rgba(255, 255, 255, .1);
+}
+
+.form-control-dark:focus {
+  border-color: transparent;
+  box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
+}

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

@@ -19,6 +19,10 @@ class MiGA::Cli::Action::DerepWf < MiGA::Cli::Action
         'Use Average Amino Acid Identity (AAI) as genome similarity metric',
         'By default: Use Average Nucleotide Identity (ANI)'
       ) { cli[:metric] = :aai }
+      opt.on(
+        '--ani',
+        'Use Average Nucleotide Identity (ANI) as similarity metric (default)'
+      ) { cli[:metric] = :ani }
       opt.on(
         '--threshold FLOAT', Float,
         "Metric threshold (%) to dereplicate. By default: #{cli[:threshold]}"

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

@@ -38,7 +38,7 @@ class MiGA::Cli::Action::Stats < MiGA::Cli::Action
     end
     if cli[:key].nil?
       r[:stats].each do |k, v|
-        k_n = k == :g_c_content ? 'G+C content' : k.to_s.unmiga_name.capitalize
+        k_n = k.to_s.unmiga_name.sub(/^./, &:upcase)
         cli.puts "#{k_n}: #{v.is_a?(Array) ? v.join(' ') : v}"
       end
     else

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

@@ -169,6 +169,7 @@ module MiGA::Cli::Action::Wf
                  '--tab', '--ref', '--active'
                ])
     end
+    call_cli(['browse', '-P', cli[:outdir]])
   end
 
   def cleanup

data/lib/miga/cli/base.rb

@@ -11,39 +11,40 @@ module MiGA::Cli::Base
     preproc_wf: 'Preprocess input genomes or metagenomes',
     index_wf: 'Generate distance indexing of input genomes',
     # Projects
-    new: 'Creates an empty MiGA project',
-    about: 'Displays information about a MiGA project',
-    doctor: 'Performs consistency checks on a MiGA project',
-    get_db: 'Downloads a pre-indexed database',
+    new: 'Create an empty MiGA project',
+    about: 'Display information about a MiGA project',
+    doctor: 'Perform consistency checks on a MiGA project',
+    get_db: 'Download a pre-indexed database',
+    browse: 'Explore a project locally using a web browser',
     # Datasets
-    add: 'Creates a dataset in a MiGA project',
-    get: 'Downloads a dataset from public databases into a MiGA project',
-    ncbi_get: 'Downloads all genomes in a taxon from NCBI into a MiGA project',
-    rm: 'Removes a dataset from an MiGA project',
-    find: 'Finds unregistered datasets based on result files',
+    add: 'Create a dataset in a MiGA project',
+    get: 'Download a dataset from public databases into a MiGA project',
+    ncbi_get: 'Download all genomes in a taxon from NCBI into a MiGA project',
+    rm: 'Remove a dataset from an MiGA project',
+    find: 'Find unregistered datasets based on result files',
     ln: 'Link datasets (including results) from one project to another',
-    ls: 'Lists all registered datasets in an MiGA project',
-    archive: 'Generates a tar-ball with all files from select datasets',
+    ls: 'List all registered datasets in an MiGA project',
+    archive: 'Generate a tar-ball with all files from select datasets',
     # Results
-    add_result: 'Registers a result',
-    stats: 'Extracts statistics for the given result',
-    files: 'Lists registered files from the results of a dataset or project',
-    run: 'Executes locally one step analysis producing the given result',
-    summary: 'Generates a summary table for the statistics of all datasets',
-    next_step: 'Returns the next task to run in a dataset or project',
+    add_result: 'Register a result',
+    stats: 'Extract statistics for the given result',
+    files: 'List registered files from the results of a dataset or project',
+    run: 'Execute locally one step analysis producing the given result',
+    summary: 'Generate a summary table for the statistics of all datasets',
+    next_step: 'Return the next task to run in a dataset or project',
     # Objects (Datasets or Projects)
-    edit: 'Edits the metadata of a dataset or project',
+    edit: 'Edit the metadata of a dataset or project',
     # System
     init: 'Initialize MiGA to process new projects',
-    daemon: 'Controls the daemon of a MiGA project',
-    lair: 'Controls groups of daemons for several MiGA projects',
-    date: 'Returns the current date in standard MiGA format',
-    console: 'Opens an IRB console with MiGA',
+    daemon: 'Control the daemon of a MiGA project',
+    lair: 'Control groups of daemons for several MiGA projects',
+    date: 'Return the current date in standard MiGA format',
+    console: 'Open an IRB console with MiGA',
     # Taxonomy
-    tax_set: 'Registers taxonomic information for datasets',
-    tax_test: 'Returns test of taxonomic distributions for query datasets',
-    tax_index: 'Creates a taxonomy-indexed list of the datasets',
-    tax_dist: 'Estimates distributions of distance by taxonomy',
+    tax_set: 'Register taxonomic information for datasets',
+    tax_test: 'Return test of taxonomic distributions for query datasets',
+    tax_index: 'Create a taxonomy-indexed list of the datasets',
+    tax_dist: 'Estimate distributions of distance by taxonomy',
   }
 
   @@TASK_ALIAS = {

data/lib/miga/common/format.rb

@@ -68,15 +68,20 @@ module MiGA::Common::Format
   # a FastA or FastQ file (supports gzipped files). The +format+ must be a
   # Symbol, one of +:fasta+ or +:fastq+. Additional estimations can be
   # controlled via the +opts+ Hash. Supported options include:
-  # - +:n50+: If true, it also returns the N50 and the median (in bp)
-  # - +:gc+: If true, it also returns the G+C content (in %)
-  # - +:x+: If true, it also returns the undetermined bases content (in %)
+  # - +:n50+: Include the N50 and the median (in bp)
+  # - +:gc+: Include the G+C content (in %)
+  # - +:x+: Include the undetermined bases content (in %)
+  # - +:skew+: Include G-C and A-T sequence skew (in %; forces gc: true).
+  #   See definition used here in DOI:10.1177/117693430700300006
   def seqs_length(file, format, opts = {})
+    opts[:gc] = true if opts[:skew]
     fh = file =~ /\.gz/ ? Zlib::GzipReader.open(file) : File.open(file, 'r')
     l = []
     gc = 0
     xn = 0
-    i = 0 # <- Zlib::GzipReader doesn't set `$.`
+    t  = 0
+    c  = 0
+    i  = 0 # <- Zlib::GzipReader doesn't set `$.`
     fh.each_line do |ln|
       i += 1
       if (format == :fasta and ln =~ /^>/) or
@@ -86,6 +91,10 @@ module MiGA::Common::Format
         l[l.size - 1] += ln.chomp.size
         gc += ln.scan(/[GCgc]/).count if opts[:gc]
         xn += ln.scan(/[XNxn]/).count if opts[:x]
+        if opts[:skew]
+          t += ln.scan(/[Tt]/).count
+          c += ln.scan(/[Cc]/).count
+        end
       end
     end
     fh.close
@@ -97,6 +106,12 @@ module MiGA::Common::Format
     o[:sd]  = Math.sqrt o[:var]
     o[:gc]  = 100.0 * gc / o[:tot] if opts[:gc]
     o[:x]   = 100.0 * xn / o[:tot] if opts[:x]
+    if opts[:skew]
+      at = o[:tot] - gc
+      o[:at_skew] = 100.0 * (2 * t - at) / at
+      o[:gc_skew] = 100.0 * (2 * c - gc) / gc
+    end
+
     if opts[:n50]
       l.sort!
       thr = o[:tot] / 2
@@ -132,9 +147,14 @@ class String
   end
 
   ##
-  # Replace underscores by spaces or dots (depending on context).
+  # Replace underscores by spaces or other symbols depending on context
   def unmiga_name
-    gsub(/_(str|sp|subsp|pv)__/, '_\\1._').tr('_', ' ')
+    gsub(/_(str|sp|subsp|pv)__/, '_\\1._')
+      .gsub(/g_c_(content)/, 'G+C \\1')
+      .gsub(/g_c_(skew)/, 'G-C \\1')
+      .gsub(/a_t_(skew)/, 'A-T \\1')
+      .gsub(/x_content/, &:capitalize)
+      .tr('_', ' ')
   end
 
   ##

data/lib/miga/daemon.rb

@@ -185,7 +185,7 @@ class MiGA::Daemon < MiGA::MiGA
     return if project.dataset_names.empty?
 
     # Double-check if all datasets are ready
-    return unless project.done_preprocessing?(false)
+    return unless project.done_preprocessing?
 
     # Queue project-level job
     to_run = project.next_task(nil, false)

data/lib/miga/dataset/base.rb

@@ -66,7 +66,7 @@ module MiGA::Dataset::Base
   @@PREPROCESSING_TASKS = [
     :raw_reads, :trimmed_reads, :read_quality, :trimmed_fasta,
     :assembly, :cds, :essential_genes, :ssu, :mytaxa, :mytaxa_scan,
-    :distances, :taxonomy, :stats
+    :taxonomy, :distances, :stats
   ]
 
   ##
@@ -77,7 +77,7 @@ module MiGA::Dataset::Base
   ##
   # Tasks to be executed only in datasets that are not multi-organism. These
   # tasks are ignored for multi-organism datasets or for unknown types.
-  @@ONLY_NONMULTI_TASKS = [:mytaxa_scan, :distances, :taxonomy]
+  @@ONLY_NONMULTI_TASKS = [:mytaxa_scan, :taxonomy, :distances]
   @@_ONLY_NONMULTI_TASKS_H = Hash[@@ONLY_NONMULTI_TASKS.map { |i| [i, true] }]
 
   ##

data/lib/miga/dataset/result.rb

@@ -26,15 +26,24 @@ module MiGA::Dataset::Result
   # The values are symbols:
   # - empty: the dataset has no data
   # - inactive: the dataset is inactive
+  # - upstream: the task is upstream from dataset's input
   # - force: forced to ignore by metadata
   # - project: incompatible project
   # - noref: incompatible dataset, only for reference
   # - multi: incompatible dataset, only for multi
   # - nonmulti: incompatible dataset, only for nonmulti
+  # - complete: the task is already complete
   # - execute: do not ignore, execute the task
   def why_ignore(task)
-    if !active?
+    if !get_result(task).nil?
+      :complete
+    elsif !active?
       :inactive
+    elsif first_preprocessing.nil?
+      :empty
+    elsif @@PREPROCESSING_TASKS.index(task) <
+          @@PREPROCESSING_TASKS.index(first_preprocessing)
+      :upstream
     elsif !metadata["run_#{task}"].nil?
       metadata["run_#{task}"] ? :execute : :force
     elsif task == :taxonomy && project.metadata[:ref_project].nil?
@@ -56,7 +65,7 @@ module MiGA::Dataset::Result
   # initial input. Passes +save+ to #add_result.
   def first_preprocessing(save = false)
     @first_processing ||= @@PREPROCESSING_TASKS.find do |t|
-      !ignore_task?(t) && !add_result(t, save).nil?
+      !add_result(t, save).nil?
     end
   end
 
@@ -121,17 +130,12 @@ module MiGA::Dataset::Result
   # - complete: a task with registered results
   # - pending: a task queued to be performed
   def result_status(task)
-    if first_preprocessing.nil?
-      :ignore_empty
-    elsif !get_result(task).nil?
-      :complete
-    elsif @@PREPROCESSING_TASKS.index(task) <
-          @@PREPROCESSING_TASKS.index(first_preprocessing)
-      :-
-    elsif ignore_task?(task)
-      :"ignore_#{why_ignore task}"
-    else
-      :pending
+    reason = why_ignore(task)
+    case reason
+    when :upstream; :-
+    when :execute; :pending
+    when :complete; :complete
+    else; :"ignore_#{reason}"
     end
   end
 

data/lib/miga/lair.rb

@@ -111,7 +111,7 @@ class MiGA::Lair < MiGA::MiGA
 
         yield(project)
       elsif Dir.exist? f
-        each_project(f) { |project| yield(project) }
+        each_project(f) { |p| yield(p) }
       end
     end
   end

data/lib/miga/project/dataset.rb

@@ -134,12 +134,10 @@ module MiGA::Project::Dataset
   ##
   # Are all the datasets in the project preprocessed? Save intermediate results
   # if +save+ (until the first incomplete dataset is reached).
-  def done_preprocessing?(save = true)
-    dataset_names.each do |dn|
-      ds = dataset(dn)
-      return false if ds.is_ref? and not ds.done_preprocessing?(save)
+  def done_preprocessing?(save = false)
+    !each_dataset.any? do |d|
+      d.ref? && d.active? && !d.done_preprocessing?(save)
     end
-    true
   end
 
   ##

data/lib/miga/result.rb

@@ -81,20 +81,22 @@ class MiGA::Result < MiGA::MiGA
   end
 
   ##
-  # Directory containing the result
-  def dir
-    File.dirname(path)
+  # Directory containing the result; by default an absolute path, if
+  # +relative+ is true returns the path relative to the parent project
+  def dir(relative = false)
+    relative ? relative_dir : File.dirname(path)
   end
 
   ##
-  # Absolute path to the file(s) defined by symbol +k+
-  def file_path(k)
+  # Absolute path to the file(s) defined by symbol +k+, or relative
+  # path if +relative+ is true
+  def file_path(k, relative = false)
     k = k.to_sym
     f = self[:files].nil? ? nil : self[:files][k]
     return nil if f.nil?
-    return File.expand_path(f, dir) unless f.is_a? Array
+    return File.join(dir(relative), f) unless f.is_a? Array
 
-    f.map { |fi| File.expand_path(fi, dir) }
+    f.map { |fi| File.join(dir(relative), fi) }
   end
 
   ##

data/lib/miga/result/stats.rb

@@ -17,32 +17,45 @@ module MiGA::Result::Stats
     self[:stats]
   end
 
+  ##
+  # Access the stats entry of results
+  def stats
+    self[:stats]
+  end
+
   private
 
   def compute_stats_raw_reads
     stats = {}
+    seq_opts = { gc: true, x: true, skew: true }
     if self[:files][:pair1].nil?
-      s = MiGA::MiGA.seqs_length(file_path(:single), :fastq, gc: true, x: true)
+      s = MiGA::MiGA.seqs_length(file_path(:single), :fastq, seq_opts)
       stats = {
         reads: s[:n],
         length_average: [s[:avg], 'bp'],
         length_standard_deviation: [s[:sd], 'bp'],
         g_c_content: [s[:gc], '%'],
-        x_content: [s[:x], '%']
+        x_content: [s[:x], '%'],
+        g_c_skew: [s[:gc_skew], '%'],
+        a_t_skew: [s[:at_skew], '%']
       }
     else
-      s1 = MiGA::MiGA.seqs_length(file_path(:pair1), :fastq, gc: true, x: true)
-      s2 = MiGA::MiGA.seqs_length(file_path(:pair2), :fastq, gc: true, x: true)
+      s1 = MiGA::MiGA.seqs_length(file_path(:pair1), :fastq, seq_opts)
+      s2 = MiGA::MiGA.seqs_length(file_path(:pair2), :fastq, seq_opts)
       stats = {
         read_pairs: s1[:n],
         forward_length_average: [s1[:avg], 'bp'],
         forward_length_standard_deviation: [s1[:sd], 'bp'],
         forward_g_c_content: [s1[:gc], '%'],
         forward_x_content: [s1[:x], '%'],
+        forward_g_c_skew: [s1[:gc_skew], '%'],
+        forward_a_t_skew: [s1[:at_skew], '%'],
         reverse_length_average: [s2[:avg], 'bp'],
         reverse_length_standard_deviation: [s2[:sd], 'bp'],
         reverse_g_c_content: [s2[:gc], '%'],
-        reverse_x_content: [s2[:x], '%']
+        reverse_x_content: [s2[:x], '%'],
+        reverse_g_c_skew: [s2[:gc_skew], '%'],
+        reverse_a_t_skew: [s2[:at_skew], '%']
       }
     end
     stats
@@ -50,19 +63,22 @@ module MiGA::Result::Stats
 
   def compute_stats_trimmed_fasta
     f = self[:files][:coupled].nil? ? file_path(:single) : file_path(:coupled)
-    s = MiGA::MiGA.seqs_length(f, :fasta, gc: true, x: true)
+    s = MiGA::MiGA.seqs_length(f, :fasta, gc: true, x: true, skew: true)
     {
       reads: s[:n],
       length_average: [s[:avg], 'bp'],
       length_standard_deviation: [s[:sd], 'bp'],
       g_c_content: [s[:gc], '%'],
-      x_content: [s[:x], '%']
+      x_content: [s[:x], '%'],
+      g_c_skew: [s[:gc_skew], '%'],
+      a_t_skew: [s[:at_skew], '%']
     }
   end
 
   def compute_stats_assembly
     s = MiGA::MiGA.seqs_length(
-      file_path(:largecontigs), :fasta, n50: true, gc: true, x: true
+      file_path(:largecontigs), :fasta,
+      n50: true, gc: true, x: true, skew: true
     )
     {
       contigs: s[:n],
@@ -70,7 +86,9 @@ module MiGA::Result::Stats
       total_length: [s[:tot], 'bp'],
       longest_sequence: [s[:max], 'bp'],
       g_c_content: [s[:gc], '%'],
-      x_content: [s[:x], '%']
+      x_content: [s[:x], '%'],
+      g_c_skew: [s[:gc_skew], '%'],
+      a_t_skew: [s[:at_skew], '%']
     }
   end
 
@@ -133,9 +151,9 @@ module MiGA::Result::Stats
       source.save
 
       # Inactivate low-quality datasets
-      min_qual = (project.metadata[:min_qual] || 50)
+      min_qual = (project.metadata[:min_qual] || 25)
       if min_qual != 'no' && stats[:quality] < min_qual
-        source.inactivate! 'Low genome quality'
+        source.inactivate! 'Low quality genome'
       end
     end
     stats

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, 10, 0]
+  VERSION = [0.7, 12, 2]
 
   ##
   # Nickname for the current major.minor version.
@@ -16,7 +16,7 @@ module MiGA
 
   ##
   # Date of the current gem release.
-  VERSION_DATE = Date.new(2020, 6, 29)
+  VERSION_DATE = Date.new(2020, 7, 24)
 
   ##
   # Reference of MiGA.

data/scripts/cds.bash

@@ -20,7 +20,6 @@ fi
 TYPE=$(miga ls -P "$PROJECT" -D "$DATASET" -m type | cut -f 2)
 case "$TYPE" in
   metagenome|virome)
-    $CMD -p meta
     prodigal -a "${DATASET}.faa" -d "${DATASET}.fna" -o "${DATASET}.gff3" \
       -f gff -q -i "../05.assembly/${DATASET}.LargeContigs.fna" -p meta
     ;;

data/test/project_test.rb

@@ -108,7 +108,7 @@ class ProjectTest < Test::Unit::TestCase
     d1 = p1.add_dataset('BAH')
     assert_not_predicate(p1, :done_preprocessing?)
     FileUtils.touch(File.join(p1.path, 'data', '90.stats', "#{d1.name}.done"))
-    assert_predicate(p1, :done_preprocessing?)
+    assert { p1.done_preprocessing? true }
     assert_nil(p1.next_inclade)
     p1.metadata[:type] = :clade
     assert_equal(:subclades, p1.next_inclade)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 0.7.10.0
+  version: 0.7.12.2
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -118,6 +118,16 @@ files:
 - lib/miga/cli/action/add.rb
 - lib/miga/cli/action/add_result.rb
 - lib/miga/cli/action/archive.rb
+- lib/miga/cli/action/browse.rb
+- lib/miga/cli/action/browse/about.html
+- lib/miga/cli/action/browse/dataset.html
+- lib/miga/cli/action/browse/dataset_menu_item.html
+- lib/miga/cli/action/browse/datasets.html
+- lib/miga/cli/action/browse/favicon-32.png
+- lib/miga/cli/action/browse/index.html
+- lib/miga/cli/action/browse/layout.html
+- lib/miga/cli/action/browse/redirect.html
+- lib/miga/cli/action/browse/style.css
 - lib/miga/cli/action/classify_wf.rb
 - lib/miga/cli/action/console.rb
 - lib/miga/cli/action/daemon.rb