zfs_mgmt 0.4.4 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558d14c8bb3e9617b2d355308c85cd1da639035fb67662409a6445e1769c6e55
-  data.tar.gz: ef0acb4c148281bb81e0df51f08efa9c2ab87302a14c3700cce3214e9ab9e515
+  metadata.gz: f291d60850dca4bda6a4e388d17cd18700406522f159eb1a3489215d0332fdb3
+  data.tar.gz: 3e8bc46616b93dbc119a5ff6e7e24c5e44d579bd330bf18b5a3658fe368ebc15
 SHA512:
-  metadata.gz: 84f9fa0ba043d4c7a8e4b4625642bd5c14260591438da6851ecf6704a7747baedd4f1e397c3d55a648e55e6588c5bd6efd31e56a243a918bb9cb40de5db26c14
-  data.tar.gz: 1d77d1167f829dfa24236c3bdbda28093b15c5f325a55c02c26f9cd8eba7e9d73d1e2db3d8e68c6d9370ecc5e70ec676f2dba9682ab4a05d80bce273572f6206
+  metadata.gz: 1cb48795d7c1d0f9f5499b65149c555aa633e6db1f357c451dba90c5264cc26a81acb62e552b5bea6c241a79bcde488b50eab445f4214be68aa322d91d2d7dab
+  data.tar.gz: 3c5a1b003771b5481ac5419facf28ecbd25c92cf1095fa173a8f0ff4e2b326f2ffdd31bcc9ad4fa0978dd6c5ca583215228f43ec9da69540ce5c6ea28a73c467

data/Gemfile.lock

@@ -1,36 +1,39 @@
 PATH
   remote: .
   specs:
-    zfs_mgmt (0.4.4)
+    zfs_mgmt (0.4.7)
+      filesize (~> 0.2)
+      text-table (~> 1.2)
+      thor (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     filesize (0.2.0)
-    json (2.3.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    json (2.6.2)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     text-table (1.2.4)
-    thor (1.0.1)
+    thor (1.2.1)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (>= 2.2.33)
   filesize
   json
   rake (>= 12.3.3)
@@ -40,4 +43,4 @@ DEPENDENCIES
   zfs_mgmt!
 
 BUNDLED WITH
-   1.16.6
+   2.3.21

data/bin/zfsmgr

@@ -17,7 +17,7 @@ class ZfsMgr < Thor
                :enum => ['debug','error','fatal','info','warn'],
                :desc => 'set logging level to specified severity'
   desc "zfsget [ZFS]", "execute zfs get for the given properties and types and parse the output into a nested hash"
-  method_option :properties, :type => :array, :default => ['name'], :desc => "List of properties passed to zfs get"
+  method_option :properties, :type => :string, :default => ['name'], :desc => "List of properties passed to zfs get", repeatable: true
   method_option :types,      :type => :array, :default => ['filesystem','volume'], enum: ['filesystem','volume','snapshot'], :desc => "list of types"
   def zfsget(zfs)
     ZfsMgmt.set_log_level(options[:loglevel])

data/lib/zfs_mgmt/version.rb

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

data/lib/zfs_mgmt/zfs_mgr/send.rb

@@ -25,8 +25,8 @@ class ZfsMgmt::ZfsMgr::Send < Thor
 
   method_option :noop, :aliases => :'-n', :desc => "pass -n (noop) option to zfs send", :type => :boolean
   method_option :unmount, :aliases => :'-u', :desc => "pass -u (unmount) option to zfs receive", :type => :boolean
-  method_option :exclude, :aliases => :'-x', :desc => "passed to -x option of receive side", :type => :array
-  method_option :option, :aliases => :'-o', :desc => "passed to -o option of receive side", :type => :array
+  method_option :exclude, :aliases => :'-x', :desc => "passed to -x option of receive side", :type => :string, repeatable: true
+  method_option :option, :aliases => :'-o', :desc => "passed to -o option of receive side", :type => :string, repeatable: true
   method_option :drop_holds, :desc => "pass the -h option to zfs recv, indicating holds should be ignored", :type => :boolean
 
   method_option :mbuffer, :desc => "insert mbuffer between send and recv", :default => true, :type => :boolean

data/lib/zfs_mgmt.rb

@@ -311,7 +311,7 @@ module ZfsMgmt
         $logger.debug("delete: #{snap_name} #{local_epoch_to_datetime(snaps[snap_name]['creation']).strftime('%F %T')}")
       end
 
-      com_base = ['zfs', 'destroy']
+      com_base = [ZfsMgmt.global_options[:zfs_binary], 'destroy']
       com_base.push('-d') if deleteme.length > 0 # why?
       com_base.push('-n') if noop
       com_base.push('-v') if verbose
@@ -423,7 +423,7 @@ module ZfsMgmt
       source = sorted[0]
       if options[:initial_snapshot] == 'newest' or
         key_comp?(options, 'replicate') or
-        key_comp?(props, 'zfsmgmt:send_replcate')
+        key_comp?(props, 'zfsmgmt:send_replicate')
         source = sorted[-1]
       end
       com += zfs_send_com(options,
@@ -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

data/zfs_mgmt.gemspec

@@ -36,11 +36,11 @@ Gem::Specification.new do |spec|
   spec.executables   = ['readsnaps','zfssendman','zfssnapman','zfsrecvman','zfs-list-snapshots','zfsmgr']
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 2.2.33"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "thor", "~> 1.0"
-  spec.add_development_dependency "text-table", "~> 1.2"
-  spec.add_development_dependency "filesize", "~> 0.2"
+  spec.add_runtime_dependency "thor", "~> 1.0"
+  spec.add_runtime_dependency "text-table", "~> 1.2"
+  spec.add_runtime_dependency "filesize", "~> 0.2"
   
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.7
 platform: ruby
 authors:
 - Aran Cox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,14 +87,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-description: 
+description:
 email:
 - arancox@gmail.com
 executables:
@@ -140,7 +140,7 @@ metadata:
   homepage_uri: https://github.com/aranc23/zfs_mgmt
   source_code_uri: https://github.com/aranc23/zfs_mgmt
   changelog_uri: https://github.com/aranc23/zfs_mgmt/commits/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Misc. helpers regarding snapshots and send/recv.
 test_files: []