zfs_mgmt 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1022834076fa1482f627f9c5b7f8a476dd3e83d3358495d40f6695b23e842a88
-  data.tar.gz: ddc4f5f6e87c00f5cb0c0adbe2b4ddc47f78670c520b701d359b471b19c081c4
+  metadata.gz: f291d60850dca4bda6a4e388d17cd18700406522f159eb1a3489215d0332fdb3
+  data.tar.gz: 3e8bc46616b93dbc119a5ff6e7e24c5e44d579bd330bf18b5a3658fe368ebc15
 SHA512:
-  metadata.gz: 06eab68af755becb316e438c5e027e78166952c7a37dc1c32343193f140e0a12463784b6a42ada068c0a90571641a11c7971143349d0dff6cc1a2581f34cbe9b
-  data.tar.gz: 9fa676ecf9837096a5e97649f01dfa398610898019f4abd0694fee241e75733767193898e26e618516c23cbf394dcdf1bdb8d9c4639a70a77d49db5b34c2ede4
+  metadata.gz: 1cb48795d7c1d0f9f5499b65149c555aa633e6db1f357c451dba90c5264cc26a81acb62e552b5bea6c241a79bcde488b50eab445f4214be68aa322d91d2d7dab
+  data.tar.gz: 3c5a1b003771b5481ac5419facf28ecbd25c92cf1095fa173a8f0ff4e2b326f2ffdd31bcc9ad4fa0978dd6c5ca583215228f43ec9da69540ce5c6ea28a73c467

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zfs_mgmt (0.4.6)
+    zfs_mgmt (0.4.7)
       filesize (~> 0.2)
       text-table (~> 1.2)
       thor (~> 1.0)

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/lib/zfs_mgmt.rb

@@ -603,11 +603,17 @@ module ZfsMgmt
     lcom.push('2>&1')
     lcom = precom + lcom
     $logger.debug(lcom.join(' '))
+    total = 0
     %x[#{lcom.join(' ')}].each_line do |l|
-      if m = /(incremental|size).*\s+(\d+)$/.match(l)
-        return m[2].to_i
+      if m = /^size\s+(\d+)$/.match(l)
+        return m[1].to_i
+      elsif m = /^incremental\s+.+?\s+.+?\s+(\d+)$/.match(l)
+        total = total + m[1].to_i
       end
     end
+    if total > 0
+      return total
+    end
     $logger.error("no estimate available")
     return nil
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Aran Cox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler