miga-base 1.2.5.1 → 1.2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2992b5ad14069f7dc68885cc65eb81eaa8073c07dd8482e6f399e1c2215ee496
-  data.tar.gz: 7f18d3552baa5ef56757e47387dcb26f1555ec078b113508497ecd8c97a4b282
+  metadata.gz: a68d83e5dac07c94aa2bafe0eda06ba074d5b87f9d7bf97e521a5be3e59aa296
+  data.tar.gz: d9309d82f51e9bfce7cc18c8b32de6ab1491cf1fc3fd9b5af660298490bac2b8
 SHA512:
-  metadata.gz: '0806bfd3c1c33685c00e9f794845de2566ea7d62c0b1950c576f964fa2a3b1045de3e024b696592cdf1c44e6dc601dbfe5135974cec97d8ce8f2a18c490ee803'
-  data.tar.gz: 95a072ff6fbc247ef717435506ab114f396615dbf74efe5319d965aa9858e860c2aeac2dfadf2edbe3c64b05679c5cf9f9930bbf3ae4dbb5eb565c84f5ef8ba7
+  metadata.gz: 9a88c56adfc6fe0b32a708605aca18f798fdfe94a2d4ae62b5dda27b1bd85f8b7d2be4a6fb589c8cd8c56de6c3bdef3b271a2c61112092e01c01058aa7b68f7b
+  data.tar.gz: d71d65c936ee269d4f7f582f39e680452bf818d4fac827178ccb97ca0b468f5fa0a381148d40b5f92c25b1e57b9a93220e95a510309134b07fe484801cd75210

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

@@ -121,19 +121,17 @@ class MiGA::Cli::Action::Add < MiGA::Cli::Action
       raise 'Some files are duplicated, files must be unique.' if
         files.size != files.uniq.size
 
-      expected_files = 1
       if cli[:input_type].to_s =~ /_paired$/
         if files.size.odd?
           raise 'Odd number of files incompatible with input type.'
         end
 
-        expected_files = 2
         files = Hash[*files].to_a
       else
         files = files.map { |i| [i] }
       end
 
-      if files.size != expected_files && !cli[:dataset].nil?
+      if files.size != 1 && !cli[:dataset].nil?
         raise 'The dataset name (-D) can only be specified with one input set.'
       end
     end

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

@@ -12,6 +12,7 @@ class MiGA::Cli::Action::GetDb < MiGA::Cli::Action
       local: File.expand_path('.miga_db', ENV['MIGA_HOME']),
       host: MiGA::MiGA.known_hosts(:miga_db),
       pb: true,
+      reuse_archive: false,
       overwrite: true
     }
     cli.parse do |opt|
@@ -39,6 +40,10 @@ class MiGA::Cli::Action::GetDb < MiGA::Cli::Action
         '--list-versions',
         'List available versions of the database and exit'
       ) { |v| cli[:list_versions] = v }
+      opt.on(
+        '--reuse-archive',
+        'Reuse a previously downloaded archive if available'
+      ) { |v| cli[:reuse_archive] = v }
       opt.on(
         '--no-overwrite',
         'Exit without downloading if the target database already exists'
@@ -67,7 +72,7 @@ class MiGA::Cli::Action::GetDb < MiGA::Cli::Action
     check_target and return
 
     # Download and expand
-    file = download_file(@ftp, ver[:path])
+    file = download_file(@ftp, ver[:path], cli[:reuse_archive])
     check_digest(ver, file)
     unarchive(file)
     register_database(manif, db, ver)
@@ -89,13 +94,17 @@ class MiGA::Cli::Action::GetDb < MiGA::Cli::Action
     MiGA::MiGA.remote_connection(cli[:host])
   end
 
-  def download_file(ftp, path)
+  def download_file(ftp, path, reuse = false)
     cli.say "Downloading '#{path}'"
     file = File.expand_path(path, cli[:local])
-    MiGA::MiGA.download_file_ftp(ftp, path, file) do |n, size|
-      cli.advance("#{path}:", n, size) if cli[:pb]
+    if reuse && File.exist?(file)
+      cli.say "Reusing #{file}"
+    else
+      MiGA::MiGA.download_file_ftp(ftp, path, file) do |n, size|
+        cli.advance("#{path}:", n, size) if cli[:pb]
+      end
+      cli.print "\n" if cli[:pb]
     end
-    cli.print "\n" if cli[:pb]
     file
   end
 

data/lib/miga/common.rb

@@ -115,7 +115,7 @@ class MiGA::MiGA
     { T: 4, G: 3, M: 2, K: 1 }.each do |k, x|
       v = (bin ? 1024 : 1e3)**x
       if n > v
-        n = '%.1f' % (n / v)
+        n = '%.1f' % (n.to_f / v)
         p = k
         break
       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.2, 5, 1].freeze
+  VERSION = [1.2, 6, 0].freeze
 
   ##
   # Nickname for the current major.minor version.
@@ -20,7 +20,7 @@ module MiGA
 
   ##
   # Date of the current gem relese.
-  VERSION_DATE = Date.new(2022, 5, 9)
+  VERSION_DATE = Date.new(2022, 5, 23)
 
   ##
   # References of MiGA

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.2.5.1
+  version: 1.2.6.0
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons