zfs_mgmt 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5acd67ede82b58715afd30c8a353c0ac04eae765f37d46fabbc17c50f1e815d1
-  data.tar.gz: 3d0327b103d260acaeb8c9859f56a5a8995f006562a72b88c13dc538ac7a0d56
+  metadata.gz: 2e363218ad13dc15bae4ca2805c675482954cbd3724581998a2f9513de0f9e2a
+  data.tar.gz: 9f836dfb859155b57b6abfafcb9271a166841162ff46736cfab2e58c054354e9
 SHA512:
-  metadata.gz: 73b14068379306c891f6156d6d8b950de23d5dd2d40fdcee7a455abc19d7cd98a204c2e32ee809b7548ca189b9454f7f0fd7169d3f4da68abea526f0e647d364
-  data.tar.gz: bf8d5142caa75a686991ad999956b7a093e68283d5cacec0e27c2897efa2e3d44db49c82e0dab8553843be69c1cdd7df124a5ed59cea86066f7b943ed9301edb
+  metadata.gz: 16218b552ae7d799207d8756dad08f2d013b438a8814f8850f15f8171c2bd9eeeb1b3c52c4a1d2b4d73b82d0f48cb0b217969ddfef91b0d20f331a1d6414cea1
+  data.tar.gz: 23c3b898ec59b05c06b1833faac058fa670d34217e6a43b973aaa20d69891e26c662d67a1658e17e3e67b3d5132f5dc959da5c4b3b158e31fa62990da23be4bc

data/Gemfile.lock

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

data/lib/zfs_mgmt.rb

@@ -230,10 +230,10 @@ module ZfsMgmt
       end
       # print a table of saved snapshots with the reasons it is being saved
       table = Text::Table.new
-      table.head = ['snap','creation','hourly','daily','weekly','monthly','yearly']
+      table.head = [zfs,'creation','hourly','daily','weekly','monthly','yearly']
       table.rows = []
       saved_snaps.sort { |a,b| snaps[b]['creation'] <=> snaps[a]['creation'] }.each do |snap|
-        table.rows << [snap,local_epoch_to_datetime(snaps[snap]['creation'])] + find_saved_reason(saved,snap)
+        table.rows << [snap.split('@')[1],local_epoch_to_datetime(snaps[snap]['creation'])] + find_saved_reason(saved,snap)
       end
       print table.to_s
     end
@@ -263,23 +263,26 @@ module ZfsMgmt
       deleteme.reverse! # oldest first for removal
       deleteme.each do |snap_name|
         $logger.debug("delete: #{snap_name} #{local_epoch_to_datetime(snaps[snap_name]['creation']).strftime('%F %T')}")
+        com = "#{com_base} #{snap_name}"
+        $logger.info(com)
+        system(com)
       end
-      while deleteme.length > 0
-        for i in 0..(deleteme.length - 1) do
-          max = deleteme.length - 1 - i
-          $logger.debug("attempting to remove snaps 0 through #{max} out of #{deleteme.length} snapshots")
-          bigarg = "#{zfs}@#{deleteme[0..max].map { |s| s.split('@')[1] }.join(',')}"
-          com = "#{com_base} #{bigarg}"
-          $logger.debug("size of bigarg: #{bigarg.length} size of com: #{com.length}")
-          if bigarg.length >= 131072 or com.length >= (2097152-10000)
-            next
-          end
-          $logger.info(com)
-          deleteme = deleteme - deleteme[0..max]
-          system(com)
-          break
-        end
-      end
+      # while deleteme.length > 0
+      #   for i in 0..(deleteme.length - 1) do
+      #     max = deleteme.length - 1 - i
+      #     $logger.debug("attempting to remove snaps 0 through #{max} out of #{deleteme.length} snapshots")
+      #     bigarg = "#{zfs}@#{deleteme[0..max].map { |s| s.split('@')[1] }.join(',')}"
+      #     com = "#{com_base} #{bigarg}"
+      #     $logger.debug("size of bigarg: #{bigarg.length} size of com: #{com.length}")
+      #     if bigarg.length >= 131072 or com.length >= (2097152-10000)
+      #       next
+      #     end
+      #     $logger.info(com)
+      #     deleteme = deleteme - deleteme[0..max]
+      #     system(com)
+      #     break
+      #   end
+      # end
     end
   end
   # parse a policy string into a hash of integers

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/zfs_mgmt.gemspec

@@ -39,8 +39,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "thor", "~> 1.0.1"
-  spec.add_development_dependency "text-table", "~> 1.2.4"
-  spec.add_development_dependency "filesize", "~> 0.2.0"
+  spec.add_development_dependency "thor", "~> 1.0"
+  spec.add_development_dependency "text-table", "~> 1.2"
+  spec.add_development_dependency "filesize", "~> 0.2"
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Aran Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: text-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 description: 
 email:
 - arancox@gmail.com
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Misc. helpers regarding snapshots and send/recv.