miga-base 1.3.15.8 → 1.3.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a4b45cec67cd472fc681bd0993b0ba7bb3f36229e0a6cf5120333131a65b72
-  data.tar.gz: 968803414089403de2f50e4fe11624b57dc6b69ddeb37a22e5fac365b8fd8224
+  metadata.gz: 064e93465ac48e77eb31406064706cc7a10e1b34b73fea9216a7759f23f4982c
+  data.tar.gz: 2818f9708bfbaa8e43f6742c5bfb963a00f68737a07b4afdb3a693ce58a49f40
 SHA512:
-  metadata.gz: bee8323fb44d70b5577baa076b77ebe7a8cdc69ffb40a535fdd714d299d09a08dd3dc73352325d11f1ade061ffca222d53e98602486bfd7571a773dca7ad2f47
-  data.tar.gz: 245b2f64128473dcda952e82874fa3c1fad2a0b7aa0b82c8a57bb9a13f01c16094b5a9249899e4212224e10d9853e8b99d3c1c83bef7229a70c07b454ee09513
+  metadata.gz: b6b8df2cfd819f69fcc5bf922d0a57d0cb33f48a4bf6371fc1a5433c9571902ca3f1ed8a8c7df5c1df2b35f05da820545b51e046e60ba692eeff7e77e46d1699
+  data.tar.gz: '024922760df8f9cffdc72fb96df36fe8d4805b41b885164280af6633cf45f6da95fa5cb647d44a8149d1e81026d41e397888c453f97adc0ee7ea176b50ff6507'

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

@@ -139,7 +139,7 @@ class MiGA::Cli::Action::Db < MiGA::Cli::Action
       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]
+      cli.say '' if cli[:pb]
     end
     file
   end
@@ -225,11 +225,16 @@ class MiGA::Cli::Action::Db < MiGA::Cli::Action
     cli.say 'Checking MD5 digest'
     cli.say "Expected: #{ver[:MD5]}"
     md5 = Digest::MD5.new
+    size = File.size(file)
+    n = 0
     File.open(file, 'rb') do |fh|
       until fh.eof?
-        md5.update fh.read(1024)
+        md5 << fh.read(1024)
+        n += 1024
+        cli.advance('Processed:', [n, size].min, size) if cli[:pb]
       end
     end
+    cli.say '' if cli[:pb]
     dig = md5.hexdigest
     cli.say "Observed: #{dig}"
     raise 'Corrupt file, MD5 does not match' unless dig == ver[:MD5]

data/lib/miga/common.rb

@@ -64,25 +64,33 @@ class MiGA::MiGA
   # The report goes to $stderr iff --verbose
   def advance(step, n = 0, total = nil, bin = true)
     # Initialize advance timing
-    @_advance_time ||= { last: nil, n: 0, avg: nil }
-    if @_advance_time[:n] > n
+    @_advance_time ||= { last: nil, n: 0, avg: nil, total: total }
+    if @_advance_time[:n] > n || total != @_advance_time[:total]
       @_advance_time[:last] = nil
       @_advance_time[:n] = 0
       @_advance_time[:avg]  = nil
+      @_advance_time[:total] = total
     end
 
     # Estimate timing
     adv_n = n - @_advance_time[:n]
     if total.nil? || @_advance_time[:last].nil? || adv_n.negative?
+      # Initial report
       @_advance_time[:last] = Time.now
       @_advance_time[:n] = n
     elsif adv_n > 0.001 * total
+      # Advance report (if change > 0.1% change and time > 1 second)
       this_time = (Time.now - @_advance_time[:last]).to_f
+      return if this_time < 1.0 && n < total
+
       this_avg = this_time / adv_n
       @_advance_time[:avg] ||= this_avg
       @_advance_time[:avg] = 0.9 * @_advance_time[:avg] + 0.1 * this_avg
       @_advance_time[:last] = Time.now
       @_advance_time[:n] = n
+    else
+      # Final report (if the last update was too small) or ignore update
+      return if n < total
     end
 
     # Report

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, 15, 8].freeze
+  VERSION = [1.3, 15, 9].freeze
 
   ##
   # Nickname for the current major.minor version.

data/test/common_test.rb

@@ -76,23 +76,26 @@ class CommonTest < Test::Unit::TestCase
   def test_advance
     m = MiGA::MiGA.new
 
-    # Check advance when missing total
+    # Check advance when missing total and n
     o = capture_stderr { m.advance('x', 0) }.string
     assert_match(%r{\] x *\r}, o)
 
+    # Check advance when missing total
+    o = capture_stderr { m.advance('x', 10) }.string
+    assert_match(%r{\] x 10 *\r}, o)
+
     # Initialize advance
     o = capture_stderr { m.advance('x', 0, 1001) }.string
     assert_match(%r{\] x 0\.0% \(0/1001\) *\r}, o)
 
     # Insufficient data for prediction
-    sleep(1)
     o = capture_stderr { m.advance('x', 1, 1000) }.string
     assert_match(%r{\] x 0\.1% \(1/1000\) *\r}, o)
 
     # Predict time
-    sleep(1)
-    o = capture_stderr { m.advance('x', 2, 1000) }.string
-    assert_match(%r{\] x 0\.2% \(2/1000\) 1\d\.\dm left *\r}, o)
+    sleep(1.01)
+    o = capture_stderr { m.advance('x', 4, 1000) }.string
+    assert_match(%r{\] x 0\.4% \(4/1000\) \d\.\dm left *\r}, o)
   end
 
   def test_num_suffix

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.3.15.8
+  version: 1.3.15.9
 platform: ruby
 authors:
 - Luis M. Rodriguez-R