zfs_mgmt 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01dce6574812e84d56d1a59b01e100eab3f8d20cbf424e2536e057ec67a54012
-  data.tar.gz: 142d2188e242cd55b94c3f5c9375dfa1900ddff8ee608a41d8698d7bcc9bf948
+  metadata.gz: a54ed2e0ad255f69367aaeb25fd0dddcc8346cec0fd8be02561e4ea1210510f2
+  data.tar.gz: 1d31c311f63835c3f7a2b6e771b06628f1901b62130e9ec5d0255ff987fb89bc
 SHA512:
-  metadata.gz: 3297d3fb276a460c9b3478316615c34b93ce6a9116d56657e53855327cc0764ddf57cb2c53273bbe72c14624edf1631836378b50ad4b3f62b2fb2a6a21d49970
-  data.tar.gz: a50bb0e812584aa1b1af794cb729182a5d9d6805e1318c4115462d6718dd2b517c5bd40267c9586cbb5f5ac966bfb742c084576cc3bf6cf9bc4443dd29f3c910
+  metadata.gz: c0534143034e6edb6ce1161bacd86765cf9a151812d1849f3570c983691dfdf8d03f5d0aeefb070fa144fa0fa6838711b855e07180a7c70cd14f3f00d561d562
+  data.tar.gz: dbf53bcfe6223106f080393621d58ef538a2cf9fe9ae9e7f338b2cbe4e5d88d5bca2fcf44f3c6e8ffb76050ce2d0cfc75fa12638b8d19aae759b9b507fab3a65

data/Gemfile.lock

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

data/bin/zfsmgr

@@ -5,10 +5,15 @@ require "zfs_mgmt/zfs_mgr"
 require "zfs_mgmt/zfs_mgr/restic"
 
 class ZfsMgr < Thor
+  class_option :zfs_binary, :type => :string, :default => 'zfs',
+               :desc => 'zfs binary'
+  class_option :zpool_binary, :type => :string, :default => 'zpool',
+               :desc => 'zfs binary'
   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 :types,      :type => :array, :default => ['filesystem','volume'], enum: ['filesystem','volume','snapshot'], :desc => "list of types"
   def zfsget(zfs)
+    ZfsMgmt.global_options = options
     pp ZfsMgmt.zfsget(properties: options[:properties],
                       types: options[:types],
                       zfs: zfs)

data/lib/zfs_mgmt.rb

@@ -38,6 +38,9 @@ $properties_xlate = {
 }
 
 module ZfsMgmt
+  class << self
+    attr_accessor :global_options
+  end
   def self.custom_properties()
     return [
       'policy',
@@ -67,7 +70,7 @@ module ZfsMgmt
   end
 
   def self.zfs_holds(snapshot)
-    com = ['zfs', 'holds', '-H', snapshot]
+    com = [global_options['zfs_binary'], 'holds', '-H', snapshot]
     $logger.debug("#{com.join(' ')}")
     out = %x(#{com.join(' ')})
     unless $?.success?
@@ -83,7 +86,7 @@ module ZfsMgmt
   end
 
   def self.zfs_hold(hold,snapshot)
-    com = ['zfs', 'hold', hold, snapshot]
+    com = [global_options['zfs_binary'], 'hold', hold, snapshot]
     $logger.debug("#{com.join(' ')}")
     system(com.join(' '))
     unless $?.success?
@@ -94,7 +97,7 @@ module ZfsMgmt
   end
 
   def self.zfs_release(hold,snapshot)
-    com = ['zfs', 'release', hold, snapshot]
+    com = [@global_options['zfs_binary'], 'release', hold, snapshot]
     $logger.debug("#{com.join(' ')}")
     system(com.join(' '))
     unless $?.success?
@@ -106,7 +109,8 @@ module ZfsMgmt
 
   def self.zfsget(properties: ['name'],types: ['filesystem','volume'],zfs: '')
     results={}
-    com = ['zfs', 'get', '-Hp', properties.join(','), '-t', types.join(','), zfs]
+    com = [ZfsMgmt.global_options[:zfs_binary], 'get', '-Hp', properties.join(','), '-t', types.join(','), zfs]
+    $logger.debug(com.join(' '))
     so,se,status = Open3.capture3(com.join(' '))
     if status.signaled?
       $logger.error("process was signalled \"#{com.join(' ')}\", termsig #{status.termsig}")
@@ -371,7 +375,7 @@ module ZfsMgmt
         
         prefix = ( props.has_key?('zfsmgmt:snap_prefix') ? props['zfsmgmt:snap_prefix'] : 'zfsmgmt' )
         ts = ( props.has_key?('zfsmgmt:snap_timestamp') ? props['zfsmgmt:snap_timestamp'] : '%FT%T%z' )
-        com = ['zfs','snapshot']
+        com = [global_options['zfs_binary'],'snapshot']
         if props['zfsmgmt:snapshot'] == 'recursive' and props['zfsmgmt:snapshot@source'] == 'local'
           com.push('-r')
         end

data/lib/zfs_mgmt/restic.rb

@@ -107,7 +107,7 @@ module ZfsMgmt::Restic
                "zfsmgmt:snapshot=#{last_zfs_snapshot}",
                "zfsmgmt:zfs=#{zfs}",
                "zfsmgmt:level=#{level}" ]
-      com = [ options[:zfs_binary], 'send', '-L', '-w', '-h', '-p' ]
+      com = [ ZfsMgmt.global_options['zfs_binary'], 'send', '-L', '-w', '-h', '-p' ]
       if level > 0
         if options[:intermediary]
           com.push('-I')

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

data/lib/zfs_mgmt/zfs_mgr/list.rb

@@ -6,6 +6,7 @@ class ZfsMgmt::ZfsMgr::List < Thor
   desc "stale", "list all zfs with stale snapshots"
   method_option :age, :desc => "timeframe outside of which the zfs will be considered stale", :default => '1d'
   def stale()
+    ZfsMgmt.global_options = options
     cutoff = Time.at(Time.now.to_i -  ZfsMgmt.timespec_to_seconds(options[:age]))
     table = Text::Table.new
     table.head = ['zfs','snapshot','age']

data/lib/zfs_mgmt/zfs_mgr/restic.rb

@@ -5,8 +5,6 @@ class ZfsMgmt::ZfsMgr::Backup < Thor
                :desc => 'only act on zfs matching this regexp'
   class_option :restic_binary, :type => :string, :default => 'restic',
                :desc => 'restic binary'
-  class_option :zfs_binary, :type => :string, :default => 'zfs',
-               :desc => 'zfs binary'
   class_option :verbose, :alias => '-v', :type => :numeric,
                :desc => 'verbosity level for restic'
   class_option :buffer, :type => :string, :default => '256m',
@@ -21,15 +19,18 @@ class ZfsMgmt::ZfsMgr::Backup < Thor
   method_option :level, :desc => "backup level in integer form", :default => 2, :type => :numeric
   method_option :intermediary, :alias => '-I', :desc => "pass -I (intermediary) option to zfs send", :default => false, :type => :boolean
   def incremental()
+    ZfsMgmt.global_options = options
     ZfsMgmt::Restic.backup(backup_level: options[:level], options: options)
   end
   desc "differential", "perform differential backup"
   method_option :intermediary, :alias => '-I', :desc => "pass -I (intermediary) option to zfs send", :default => false, :type => :boolean
   def differential()
+    ZfsMgmt.global_options = options
     ZfsMgmt::Restic.backup(backup_level: 1, options: options)
   end
   desc "full", "perform full backup"
   def full()
+    ZfsMgmt.global_options = options
     ZfsMgmt::Restic.backup(backup_level: 0, options: options)
   end
 end

data/lib/zfs_mgmt/zfs_mgr/snapshot.rb

@@ -11,14 +11,17 @@ class ZfsMgmt::ZfsMgr::Snapshot < Thor
                :desc => 'only act on zfs matching this regexp'
   desc "destroy", "apply the snapshot destroy policy to zfs"
   def destroy()
+    ZfsMgmt.global_options = options
     ZfsMgmt.snapshot_destroy(noop: options[:noop], verbopt: options[:verbose], debugopt: options[:debug], filter: options[:filter])
   end
   desc "policy", "print the policy table for zfs"
   def policy()
+    ZfsMgmt.global_options = options
     ZfsMgmt.snapshot_policy(verbopt: options[:verbose], debugopt: options[:debug], filter: options[:filter])
   end
   desc "create", "execute zfs snapshot based on zfs properties"
   def create()
+    ZfsMgmt.global_options = options
     ZfsMgmt.snapshot_create(verbopt: options[:verbose], debugopt: options[:debug], filter: options[:filter])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Aran Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler