frachtraum 0.0.4.pre.alpha → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQwM2Y2NTdkZTFkNDY1ODA1OTc2MmNkNzNlMjM2NjZiNDMwMmIyZQ==
+    MDNlMDc2NmFhNzhjYjgwMWVmN2YzYmJhODQ4MGFiM2IyM2NlNDk3Mw==
   data.tar.gz: !binary |-
-    MGJiZWY5NzAzNmQxZDgxZTk3YjVkODBhZmRjYjQ0YzA3NGM0NzU3MQ==
+    MTRlZDliYzJhZTE4NGY0N2JkNDY0ZTdmZWM5YTY5NGRmZjkyMWI3NQ==
 SHA512:
   metadata.gz: !binary |-
-    MDYyYTQ2N2YwNTdhOWYwNGMzN2Q0YmVlOWE2YzJjYzhmM2Q3NWQzMGE1ZGMy
-    ZGE1MmZiMWEwMGZhNmQ2MTcxYTZkM2IyNzFhZmQ4MjlmNGU0OWFkY2Q0Y2U2
-    MDhkOTY3N2MyMjQ0ZmU5YTEzZmQ4NmJjMzI0MjYwNGIxNTgwZDg=
+    ZmFiM2E0NzZkMjU5M2RlZjg5YWY1OTllY2Y4NzY5ZWZlYjE1NmI2NTJlZWUy
+    OWY2YmQ3OTdjN2YwMzZiNGVmNGE0Y2Q1MTExNmRjNGRiNTE0YTBiMDdmMjZi
+    MWViMDZmZWRmMTVjYTg2MjhkYzdlYzFjMjZjNGIwNDFhNGE4NDY=
   data.tar.gz: !binary |-
-    ZTE4YWEzODAyYTFmYWU0MGMxYTRiMzBkNGFjOTBmNmNiMDJjNTJhODM2MDUy
-    NmFiYmEyM2E1NDJkMzJmYjgyZTU1MWY2NGM5Mjg1ZTI1NTVmZTFiODA3MGQw
-    NDQyY2ViODc0MTVmM2UxYzMxMmJiOGZjYWE0YWNhYTEwOGMxNTE=
+    YzAxNDg4YzdjMzdmMjRiNzNiYTg3NTkwZGUzMTQwZjM2MDNjNWRjZTEzZDJl
+    YjdmMDM2NWU4MWM3N2E4OWMxM2ViZmUwMmM1YjcyNTJlNmVmYTRlNDlmYjk1
+    ZDY3YzE2NDFjZTQ0ZWIyZWZlNTdjZTg2OGVkODAyZmQ2YWM5MzY=

data/lib/frachtraum/bsd.rb

@@ -9,7 +9,7 @@ module Frachtraum
     
     # first of all, decrypt and mount all depots
     volumes.each do |v|      
-      print "decrypting #{v}...".ljust(OUTPUT_DOTS_LEN,".") # TODO: the length should be dynamically calculated, for tm targets as well
+      print "decrypting #{v}...".ljust(OUTPUT_DOTS_LEN,".") 
       
       output = %x( echo #{password} | geli attach -d -j - /dev/label/#{v} 2>&1 )
       if $?.success? 
@@ -23,7 +23,7 @@ module Frachtraum
     
     # mount timemachine targets as well
     Frachtraum::TIMEMACHINE_TARGETS.each do |tmtarget|
-      print "mounting tm #{tmtarget}...".ljust(OUTPUT_DOTS_LEN,".") # TODO: the length should be dynamically calculated, for tm targets as well
+      print "mounting tm #{tmtarget}...".ljust(OUTPUT_DOTS_LEN,".") 
 
       output = %x( zfs mount #{tmtarget} 2>&1 )
       if $?.success? then puts "DONE"
@@ -31,7 +31,8 @@ module Frachtraum
     end
     
     # restart samba so it reports the correct pool size
-    print "restarting samba server...".ljust(OUTPUT_DOTS_LEN,".") # TODO: the length should be dynamically calculated, for tm targets as well
+    print "restarting samba server...".ljust(OUTPUT_DOTS_LEN,".") 
+    
     output = %x( /usr/local/etc/rc.d/samba restart 2>&1 )
     if $?.success? then puts Rainbow("DONE").green
     else puts Rainbow("FAILED!").red + " --> #{output}" end

data/lib/frachtraum/cli.rb

@@ -74,7 +74,7 @@ module Frachtraum
           puts "" # empty line
           Frachtraum::VOLUMES.each{ |volume| 
             status = 
-              if Frachtraum.zfs_dataset_exists?(volume)
+              if Frachtraum.zfs_volume_exists?(volume)
                 Rainbow("attached").green
               else
                 Rainbow("UNAVAILABLE").red
@@ -95,7 +95,7 @@ module Frachtraum
           puts "" # empty line
           Frachtraum::TIMEMACHINE_TARGETS.each{ |dataset| 
             status = 
-              if Frachtraum.zfs_dataset_exists?(dataset)
+              if Frachtraum.zfs_volume_exists?(dataset)
                 Rainbow("attached").green
               else
                 Rainbow("UNAVAILABLE").red
@@ -123,6 +123,7 @@ module Frachtraum
         report_rows << [ volume, 
                          Frachtraum.pretty_SI_bytes(volume_h[:used].to_i), 
                          Frachtraum.pretty_SI_bytes(volume_h[:available].to_i), 
+                         Frachtraum.pretty_SI_bytes(volume_h[:total].to_i), 
                          volume_h[:compression], 
                          volume_h[:compressratio]
                        ]
@@ -130,6 +131,11 @@ module Frachtraum
     
       # TODO
       table = Terminal::Table.new :headings => ["VOLUMES", "USED", "AVAILABLE", "COMPRESSION", "COMPRESSRATIO"], :rows => report_rows
+      
+      table.align_column(2, :right)
+      table.align_column(3, :right)
+      table.align_column(4, :right)
+      
       puts table
       self.capacity
     
@@ -204,7 +210,13 @@ module Frachtraum
     def test()
       Frachtraum.run_system_test
     end
-  
+    
+    # --------------
+    
+    desc "version", "print version information"
+    def version()
+      puts "frachtraum version" + Frachtraum::VERSION
+    end
   end
 
 end

data/lib/frachtraum.rb

@@ -14,7 +14,7 @@ require 'frachtraum/osx'
 
 module Frachtraum
   
-  VERSION = '0.0.4-alpha'.freeze
+  VERSION = '0.0.5'.freeze
   
   # Kibibyte, Mebibyte, Gibibyte, etc... all the IEC sizes
   BYTES_IN_KiB = 2**10
@@ -100,15 +100,26 @@ module Frachtraum
     reported_values = [:used,:available,:compression,:compressratio]
     
     (Frachtraum::VOLUMES + Frachtraum::TIMEMACHINE_TARGETS).each do |dataset|
-      dataset_info = {}
-      if zfs_dataset_exists?(dataset)
+      volume_info = {}
+      
+      # fetch the values
+      if zfs_volume_exists?(dataset)
         reported_values.each do |repval|
-          dataset_info[repval] = %x( zfs get -o value -Hp #{repval.to_s} #{dataset} )
+          volume_info[repval] = %x( zfs get -o value -Hp #{repval.to_s} #{dataset} )
         end
       else
-        reported_values.each {|repval| dataset_info[repval] = "N/A" } 
+        reported_values.each {|repval| volume_info[repval] = "N/A" } 
       end
-      report_table[dataset] = dataset_info
+      
+      # calculate a total size for each volume
+      volume_info[:total] = 
+        if volume_info[:used]=="N/A" || volume_info[:available]=="N/A"
+          "N/A"
+        else 
+          volume_info[:used] + volume_info[:available]
+        end
+        
+      report_table[dataset] = volume_info
     end
 
     return report_table
@@ -137,7 +148,7 @@ module Frachtraum
     abort "sweeping not supported yet"
     
     target_volumes.each do |volume| 
-      if zfs_dataset_exists?(volume)
+      if zfs_volume_exists?(volume)
         # TODO
       end
     end
@@ -162,7 +173,7 @@ module Frachtraum
   module_function :run_system_test
   
   
-  def zfs_dataset_exists?(dataset)
+  def zfs_volume_exists?(dataset)
     output = %x( zfs get -H mounted #{dataset} 2>&1 )
     case output
     when /yes/
@@ -170,10 +181,10 @@ module Frachtraum
     when /dataset does not exist/, /permission denied/ 
       return false
     else 
-      abort "can't handle output of zfs_dataset_exists?: #{output}"
+      abort "can't handle output of zfs_volume_exists?: #{output}"
     end
   end
-  module_function :zfs_dataset_exists?
+  module_function :zfs_volume_exists?
   
 end # Frachtraum
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frachtraum
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.alpha
+  version: 0.0.5
 platform: ruby
 authors:
 - Maximilian Irro
@@ -115,9 +115,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.2