miga-base 1.3.13.6 → 1.3.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ce0bd3f3cd40ab7c4883d729bf43a1eb18303d034063714dcc0ae7944079c7
-  data.tar.gz: '03957e37bb90e94a63c4a746fbccab48965dc29c614439b19848ffe8f40ee98c'
+  metadata.gz: e3bafd65eb344dccfd8a2b1601a2fc28282c17f8826565c6d0393161ad407b6b
+  data.tar.gz: cf47cca552f8651fe821af0431f579ef8958fb81371974fe5233391077a6405d
 SHA512:
-  metadata.gz: abe0f5938f5af2686bcc7c4d810c9ce0388e561250f1b4422234ba91e0dae0a7e9bc2b9dcbf8105edfd128d9110f7b72c79a88df1084f86b38cdac23323ba298
-  data.tar.gz: fbff0a7738631a4b8756d2c6ff49520e07903391ca07d4a68a2b8e2ace65e56bd8297a33a5ea8b999a805a552454e4e621af337ca772ee864f851975e471f340
+  metadata.gz: 9d8bebf5ac6267645fcaf2129d61dc516552a63790ef329310631c8db6e55f14d5ebcbe486eccef8898cd0a3036e6a448810ffe41a44810f351e2217a1f31817
+  data.tar.gz: 252d4fa1a39137358ce381bcdecebc9f1b5a40321c99b3ed059755555dbee3fd931fd77209d14d3b59ed236e51c53fa97d4668f9ad153ec7bdc2f02d205a1161

data/lib/miga/cli/action/doctor/base.rb

@@ -73,7 +73,9 @@ module MiGA::Cli::Action::Doctor::Base
 
   ##
   # Reads all the distance estimates in +a+ -> * for +metric+ and
-  # returns them as a hash +{"b_name" => [val, sd, ...], ...}+
+  # returns them as a hash +{"b_name" => [val, sd, ...], ...}+ for
+  # rows with values other than the metric, or +{"b_name" => val}+ for
+  # rows with the metric only
   def read_bidirectional(a, metric)
     db_file = a.result(:distances)&.file_path("#{metric}_db") or return {}
     sql = "select seq2, #{metric}, sd, n, omega from #{metric}"

data/lib/miga/cli/action/doctor/distances.rb

@@ -70,10 +70,10 @@ module MiGA::Cli::Action::Doctor::Distances
   #---- Auxuliary functions -----
 
   ##
-  # Make a temporal directory holding partial bidirectionality reports (one per thread)
-  # in a custom multi-JSON format. Requires a MiGA::Project +project+ and the iterator of
-  # the reference datasets +ref_ds+. Returns the path to the temporal directory created.
-  # Used by +check_bidir+
+  # Make a temporal directory holding partial bidirectionality reports (one per
+  # thread) in a custom multi-JSON format. Requires a MiGA::Project +project+
+  # and the iterator of the reference datasets +ref_ds+. Returns the path to the
+  # temporal directory created. Used by +check_bidir+
   def partial_bidir_tmp(project, ref_ds)
     n = ref_ds.size
 
@@ -106,9 +106,9 @@ module MiGA::Cli::Action::Doctor::Distances
   end
 
   ##
-  # Read partial temporal reports of bidirectionality (located in +tmp+), and return
-  # a two-deep hash with the final missingness report by metric (first key) and
-  # dataset name (second key). Used by +check_bidir+
+  # Read partial temporal reports of bidirectionality (located in +tmp+), and
+  # return a two-deep hash with the final missingness report by metric (first
+  # key) and dataset name (second key). Used by +check_bidir+
   def merge_bidir_tmp(tmp)
     dist = { aai: {}, ani: {} }
     cli[:threads].times do |i|

data/lib/miga/cli/action/doctor/operations.rb

@@ -58,7 +58,7 @@ module MiGA::Cli::Action::Doctor::Operations
         unless ok
           cli.say "  > Registering again #{d.name}:#{r_k}   "
           d.add_result(r_k, true, force: true)
-          sr = d.result(:stats) and sr.remove!
+          d.result(:stats)&.remove!
         end
       end
     end

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

@@ -15,7 +15,7 @@ class MiGA::Cli::Action::Env < MiGA::Cli::Action
       . "$MIGA_HOME/.miga_rc"
       # Ensure MiGA & submodules are first in PATH
       export PATH="$MIGA/bin:$PATH"
-      for util in enveomics/Scripts FastAAI/FastAAI FastAAI multitrim ; do
+      for util in enveomics/Scripts FastAAI/fastaai multitrim ; do
         export PATH="$MIGA/utils/$util:$PATH"
       done
     BASH

data/lib/miga/result.rb

@@ -33,14 +33,26 @@ class MiGA::Result < MiGA::MiGA
     ##
     # Check if +path+ describes a result and otherwise create
     # it using the passed block. If +force+, ignore existing
-    # JSON in +path+ if any.
+    # JSON in +path+ if any, but it can rescue the versions 
+    # field from the old one if it exists and the new one doesn't
+    # contain such field.
     def create(path, force = false)
-      FileUtils.rm(path) if force && File.exist?(path)
-      r_pre = load(path)
-      return r_pre unless r_pre.nil?
+      # Deal with old results first
+      r_old = load(path)
+      return r_old if r_old && !force
 
+      # Create the new result using the block passed
+      FileUtils.rm(path) if r_old
       yield
-      load(path)
+
+      # Load and return
+      load(path).tap do |r_new|
+        # Rescue versions and start (if any and if necessary)
+        if r_old
+          %i[versions started].each { |i| r_new[i] ||= r_old[i] }
+          r_new[:versions] = (r_old[:versions] || {}).merge(r_new[:versions])
+        end
+      end
     end
   end
 

data/lib/miga/version.rb

@@ -12,7 +12,7 @@ module MiGA
   # - String indicating release status:
   #   - rc* release candidate, not released as gem
   #   - [0-9]+ stable release, released as gem
-  VERSION = [1.3, 13, 6].freeze
+  VERSION = [1.3, 13, 8].freeze
 
   ##
   # Nickname for the current major.minor version.
@@ -20,7 +20,7 @@ module MiGA
 
   ##
   # Date of the current gem relese.
-  VERSION_DATE = Date.new(2024, 3, 20)
+  VERSION_DATE = Date.new(2024, 3, 23)
 
   ##
   # References of MiGA

data/test/result_stats_test.rb

@@ -23,12 +23,12 @@ class ResultStatsTest < Test::Unit::TestCase
     File.open(fq, 'w') { |fh| fh.puts '@1', 'ACTAC', '+', '####' }
     touch_done(dir)
     r = dataset.add_result(:raw_reads)
-    assert_equal({}, r[:stats])
+    assert_equal({}, r.stats)
     r.compute_stats
-    assert_not_empty(r[:stats])
-    assert_equal(Hash, r[:stats].class)
-    assert_equal(1, r[:stats][:reads])
-    assert_equal([40.0, '%'], r[:stats][:g_c_content])
+    assert_not_empty(r.stats)
+    assert_equal(Hash, r.stats.class)
+    assert_equal(1, r.stats[:reads])
+    assert_equal([40.0, '%'], r.stats[:g_c_content])
   end
 
   def test_coupled_raw_reads
@@ -40,10 +40,10 @@ class ResultStatsTest < Test::Unit::TestCase
     touch_done(dir)
     r = dataset.add_result(:raw_reads)
     r.compute_stats
-    assert_not_empty(r[:stats])
-    assert_nil(r[:stats][:reads])
-    assert_equal(1, r[:stats][:read_pairs])
-    assert_equal([40.0, '%'], r[:stats][:reverse_g_c_content])
+    assert_not_empty(r.stats)
+    assert_nil(r.stats[:reads])
+    assert_equal(1, r.stats[:read_pairs])
+    assert_equal([40.0, '%'], r.stats[:reverse_g_c_content])
   end
 
   def test_trimmed_reads
@@ -51,9 +51,9 @@ class ResultStatsTest < Test::Unit::TestCase
     FileUtils.touch(file_path(dir, '.1.clipped.fastq'))
     touch_done(dir)
     r = dataset.add_result(:trimmed_reads)
-    assert_equal({}, r[:stats])
+    assert_equal({}, r.stats)
     r.compute_stats
-    assert_equal({}, r[:stats])
+    assert_equal({}, r.stats)
   end
 
   def test_read_quality
@@ -62,9 +62,9 @@ class ResultStatsTest < Test::Unit::TestCase
     Dir.mkdir(file_path(dir, '.fastqc'))
     touch_done(dir)
     r = dataset.add_result(:read_quality)
-    assert_equal({}, r[:stats])
+    assert_equal({}, r.stats)
     r.compute_stats
-    assert_equal({}, r[:stats])
+    assert_equal({}, r.stats)
   end
 
   def test_trimmed_fasta
@@ -133,10 +133,10 @@ class ResultStatsTest < Test::Unit::TestCase
     r = dataset.add_result(:taxonomy)
 
     # Test assertions
-    assert_nil(r[:stats][:closest_relative])
+    assert_nil(r.stats[:closest_relative])
     r.compute_stats
-    assert_equal('dad', r[:stats][:closest_relative])
-    assert_equal([100.0, '%'], r[:stats][:aai])
-    assert_equal(0.0, r[:stats][:phylum_pvalue])
+    assert_equal('dad', r.stats[:closest_relative])
+    assert_equal([100.0, '%'], r.stats[:aai])
+    assert_equal(0.0, r.stats[:phylum_pvalue])
   end
 end

data/test/result_test.rb

@@ -26,6 +26,30 @@ class ResultTest < Test::Unit::TestCase
     assert_instance_of(MiGA::Result, r)
   end
 
+  def test_overwrite_result
+    r = dataset.add_result(:trimmed_reads)
+    r[:ephemeral] = '@'
+    r[:versions] = { you: 'best' }
+    r.save
+
+    # Before reloading
+    assert_equal('@', r[:ephemeral])
+    assert_equal('best', r[:versions][:you])
+    assert_nil(r[:versions][:MiGA])
+
+    # After reloading (without forcing)
+    r = dataset.add_result(:trimmed_reads, true, force: false)
+    assert_equal('@', r[:ephemeral])
+    assert_equal('best', r[:versions][:you])
+    assert_nil(r[:versions][:MiGA])
+
+    # After reloading (with forcing)
+    r = dataset.add_result(:trimmed_reads, true, force: true)
+    assert_nil(r[:ephemeral])
+    assert_equal('best', r[:versions][:you])
+    assert_not_nil(r[:versions][:MiGA])
+  end
+
   def test_unlink
     r = project.add_result(:clade_finding)
     path = r.path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.3.13.6
+  version: 1.3.13.8
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons