zfs_mgmt 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14fbd30f0a3d93dff6442c011b7a613b9639fd5855a9efd635b3b9b14fa336c7
-  data.tar.gz: 826699e0d0bca72bf87a779a87b14b9bcc01dffe34596eff471264b07b683d62
+  metadata.gz: 558d14c8bb3e9617b2d355308c85cd1da639035fb67662409a6445e1769c6e55
+  data.tar.gz: ef0acb4c148281bb81e0df51f08efa9c2ab87302a14c3700cce3214e9ab9e515
 SHA512:
-  metadata.gz: fbe275a0b964b664d08346def641abff1c63467e70edb47b60accbd519a3e2df0bf81f2e000f09b28c7cf4db2cd71aa67580c8b570ffc5171835f818b3783d3c
-  data.tar.gz: 4b326c73524719f3e103781532228d40fe09f0ebada718701d444d6296dfa5e310e2bd2a4035ad8cb6b08791ff5c8ddf7d0a1ecb6102d305957af853683ba356
+  metadata.gz: 84f9fa0ba043d4c7a8e4b4625642bd5c14260591438da6851ecf6704a7747baedd4f1e397c3d55a648e55e6588c5bd6efd31e56a243a918bb9cb40de5db26c14
+  data.tar.gz: 1d77d1167f829dfa24236c3bdbda28093b15c5f325a55c02c26f9cd8eba7e9d73d1e2db3d8e68c6d9370ecc5e70ec676f2dba9682ab4a05d80bce273572f6206

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zfs_mgmt (0.4.3)
+    zfs_mgmt (0.4.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/zfs_mgmt.rb

@@ -238,7 +238,7 @@ module ZfsMgmt
     }
     return saved,saved_snaps,deleteme
   end
-  def self.zfs_managed_list(filter: '.+', properties: ['all'], property_match: { 'zfsmgmt:manage' => 'true' } )
+  def self.zfs_managed_list(filter: '.+', properties: ['all'], property_match: { 'zfsmgmt:manage' => method(:prop_on?) } )
     zfss = [] # array of arrays
     zfsget(properties: properties).each do |zfs,props|
       unless /#{filter}/ =~ zfs
@@ -246,7 +246,7 @@ module ZfsMgmt
       end
       managed = true
       property_match.each do |k,v|
-        unless props.has_key?(k) and props[k] == v
+        unless key_comp?(props,k,v)
           managed = false
           break
         end
@@ -422,8 +422,8 @@ module ZfsMgmt
       com = []
       source = sorted[0]
       if options[:initial_snapshot] == 'newest' or
-        ( options.has_key?('replicate') and options['replicate'] == true ) or
-        ( props.has_key?('zfsmgmt:send_replicate') and props['zfsmgmt:send_replicate'] == 'true' )
+        key_comp?(options, 'replicate') or
+        key_comp?(props, 'zfsmgmt:send_replcate')
         source = sorted[-1]
       end
       com += zfs_send_com(options,
@@ -445,7 +445,7 @@ module ZfsMgmt
       # should be resumable!
       com = [ ]
       com.push( ZfsMgmt.global_options[:zfs_binary], 'send', '-t', remote_zfs_state )
-      com.push('-v','-P') if options[:verbose] and options[:verbose] == 'send'
+      com.push('-v','-P') if key_comp?(options, 'verbose', 'send')
       com.push('|')
       e = zfs_send_estimate(com) if options[:verbose] == 'pv'
       com += mbuffer_command(options) if options[:mbuffer]
@@ -498,7 +498,15 @@ module ZfsMgmt
       if snaps.has_key?(rsnap.sub(destination_path,zfs))
         $logger.debug("process #{rsnap} to #{sorted[-1]}")
         com = []
-        com += zfs_send_com(options,props,[(options[:intermediary] ? '-I' : '-i'),dq(rsnap.split('@')[1])],sorted[-1])
+        i_opt = '-i'
+        # allow the command line option for intermediary to override the property
+        if key_comp?(options,'intermediary',[true,false])
+          i_opt = '-I' if key_comp?(options, 'intermediary', true)
+        elsif key_comp?(props, 'zfsmgmt:send_intermediary')
+          i_opt = '-I'
+        end
+
+        com += zfs_send_com(options,props,[i_opt, dq('@' + rsnap.split('@')[1])], sorted[-1])
         e = zfs_send_estimate(com) if options[:verbose] == 'pv'
         com += mbuffer_command(options) if options[:mbuffer]
         com += pv_command(options,e) if options[:verbose] == 'pv'
@@ -521,7 +529,7 @@ module ZfsMgmt
   end
   def self.zfs_send_com(options,props,extra_opts,target)
     zfs_send_com = [ ZfsMgmt.global_options[:zfs_binary], 'send' ]
-    zfs_send_com.push('-v','-P') if options[:verbose] and options[:verbose] == 'send'
+    zfs_send_com.push('-v','-P') if key_comp?(options,'verbose','send')
     send_opts = {
       'backup'      => '-b',
       'compressed'  => '-c',
@@ -533,10 +541,11 @@ module ZfsMgmt
       'replicate'   => '-R',
     }
     send_opts.each do |p,o|
-      if options.has_key?(p)
-        zfs_send_com.push(o) if options[p] == true
-      elsif props.has_key?("zfsmgmt:send_#{p}")
-        zfs_send_com.push(o) if props["zfsmgmt:send_#{p}"] == 'true'
+      # allow the command line options to override the properties value
+      if key_comp?(options,p,[true,false])
+        zfs_send_com.push(o) if key_comp?(options,p,true)
+      elsif key_comp?(props,"zfsmgmt:send_#{p}")
+        zfs_send_com.push(o)
       end
     end
     zfs_send_com + extra_opts + [dq(target),'|']
@@ -544,18 +553,21 @@ module ZfsMgmt
   def self.zfs_recv_com(options,extra_opts,props,target)
     zfs_recv_com = [ ZfsMgmt.global_options[:zfs_binary], 'recv', '-F', '-s' ]
     recv_opts = {
-      'noop'       => '-n',
-      'drop_holds' => '-h',
-      'unmount'    => '-u',
+      'noop'          => '-n',
+      'drop_holds'    => '-h',
+      'unmount'       => '-u',
+      #'discard_last'  => '-e',
+      #'discard_first' => '-d',
     }
     recv_opts.each do |p,o|
-      if options.has_key?(p)
-        zfs_recv_com.push(o) if options[p] == true
-      elsif props.has_key?("zfsmgmt:recv_#{p}")
-        zfs_recv_com.push(o) if props["zfsmgmt:recv_#{p}"] == 'true'
+      # allow the command line options to override the properties value
+      if key_comp?(options,p,[true,false])
+        zfs_recv_com.push(o) if key_comp?(options,p,true)
+      elsif key_comp?(props,"zfsmgmt:recv_#{p}")
+        zfs_recv_com.push(o)
       end
     end
-    zfs_recv_com.push('-v') if options[:verbose] and ( options[:verbose] == 'receive' or options[:verbose] == 'recv' )
+    zfs_recv_com.push('-v') if key_comp?(options, 'verbose', ['receive', 'recv'])
     if options[:exclude]
       options[:exclude].each do |x|
         zfs_recv_com.push('-x',x)
@@ -628,14 +640,13 @@ module ZfsMgmt
       return v.include?(h[p])
     elsif v.kind_of?(Hash)
       return v.keys.include?(h[p])
-    elsif v.kind_of?(String)
-      return h[p] == v
     elsif v.kind_of?(Method)
       return v.call(h[p])
     elsif v.kind_of?(Regexp)
       return v =~ h[p]
     else
-      raise ArgumentError
+      # string, boolean, numbers?
+      return h[p] == v
     end
   end
   def self.set_log_level(sev)
@@ -652,4 +663,23 @@ module ZfsMgmt
       $logger.level = Logger::FATAL
     end
   end
+  def self.zfs_send_all(options)
+    zfs_managed_list(filter: options[:filter],
+                     property_match: { 'zfsmgmt:send' => method(:prop_on?) }).each do |zfs,props,snaps|
+      
+      if props['zfsmgmt:send@source'] == 'received'
+        $logger.debug("skipping received filesystem: #{zfs}")
+        next
+      end
+      if key_comp?(props,'zfsmgmt:send_replicate') and props['zfsmgmt:send_replicate@source'] != 'local'
+        $logger.debug("skipping descendant of replicated filesystems: #{zfs}")
+        next
+      end
+      unless props['zfsmgmt:destination']
+        $logger.error("#{zfs}: you must specify a destination zfs path via the user property zfsmgmt:destination, even if using --destination on the command line, skipping")
+        next
+      end
+      zfs_send(options,zfs,props,snaps)
+    end
+  end
 end

data/lib/zfs_mgmt/restic.rb

@@ -70,7 +70,7 @@ module ZfsMgmt::Restic
                                           'zfsmgmt:restic_repository',
                                           'userrefs',
                                          ],
-                             property_match: { 'zfsmgmt:restic_backup' => 'true' }).each do |blob|
+                             property_match: { 'zfsmgmt:restic_backup' => ['on','true'] }).each do |blob|
       zfs,props,zfs_snapshots = blob
       last_zfs_snapshot = zfs_snapshots.keys.sort { |a,b| zfs_snapshots[a]['creation'] <=> zfs_snapshots[b]['creation'] }.last
       zfs_snap_time = Time.at(zfs_snapshots[last_zfs_snapshot]['creation'])

data/lib/zfs_mgmt/version.rb

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

data/lib/zfs_mgmt/zfs_mgr/send.rb

@@ -35,29 +35,6 @@ class ZfsMgmt::ZfsMgr::Send < Thor
     ZfsMgmt.set_log_level(options[:loglevel])
     ZfsMgmt.global_options = options
 
-    [
-      { 'zfsmgmt:send' => 'true' },
-      # {
-      #   'zfsmgmt:send' => 'replicate',
-      #   'zfsmgmt:send@source' => 'local'
-      # },
-    ].each do |match|
-      ZfsMgmt.zfs_managed_list(filter: options[:filter],
-                               property_match: match).each do |zfs,props,snaps|
-        if props['zfsmgmt:send@source'] == 'received'
-          $logger.debug("skipping received filesystem: #{zfs}")
-          next
-        end
-        if props.has_key?('zfsmgmt:send_replicate') and props['zfsmgmt:send_replicate'] == 'true' and props['zfsmgmt:send_replicate@source'] != 'local'
-          $logger.debug("skipping descendant of replicated filesystems: #{zfs}")
-          next
-        end
-        unless props['zfsmgmt:destination']
-          $logger.error("#{zfs}: you must specify a destination zfs path via the user property zfsmgmt:destination, even if using --destination on the command line, skipping")
-          next
-        end
-        ZfsMgmt.zfs_send(options,zfs,props,snaps)
-      end
-    end
+    ZfsMgmt.zfs_send_all(options)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Aran Cox