miga-base 0.7.16.3 → 0.7.16.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51173aea1659d14d35f485b22b4371bdf8cf9d16ae81c673d09c25cf3e36d1ac
-  data.tar.gz: 4c6cbaed4bc9f0ea2f71d75ccfd22e3b0ac38e62c138166b768feb91c9a804b3
+  metadata.gz: ede9e4d8b2ae673b55e0b28f9e78292c42791c4ad400a02ef2c9f60065c1fc26
+  data.tar.gz: ff42e5a4f220774b7863f528fd334fa73a1acca0afcbb1a7f5e32dedd15bd1c7
 SHA512:
-  metadata.gz: 6e00443678373cb3125e1d73d111ff909cfaa092c92ffd00089e2d122bad0f298133e4c4b2da00370d4ff56e3d1281b8e3ebe316e23fa675b73b217b6045e4e8
-  data.tar.gz: f5d5f2981f86e0a79a1c96b81cdb76853eeacd11a14c23d630bcf067d390074d40273159b2b95c3ea33d88d1ca1c66bce19338809af410e48a0db2138d4974d3
+  metadata.gz: d02bc826d5dee9c84705d2f0fb30e1902cb5014385efe350fa2593347cd74f10007475cd3b5610a92fa9a93cf00378c508af7bcd36fb6ed3e60faad96b35eb49
+  data.tar.gz: c094b4bb67eddc15345cf53866b03154a85b39de09c10d8ba025a1c2411fb84c74d19f81f859b9004ecd6c9417a4ce9d3fd1cb07da24cb92de2164537faf8cb6

data/bin/miga

@@ -7,4 +7,5 @@ $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 require 'miga'
 require 'miga/cli'
 
-MiGA::Cli.new(ARGV).launch
+MiGA::Cli.new(ARGV).launch(true)
+

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

@@ -165,7 +165,7 @@ class MiGA::Cli::Action::GetDb < MiGA::Cli::Action
   def check_target
     return false if cli[:overwrite]
 
-    file = File.expand_path(cli[:database], cli[:local])
+    file = File.expand_path(cli[:database].to_s, cli[:local])
     if Dir.exist? file
       warn "The target directory already exists: #{file}"
       true

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

@@ -8,7 +8,7 @@ class MiGA::Cli::Action::Run < MiGA::Cli::Action
   def parse_cli
     cli.defaults = { try_load: false, thr: 1, env: false }
     cli.parse do |opt|
-      cli.opt_object(opt, [:project, :dataset_opt, :result])
+      cli.opt_object(opt, [:project, :dataset_opt, :result_opt])
       opt.on(
         '-t', '--threads INT', Integer,
         "Threads to use in the local run (by default: #{cli[:thr]})"
@@ -37,12 +37,18 @@ class MiGA::Cli::Action::Run < MiGA::Cli::Action
       cli[:thr] ||= ENV['CORES'].to_i unless ENV['CORES'].nil?
       cli[:result] = File.basename(cli[:result].to_s, '.bash').to_sym
     end
+    %i[project dataset result].each do |i|
+      cli[i] = nil if cli[i].nil? || cli[i].empty?
+    end
 
     # Unset dataset if the requested result is for projects
     if (MiGA::Project.RESULT_DIRS.keys + [:p]).include? cli[:result]
       cli[:dataset] = nil
     end
 
+    # Use virtual result if not explicitly passed
+    cli[:result] ||= cli[:dataset] ? :d : :p
+
     # Load project
     p = cli.load_project
 

data/lib/miga/cli/opt_helper.rb

@@ -56,10 +56,11 @@ module MiGA::Cli::OptHelper
   # - :project_type To allow (optionally) a type of project
   # - :project_type_req To require a type of project
   # - :result To require a type of project or dataset result
+  # - :result_opt To allow (optionally) a type of result
   # - :result_dataset To require a type of dataset result
   # - :result_project To require a type of project result
-  # The options :result, :result_dataset, and :result_project are mutually
-  # exclusive
+  # The options :result, :result_opt, :result_dataset, and :result_project
+  # are mutually exclusive
   def opt_object(opt, what = [:project, :dataset])
     what.each do |w|
       case w
@@ -82,10 +83,10 @@ module MiGA::Cli::OptHelper
           "#{req}Type of #{obj}. Recognized types include:",
           *klass.KNOWN_TYPES.map { |k, v| "~ #{k}: #{v[:description]}" }
         ) { |v| self[:type] = v.downcase.to_sym }
-      when :result
+      when :result, :result_opt
         opt.on(
           '-r', '--result STRING',
-          '(Mandatory) Name of the result',
+          "#{"(Mandatory) " if w == :result}Name of the result",
           'Recognized names for dataset-specific results include:',
           *MiGA::Dataset.RESULT_DIRS.keys.map { |n| " ~ #{n}" },
           'Recognized names for project-wide results include:',

data/lib/miga/common.rb

@@ -61,10 +61,14 @@ class MiGA::MiGA
     end
 
     # Estimate timing
-    unless total.nil? || @_advance_time[:last].nil? || @_advance_time[:n] == n
-      this_time = Time.now - @_advance_time[:last]
-      @_advance_time[:avg] ||= this_time / (n - @_advance_time[:n])
-      @_advance_time[:avg] = 0.99 * @_advance_time[:avg] + 0.01 * this_time
+    adv_n = n - @_advance_time[:n]
+    unless total.nil? || @_advance_time[:last].nil? || adv_n <= 0
+      if adv_n.to_f/n > 0.001
+        this_time = Time.now - @_advance_time[:last]
+        this_avg = this_time / adv_n
+        @_advance_time[:avg] ||= this_avg
+        @_advance_time[:avg] = 0.9 * @_advance_time[:avg] + 0.1 * this_avg
+      end
     end
     @_advance_time[:last] = Time.now
     @_advance_time[:n] = n
@@ -78,9 +82,10 @@ class MiGA::MiGA
       if @_advance_time[:avg].nil?
         ''
       else
-        left_time = @_advance_time[:avg] * (total - n) / 60
+        left_time = @_advance_time[:avg] * (total - n) / 60 # <- in minutes
         left_time < 0.01 ? '         ' :
           left_time < 1 ? ('%.0fs left' % (left_time * 60)) :
+          left_time > 1440 ? ('%.1fd left' % (left_time / 1440)) :
           left_time > 60 ? ('%.1fh left' % (left_time / 60)) :
           ('%.1fm left' % left_time)
       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, 16, 3]
+  VERSION = [0.7, 16, 8]
 
   ##
   # Nickname for the current major.minor version.
@@ -16,7 +16,7 @@ module MiGA
 
   ##
   # Date of the current gem release.
-  VERSION_DATE = Date.new(2020, 10, 27)
+  VERSION_DATE = Date.new(2020, 11, 22)
 
   ##
   # Reference of MiGA.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 0.7.16.3
+  version: 0.7.16.8
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons