frachtraum 0.0.9 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzVhMzAwMGU3NjQ1MGE5MTk1MDNkNjJhMDMxMzgzZjc4ZTk0YmE3ZQ==
+    MjFhYTE5ZTJhZThiZjE1OTM2YjQ3MmEwMDlmOTA3YmE4MzdiYmJiNQ==
   data.tar.gz: !binary |-
-    YjhjODhjM2QwMGQwMTBiN2NmN2VlNTMzMDczMjkxZjcwYmRmZTk4ZA==
+    NDQyZGNmOThjZTJmMjliYjUwOTU5NGU3ZmY2NzUzM2E5NWQxNzliNw==
 SHA512:
   metadata.gz: !binary |-
-    MGZkNDAyNTM1N2QwYzgxZGRjZTE1OGM1MmZiYmU4MGQ3NTNlZDg2YTBjYTJh
-    ODE3NmNhZjhlZjZiMTEwN2NlOTFiMDE3NTc2YmExMzQ2NTZlZjA2ZTM5NWVm
-    ZmQ0YzcxOTAzMWRjMDgxN2RkYjA3ZmNjOWZjYjBlZWE5NjAwYTQ=
+    NjAwN2M1MjMwOGZmMDBiYjE2ODBhMWQ3MTc2Nzg5Y2ViMmU4NmRjOTE0MWY0
+    YzQwMDNlNjNlZTA1NDFkMGNiZTk0MmIwYjE4ZTIyNGMyNmIzZjNkZDNmNWJm
+    MmMyMmRhZmYzZWFiZTg4MDJiZjQ0M2JiMGYxZDczNTIzOWRiZjg=
   data.tar.gz: !binary |-
-    NWUzZTY1NTExNjY5NzVlZGUxNDJiYTM3NmY5ZjA2MTlkYTA4NjAxNDc4YTI1
-    MWFlMDQ2YTdhNjQ5ZGFmMGIzMjRmNzdjZGJhMGE5OGM4NDhiN2M4YzNhNGE0
-    ZGVhMTM2ZDgzNTE0YTY0ZjkxNGRiOTE4MzdkYTM2YjRlYTMyOTI=
+    MTQzODI3Y2E2NThlZGUwMWIzNTYyMDFiODkzNjg0NDJkZDU4YTg4YzUwNjY3
+    ODE2YmY1MzdhZDlmMmU2ZTdkMDRhOTk4MDFhZWIwMmU5ZjAwZjA4ZWNhM2I5
+    YjliMjU1ODQ5YjRlOTdmZDc4YWZiMjA4NjA3M2VmODUyZTlmMTg=

data/lib/frachtraum.rb

@@ -13,41 +13,45 @@ require 'frachtraum/linux'
 require 'frachtraum/osx'
 
 module Frachtraum
-  
-  VERSION = '0.0.9'.freeze
-  
+
+  VERSION = '0.0.12'.freeze
+
   # Kibibyte, Mebibyte, Gibibyte, etc... all the IEC sizes
   BYTES_IN_KiB = 2**10
   BYTES_IN_MiB = 2**20
   BYTES_IN_GiB = 2**30
   BYTES_IN_TiB = 2**40
 
-  # these define a KB as 1000 bits, according to the SI prefix 
+  # these define a KB as 1000 bits, according to the SI prefix
   BYTES_IN_KB = 10**3
   BYTES_IN_MB = 10**6
   BYTES_IN_GB = 10**9
   BYTES_IN_TB = 10**12
-  
+
   OUTPUT_DOTS_LEN = 40 # TODO: the length should be dynamically calculated, based on the strlen of longest tmtarget or volume
-  
+
+
+  CHECKMARK = "\u2713" # => ✓
+  BALLOTX   = "\u2717" # => ✗
+
   def exec_cmd(msg, cmd)
-    
+
     print msg
-    
+
     Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
       puts line while line = stdout_err.gets
-      
+
       exit_status = wait_thr.value
       if exit_status.success?
         puts Rainbow("done").green
       else
-        abort Rainbow("FAILED!").red + " --> #{stdout_err}" 
+        abort Rainbow("FAILED!").red + " --> #{stdout_err}"
       end
     end
   end # exec_cmd
-  
+
   # ---------------
-  
+
   def pretty_SI_bytes(bytes)
     return "%.1f TB" % (bytes.to_f / BYTES_IN_TB) if bytes > BYTES_IN_TB
     return "%.1f GB" % (bytes.to_f / BYTES_IN_GB) if bytes > BYTES_IN_GB
@@ -56,7 +60,7 @@ module Frachtraum
     return "#{bytes} B"
   end
   module_function :pretty_SI_bytes
-  
+
   def pretty_IEC_bytes(bytes)
     return "%.1f TiB" % (bytes.to_f / BYTES_IN_TiB) if bytes > BYTES_IN_TiB
     return "%.1f GiB" % (bytes.to_f / BYTES_IN_GiB) if bytes > BYTES_IN_GiB
@@ -65,7 +69,7 @@ module Frachtraum
     return "#{bytes} B"
   end
   module_function :pretty_IEC_bytes
-  
+
   def attach(password, volume=nil)
     case RUBY_PLATFORM
       when /bsd/    then attach_bsd   password, volume
@@ -75,70 +79,72 @@ module Frachtraum
     end
   end
   module_function :attach
-  
+
   def capacity()
     total_used  = 0
     total_avail = 0
     Frachtraum::VOLUMES.each do |volume|
       used  = %x( zfs get -o value -Hp used #{volume} 2>&1 )
       avail = %x( zfs get -o value -Hp available #{volume} 2>&1 )
-      
+
       total_used  += (used =="" ? 0 : used).to_i  # / 1000 # 1024
       total_avail += (avail=="" ? 0 : avail).to_i # / 1000 # 1024
     end
-    
+
     total = total_used + total_avail
-    
+
     return {:total => total, :avail => total_avail, :used => total_used}
   end
   module_function :capacity
-  
+
   def report()
-    
+
     report_table = {}
     reported_values = [:used,:available,:compression,:compressratio]
-    
+
     (Frachtraum::VOLUMES + Frachtraum::TIMEMACHINE_TARGETS).each do |dataset|
       volume_info = {}
-      
+
       # fetch the values
       if zfs_volume_exists?(dataset)
         reported_values.each do |repval|
           volume_info[repval] = %x( zfs get -o value -Hp #{repval.to_s} #{dataset} )
         end
       else
-        reported_values.each {|repval| volume_info[repval] = "N/A" } 
+        reported_values.each {|repval| volume_info[repval] = "N/A" }
       end
-      
+
       # calculate a total size for each volume
-      volume_info[:total] = 
+      volume_info[:total] =
         if volume_info[:used]=="N/A" || volume_info[:available]=="N/A"
           "N/A"
-        else 
+        else
           (volume_info[:used].to_i + volume_info[:available].to_i)
         end
-        
-        volume_info[:usage] = 
+
+        volume_info[:usage] =
           if volume_info[:total] == 0
             "0 %"
           elsif volume_info[:used]=="N/A" || volume_info[:total]=="N/A"
             "N/A"
+          elsif volume_info[:available].to_i == 0
+            "100 %"
           else
             (100 * volume_info[:used].to_f / volume_info[:total].to_f ).to_i.to_s + " %"
           end
-        
+
       report_table[dataset] = volume_info
     end
 
     return report_table
   end
   module_function :report
-  
-  
+
+
   def setupdisk(dev, label, password, compression, encryption, keylength, mountpoint)
-    
+
     abort "untested procedure -- won't continue"
-    
+
     case RUBY_PLATFORM
       when /bsd/    then setupdisk_bsd   dev, label, password, compression, encryption, keylength, mountpoint
       when /linux/  then setupdisk_linux dev, label, password, compression, encryption, keylength, mountpoint
@@ -147,54 +153,51 @@ module Frachtraum
     end
   end
   module_function :setupdisk
-  
+
   def sweep(volume)
-    
+
     target_volumes = volume.nil? ? Frachtraum::VOLUMES : volume
-    
+
     # TODO
     abort "sweeping not supported yet"
-    
-    target_volumes.each do |volume| 
+
+    target_volumes.each do |volume|
       if zfs_volume_exists?(volume)
         # TODO
       end
     end
   end
   module_function :sweep
-  
+
 
   def run_system_test()
-    tool_list = []  
+    tool_list = []
     case RUBY_PLATFORM
       when /bsd/    then tool_list = REQUIRED_TOOLS_BSD
       when /linux/  then tool_list = REQUIRED_TOOLS_LINUX
       #when /darwin/ then tool_list = REQUIRED_TOOLS_OSX
       else abort "OS not supported"
     end
-    
+
     tool_list.each { |tool| find_executable tool }
-    
+
     # find_executable seems to create such file in case executable is not found
     File.delete 'mkmf.log' if File.exists?('mkmf.log')
   end # run_system_test
   module_function :run_system_test
-  
-  
+
+
   def zfs_volume_exists?(dataset)
     output = %x( zfs get -H mounted #{dataset} 2>&1 )
     case output
     when /yes/
       return true
-    when /dataset does not exist/, /permission denied/ 
+    when /dataset does not exist/, /permission denied/
       return false
-    else 
+    else
       abort "can't handle output of zfs_volume_exists?: #{output}"
     end
   end
   module_function :zfs_volume_exists?
-  
-end # Frachtraum
-
-
 
+end # Frachtraum

data/lib/frachtraum/bsd.rb

@@ -1,79 +1,79 @@
 module Frachtraum
-  
+
   REQUIRED_TOOLS_BSD = ['dd','grep','gpart','glabel','geli','zfs','zpool']
-  
+
   def attach_bsd(password, volume=nil)
-    
+
     # if we provided a specific depot, run procedure only on that one
     volumes = volume.nil? ? Frachtraum::VOLUMES : [ volume ]
-    
+
     # first of all, decrypt and mount all depots
-    volumes.each do |v|      
-      print "decrypting #{v}...".ljust(OUTPUT_DOTS_LEN,".") 
-      
+    volumes.each do |v|
+      print "decrypting #{v}...".ljust(OUTPUT_DOTS_LEN,".")
+
       output = %x( echo #{password} | geli attach -d -j - /dev/label/#{v} 2>&1 )
-      if $?.success? 
+      if $?.success?
         output = %x( zfs mount #{v} 2>&1 )
-        if $?.success? then puts Rainbow("DONE").green
-        else puts Rainbow("FAILED!").red + " --> #{output}" end
-      else 
-        puts Rainbow("FAILED!").red + " --> #{output}"
+        if $?.success? then puts Rainbow(CHECKMARK).green
+        else puts Rainbow("#{BALLOTX}\n#{output}").red end
+      else
+        puts Rainbow("#{BALLOTX}\n#{output}").red
       end
     end # volumes.each
-    
+
     # mount timemachine targets as well
     Frachtraum::TIMEMACHINE_TARGETS.each do |tmtarget|
-      print "mounting tm #{tmtarget}...".ljust(OUTPUT_DOTS_LEN,".") 
+      print "mounting #{tmtarget}...".ljust(OUTPUT_DOTS_LEN,".")
 
       output = %x( zfs mount #{tmtarget} 2>&1 )
-      if $?.success? then puts Rainbow("DONE").green 
-      else puts Rainbow("FAILED!").red + " --> #{output}" end
+      if $?.success? then puts Rainbow(CHECKMARK).green
+      else puts Rainbow("#{BALLOTX}\n#{output}").red end
     end
-    
+
     # restart samba so it reports the correct pool size
-    print "restarting samba server...".ljust(OUTPUT_DOTS_LEN,".") 
-    
+    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
+    if $?.success? then puts Rainbow(CHECKMARK).green
+    else puts Rainbow("#{BALLOTX}\n#{output}").red end
   end
-  
+
   def setupdisk_bsd(dev, label, password, compression, encryption, keylength, mountpoint)
-    
+
     # TODO password promt, confirmation question, etc..
     abort "implementation not ready yet"
-    
-    
-    exec_cmd "destroying previous partitioning on /dev/#{dev}...", 
+
+
+    exec_cmd "destroying previous partitioning on /dev/#{dev}...",
              "dd if=/dev/zero of=/dev/#{dev} bs=512 count=1"
-    
-    exec_cmd "creating gpart container on /dev/#{dev}...", 
+
+    exec_cmd "creating gpart container on /dev/#{dev}...",
              "gpart create -s GPT #{dev}"
 
-    exec_cmd "labeling /dev/#{dev} with '#{label}'...", 
+    exec_cmd "labeling /dev/#{dev} with '#{label}'...",
              "glabel label -v #{label} /dev/#{dev}"
 
     exec_cmd "initialising /dev/#{dev} as password protected GEOM provider with #{encryption} encryption...",
              "echo #{password} | geli init -s #{keylength} -e #{encryption} -J - /dev/label/#{label}"
- 
-    exec_cmd "attaching /dev/label/#{label} as GEOM provider, creating device /dev/label/#{label}.eli...", 
+
+    exec_cmd "attaching /dev/label/#{label} as GEOM provider, creating device /dev/label/#{label}.eli...",
              "echo #{password} | geli attach -d -j - /dev/label/#{label}"
 
-    exec_cmd "creating zpool #{mountpoint}/#{label} on encrypted device /dev/label/#{label}.eli...", 
+    exec_cmd "creating zpool #{mountpoint}/#{label} on encrypted device /dev/label/#{label}.eli...",
              "zpool create -m #{mountpoint}/#{label} #{label} /dev/label/#{label}.eli"
 
-    exec_cmd "setting compression '#{compression}' for new zfs on #{mountpoint}/#{label}...", 
-             "zfs set compression=#{compression} #{label}" 
+    exec_cmd "setting compression '#{compression}' for new zfs on #{mountpoint}/#{label}...",
+             "zfs set compression=#{compression} #{label}"
 
-    exec_cmd "setting permissions...", 
+    exec_cmd "setting permissions...",
              "chmod -R 775 #{mountpoint}/#{label}"
 
     puts "setup finished"
-    
+
   end # setupdisk_bsd
-  
+
   # well, we need this line so attach can call attach_bsd
   # but I honestly don't know why...
   extend self
-  
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frachtraum
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.12
 platform: ruby
 authors:
 - Maximilian Irro