frachtraum 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTNlZjE2YmIwY2NhMmFiNzYyNzA4MTYyNTJmNTRhN2E5YTFmNzRkNw==
+    YzA0MGRkZTg3NzhjZGE3NzE0ODI1NmFiZTgxM2JhMWM2ZjM3YWE0Mg==
   data.tar.gz: !binary |-
-    NWY4N2NmYzQyZTM0MGExN2M1ZGZlMjYxODZiMDlmYmNjZTcxMTljMg==
+    MDM4OGU4ZjQyMTBhODA1YzgxOGI2ZDY2MWI4Y2NkZjViZTdhZTQ2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTVjNzg3YzY0MmQ5ZWYzNDE1NzcxNDU2NGY1MWUxMWQxOTMzMjE1NTQ1YjE1
-    ZmEwYmNkNjQyZjYyZDA0YTY4N2I2MGM2YzliZjg2M2U0MmQzNmFmODBmYmQy
-    ZDQxMGYxMTM1ZDEyZDhhMGE3NmZmN2RkZjI5NmEwYTBlNDlmNjc=
+    ZWFlYTE2NTRjNmE1MzUzMmEyMzFiNzZkZmY5YzkyZTc3ZDI5ODRiMDQzNjFm
+    ODNiZWU3NGVkYmFmMzc5ZmE3MjNlYjhhYmQzMjA5ZWQ3Mjg0MDU0MTc3ZTVk
+    NzgwMjNmMzY1ODU5Y2ZjOTJiMGRiNzhkMWIzMjFjNzllYzRiZDY=
   data.tar.gz: !binary |-
-    NmE4NjFmZDhhNWNhNmUyZjFjMzFjYzMxYjlkNmQxNmU1OWQwNjY1ZjA4YTQx
-    ZDRkZjA4MWYxZmU0YWJlYzJmZGFlMDA2NTZkZjJlNzhkZTBmZGZhOGFlZmNj
-    MDdmOWI0ODkyZTQ1ZTVhMjgxZWE0YmU1MTU5MDA1M2Y3YWZkOTc=
+    NTNhNmI5M2Y1MDZiNmY5ODUyOWIwMGU1ZDkxNjE5ZWI5OGM3ZmUwMWQzYjJi
+    ZmYzODRlZWFkYTE4ZWYxNjE5NzJkNWQ5MmQ1ZTUzNWYwMTAwNDAzMmY4ZDNh
+    ZTMxZmMyZDFmYmViMzFhYTQ0OTY2NDI2NWYzOTA5MTNhNjVhM2Y=

data/.gitignore

@@ -0,0 +1,34 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in fsinv.gemspec
+# Specify your gem's dependencies in frachtraum.gemspec
 gemspec

data/bin/frachtraum

@@ -2,198 +2,5 @@
 # -*- encoding : utf-8 -*-
 
 require 'frachtraum'
-require 'thor'
-require 'highline/import'
-require 'rainbow'
 
-def prompt_password(prompt="Password: ")
-  HighLine.ask(prompt) { |q| 
-    q.echo = false 
-    # q.echo = "*"
-  }
-end
-
-class FrachtraumCLI < Thor
-  
-  desc "attach [DEPOT]", "decrypt and mount depot(s)"
-  long_desc <<-LONGDESC
-    `frachtraum attach` will prompt you for a password.
-    
-    The password is used to decrypt all depots specified
-    in #{Frachtraum::CONFIG_FILE}
-
-    You can optionally specify a single depot. In this case
-    only this depot will be decrypted and mounted.
-  LONGDESC
-  def attach(depot=nil)
-    
-    password = prompt_password
-    
-    Frachtraum.attach password, depot
-  end
-  
-  # --------------
-  
-  desc "capacity [OPTION]", "calculate storage capacity"
-  long_desc <<-LONGDESC
-    `frachtraum capacity` will output capacity...
-
-    lorem ipsum
-  LONGDESC
-  def capacity(option=nil)
-    c = Frachtraum.capacity
-    
-    case option
-    when "smb", "samba"
-      puts "#{c[:total]/1000} #{c[:avail]/1000}"
-    else
-      puts ""
-      puts "Capacity:"
-      puts "    Available: #{Frachtraum.pretty_SI_bytes(c[:avail])}"
-      puts "    Used:      #{Frachtraum.pretty_SI_bytes(c[:used])}"
-      puts "    Total:     #{Frachtraum.pretty_SI_bytes(c[:total])}"
-      puts ""
-    end
-  end
-  
-  # --------------
-  
-  desc "list", "list depots and/or timemachine targets"
-  long_desc <<-LONGDESC
-    lorem ipsum
-  LONGDESC
-  option :simple, :type => :boolean
-  def list(subset=nil)
-    
-    list_width = 60 # character length of list
-
-    if subset == "depot" || subset == "depots" || subset.nil?
-      if options[:simple]
-        Frachtraum::DEPOTS.each{ |depot| puts depot }
-      else
-        puts "" # empty line
-        puts "Depots:"
-        puts "" # empty line
-        Frachtraum::DEPOTS.each{ |dataset| 
-          status = 
-            if Frachtraum.zfs_dataset_exists?(dataset)
-              Rainbow("attached").green
-            else
-              Rainbow("UNAVAILABLE").red
-            end
-          status = "[#{status}]".rjust(list_width-dataset.length)
-          puts "    #{dataset}#{status}" 
-        }
-        puts "" # empty line
-      end
-    end
-    
-    if subset == "timemachine" || subset == "tm" || subset.nil?
-      if options[:simple]
-        Frachtraum::TIMEMACHINE_TARGETS.each{ |depot| puts depot }
-      else
-        puts "" unless subset.nil? # empty line
-        puts "Timemachine targets:"
-        puts "" # empty line
-        Frachtraum::TIMEMACHINE_TARGETS.each{ |dataset| 
-          status = 
-            if Frachtraum.zfs_dataset_exists?(dataset)
-              Rainbow("attached").green
-            else
-              Rainbow("UNAVAILABLE").red
-            end
-          status = "[#{status}]".rjust(list_width-dataset.length)
-          puts "    #{dataset}#{status}" 
-        }
-        puts "" # empty line
-      end
-    end 
-  end
-  
-  # --------------
-  
-  desc "report", "lorem ipsum"
-  long_desc <<-LONGDESC
-    lorem ipsum
-  LONGDESC
-  def report()
-    # TODO
-  end
-  
-  # --------------
-  
-  desc "setupdisk", "setup a device as a new depot"
-  long_desc <<-LONGDESC
-    `frachtraum setup dev label` will setup...
-    
-    lorem ispum
-  LONGDESC
-  options :compression => :string, :encryption => :string, :keylength => :integer, :mountpoint => :string
-  def setupdisk(dev,label)
-    
-    compression = options[:compression] ? options[:compression] : Frachtraum::COMPRESSION
-    encryption  = options[:encryption]  ? options[:encryption]  : Frachtraum::ENCRYPTION
-    keylength   = options[:keylength]   ? options[:keylength]   : Frachtraum::KEYLENGTH
-    mountpoint  = options[:mountpoint]  ? options[:mountpoint]  : Frachtraum::MOUNTPOINT
-    
-    password1 = prompt_password("enter encryption password: ")
-    password2 = prompt_password("enter password again: ")
-    if password1.match(password2)
-      password = password1
-    else
-      abort "passwords not equal!"
-    end
-    
-    puts ""
-    puts "Device:      #{dev}"
-    puts "Label:       #{label}"
-    puts "Compression: #{compression}"
-    puts "Encryption:  #{encryption}"
-    puts "Keylength:   #{keylength}"
-    puts "Mountpoint:  #{mountpoint}"
-    puts ""
-    puts "ATTENTION! This is a destructive action. All data on the device will be"
-    puts "wiped. If you forget you password, you will not be able to access any"
-    puts "containing data any more."
-    puts ""
-    
-    answer = HighLine.ask("Are you sure you want to continue? (type 'yes'): ") { |q| q.echo = true }
-    
-    if answer.downcase.match("yes")
-      Frachtraum.setupdisk dev, label, password, compression, encryption, keylength, mountpoint
-    else
-      abort "ABORT -- device will not pe processed!"
-    end
-  end
-  
-  # --------------
-  
-  desc "sweep", "sweep the depots!"
-  long_desc <<-LONGDESC
-    `frachtraum sweep` will ...
-
-    lorem ipsum
-  LONGDESC
-  def sweep()
-    # TODO
-    Frachtraum::DEPOTS.each do |depot| 
-    
-    
-    end
-  end
-  
-  # --------------
-  
-  desc "test", "test system for compatibility"
-  long_desc <<-LONGDESC
-    `frachtraum test` will test...
-
-    lorem ipsum
-  LONGDESC
-  def test()
-    Frachtraum.run_system_test
-  end
-  
-end
- 
-FrachtraumCLI.start(ARGV)
+Frachtraum::CLI.start(ARGV)

data/frachtraum.conf.example

@@ -3,8 +3,8 @@
 # Copy it to ~/.frachtraum.conf and edit it to your own needs
 #
 compression = lz4
-depots 		= depot1,depot2,depot3
+volumes		= volume1,volume2,volume3
 encryption 	= AES-XTS
 keylength 	= 4096
 mountpoint 	= /frachtraum
-tmtargets	= depot1/TimeMachine/user1,depot1/TimeMachine/user2
+tmtargets	= volume1/TimeMachine/user1,volume1/TimeMachine/user2

data/frachtraum.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'highline', '~> 1.6.21'
   spec.add_dependency 'parseconfig', '~> 1.0.4'
   spec.add_dependency 'rainbow', '~> 2.0.0'
+  spec.add_dependency 'terminal-table', '~> 1.4.5'
 
 end

data/lib/frachtraum/bsd.rb

@@ -2,29 +2,28 @@ module Frachtraum
   
   REQUIRED_TOOLS_BSD   = ['dd','grep','gpart','glabel','geli','zfs','zpool']
   
-  
-  def attach_bsd(password, depot=nil)
+  def attach_bsd(password, volume=nil)
     
     # if we provided a specific depot, run procedure only on that one
-    depots = depot.nil? ? DEPOTS : [ depot ]
+    volumes = volume.nil? ? Frachtraum::VOLUMES : [ volume ]
     
     # first of all, decrypt and mount all depots
-    depots.each do |depot|      
-      print "decrypting /dev/label/#{depot}..."
+    volumes.each do |v|      
+      print "decrypting /dev/label/#{v}...".ljust(35,".") # TODO: the length should be dynamically calculated, for tm targets as well
       
-      output = %x( echo #{password} | geli attach -d -j - /dev/label/#{depot} 2>&1 )
+      output = %x( echo #{password} | geli attach -d -j - /dev/label/#{v} 2>&1 )
       if $?.success? 
-        output = %x( zfs mount #{depot} 2>&1 )
-        if $?.success? then puts "DONE"
-        else puts "FAILED! --> #{output}" end
+        output = %x( zfs mount #{v} 2>&1 )
+        if $?.success? then puts Rainbow("DONE").green
+        else puts Rainbow("FAILED!").red + " --> #{output}" end
       else 
-        puts "FAILED! --> #{output}" 
+        puts Rainbow("FAILED!").red + " --> #{output}"
       end
     end # each
     
     # mount timemachine targets as well
-    TIMEMACHINE_TARGETS.each do |tmtarget|
-      print "mounting timemachine target #{tmtarget}..."
+    Frachtraum::TIMEMACHINE_TARGETS.each do |tmtarget|
+      print "mounting timemachine target #{tmtarget}...".ljust(35,".") # TODO: the length should be dynamically calculated, for tm targets as well
 
       output = %x( zfs mount #{tmtarget} 2>&1 )
       if $?.success? then puts "DONE"
@@ -34,8 +33,8 @@ module Frachtraum
     # restart samba so it reports the correct pool size
     print "restarting samba server..."
     output = %x( /usr/local/etc/rc.d/samba restart 2>&1 )
-    if $?.success? then puts "DONE"
-    else puts "FAILED! --> #{output}" end
+    if $?.success? then puts Rainbow("DONE").green
+    else puts Rainbow("FAILED!").red + " --> #{output}" end
   end
   
   def setupdisk_bsd(dev, label, password, compression, encryption, keylength, mountpoint)
@@ -72,4 +71,8 @@ module Frachtraum
     
   end # setupdisk_bsd
   
+  # well, we need this line so attach can call attach_bsd
+  # but I honestly don't know why...
+  extend self
+  
 end

data/lib/frachtraum/cli.rb

@@ -0,0 +1,210 @@
+
+require 'thor'
+require 'highline/import'
+require 'rainbow'
+require 'terminal-table'
+
+def prompt_password(prompt="Password: ")
+  HighLine.ask(prompt) { |q| q.echo = false }
+end
+
+module Frachtraum
+  
+  class Frachtraum::CLI < Thor
+  
+    desc "attach [VOLUME]", "decrypt and mount volume(s)"
+    long_desc <<-LONGDESC
+      `frachtraum attach` will prompt you for a password.
+    
+      The password is used to decrypt all volume specified
+      in #{Frachtraum::CONFIG_FILE}
+
+      You can optionally specify a single volume. In this case
+      only this volume will be decrypted and mounted.
+    LONGDESC
+    def attach(volume=nil)
+    
+      password = prompt_password
+    
+      Frachtraum.attach password, volume
+    end
+  
+    # --------------
+  
+    desc "capacity [OPTION]", "show overall storage capacity"
+    long_desc <<-LONGDESC
+      `frachtraum capacity` will output capacity...
+
+      lorem ipsum
+    LONGDESC
+    def capacity(option=nil)
+      c = Frachtraum.capacity
+    
+      case option
+      when "smb", "samba"
+        puts "#{c[:total]/1000} #{c[:avail]/1000}"
+      else
+        puts ""
+        puts "Capacity:"
+        puts "    Available: #{Frachtraum.pretty_SI_bytes(c[:avail])}"
+        puts "    Used:      #{Frachtraum.pretty_SI_bytes(c[:used])}"
+        puts "    Total:     #{Frachtraum.pretty_SI_bytes(c[:total])}"
+        puts ""
+      end
+    end
+  
+    # --------------
+  
+    desc "list", "list volumes and/or timemachine targets"
+    long_desc <<-LONGDESC
+      lorem ipsum
+    LONGDESC
+    option :simple, :type => :boolean
+    def list(subset=nil)
+    
+      # TODO: this needs to be a constant, or calculated as CONST + max length of volume/tm
+      list_width = 60 # character length of list
+
+      if subset == "volume" || subset == "volumes" || subset.nil?
+        if options[:simple]
+          Frachtraum::VOLUMES.each{ |volume| puts volume }
+        else
+          puts "" # empty line
+          puts "Volumes:"
+          puts "" # empty line
+          Frachtraum::VOLUMES.each{ |volume| 
+            status = 
+              if Frachtraum.zfs_dataset_exists?(volume)
+                Rainbow("attached").green
+              else
+                Rainbow("UNAVAILABLE").red
+              end
+            status = "[#{status}]".rjust(list_width-volume.length)
+            puts "    #{volume}#{status}" 
+          }
+          puts "" # empty line
+        end
+      end
+    
+      if subset == "timemachine" || subset == "tm" || subset.nil?
+        if options[:simple]
+          Frachtraum::TIMEMACHINE_TARGETS.each{ |dataset| puts dataset }
+        else
+          puts "" unless subset.nil? # empty line
+          puts "Timemachine targets:"
+          puts "" # empty line
+          Frachtraum::TIMEMACHINE_TARGETS.each{ |dataset| 
+            status = 
+              if Frachtraum.zfs_dataset_exists?(dataset)
+                Rainbow("attached").green
+              else
+                Rainbow("UNAVAILABLE").red
+              end
+            status = "[#{status}]".rjust(list_width-dataset.length)
+            puts "    #{dataset}#{status}" 
+          }
+          puts "" # empty line
+        end
+      end 
+    end
+  
+    # --------------
+  
+    desc "report", "Print a detailed report on your frachtraum"
+    long_desc <<-LONGDESC
+      lorem ipsum
+    LONGDESC
+    def report()
+    
+      report_rows = []
+      report_data = Frachtraum.report
+      report_data.keys.each do |volume|
+        volume_h = report_data[volume]
+        report_rows << [ volume, 
+                         Frachtraum.pretty_SI_bytes(volume_h[:used].to_i), 
+                         Frachtraum.pretty_SI_bytes(volume_h[:available].to_i), 
+                         volume_h[:compression], 
+                         volume_h[:compressratio]
+                       ]
+      end
+    
+      # TODO
+      table = Terminal::Table.new :headings => ["VOLUMES", "USED", "AVAILABLE", "COMPRESSION", "COMPRESSRATIO"], :rows => report_rows
+      puts table
+      self.capacity
+    
+    end
+  
+    # --------------
+  
+    desc "setupdisk", "setup a device as a new volume"
+    long_desc <<-LONGDESC
+      `frachtraum setup dev label` will setup...
+    
+      lorem ispum
+    LONGDESC
+    options :compression => :string, :encryption => :string, :keylength => :integer, :mountpoint => :string
+    def setupdisk(dev,label)
+    
+      compression = options[:compression] ? options[:compression] : Frachtraum::COMPRESSION
+      encryption  = options[:encryption]  ? options[:encryption]  : Frachtraum::ENCRYPTION
+      keylength   = options[:keylength]   ? options[:keylength]   : Frachtraum::KEYLENGTH
+      mountpoint  = options[:mountpoint]  ? options[:mountpoint]  : Frachtraum::MOUNTPOINT
+    
+      password1 = prompt_password("enter encryption password: ")
+      password2 = prompt_password("enter password again: ")
+      if password1.match(password2)
+        password = password1
+      else
+        abort "passwords not equal!"
+      end
+    
+      puts ""
+      puts "Device:      #{dev}"
+      puts "Label:       #{label}"
+      puts "Compression: #{compression}"
+      puts "Encryption:  #{encryption}"
+      puts "Keylength:   #{keylength}"
+      puts "Mountpoint:  #{mountpoint}"
+      puts ""
+      puts "ATTENTION! This is a destructive action. All data on the device will be"
+      puts "wiped. If you forget you password, you will not be able to access any"
+      puts "containing data any more."
+      puts ""
+    
+      answer = HighLine.ask("Are you sure you want to continue? (type 'yes'): ") { |q| q.echo = true }
+    
+      if answer.downcase.match("yes")
+        Frachtraum.setupdisk dev, label, password, compression, encryption, keylength, mountpoint
+      else
+        abort "ABORT -- device will not pe processed!"
+      end
+    end
+  
+    # --------------
+  
+    desc "sweep [VOLUME]", "sweep the volumes!"
+    long_desc <<-LONGDESC
+      `frachtraum sweep` will ...
+
+      lorem ipsum
+    LONGDESC
+    def sweep(volume=nil)
+      Frachtraum.sweep volume
+    end
+  
+    # --------------
+  
+    desc "test", "test system for compatibility"
+    long_desc <<-LONGDESC
+      `frachtraum test` will test...
+
+      lorem ipsum
+    LONGDESC
+    def test()
+      Frachtraum.run_system_test
+    end
+  
+  end
+
+end

data/lib/frachtraum/config.rb

@@ -10,7 +10,7 @@ module Frachtraum
     KEYLENGTH   = config['keylength']
     MOUNTPOINT  = config['mountpoint']
   
-    DEPOTS = config['depots'].split(',')
+    VOLUMES = config['volumes'].split(',')
     TIMEMACHINE_TARGETS = config['tmtargets'].split(',')
   else
     COMPRESSION = 'lz4'
@@ -18,7 +18,7 @@ module Frachtraum
     KEYLENGTH   = 4096
     MOUNTPOINT  = '/frachtraum'
   
-    DEPOTS = []
+    VOLUMES = []
     TIMEMACHINE_TARGETS = []
   end
 end

data/lib/frachtraum/linux.rb

@@ -2,7 +2,7 @@ module Frachtraum
   
   REQUIRED_TOOLS_LINUX = [] # not yet supported
   
-  def attach_linux(password, depot)
+  def attach_linux(password, volume)
     # TODO
     abort "not yet implemented"
   end
@@ -12,4 +12,6 @@ module Frachtraum
     abort "not yet implemented"
   end # setupdisk_linux
   
+  extend self
+  
 end

data/lib/frachtraum/osx.rb

@@ -8,7 +8,7 @@ module Frachtraum
   
   REQUIRED_TOOLS_OSX = [] # not yet supported
   
-  def attach_osx(password, depot)
+  def attach_osx(password, volume)
     # TODO
     abort "not yet implemented"
   end
@@ -18,4 +18,6 @@ module Frachtraum
     abort "not yet implemented"
   end # setupdisk_osx
   
+  extend self
+  
 end

data/lib/frachtraum.rb

@@ -7,15 +7,15 @@ require 'open3'
 require 'parseconfig'
 
 require 'frachtraum/config'
+require 'frachtraum/cli'
 require 'frachtraum/bsd'
 require 'frachtraum/linux'
-
+require 'frachtraum/osx'
 
 module Frachtraum
   
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
   
-
   # Kibibyte, Mebibyte, Gibibyte, etc... all the IEC sizes
   BYTES_IN_KiB = 2**10
   BYTES_IN_MiB = 2**20
@@ -38,9 +38,9 @@ module Frachtraum
       
       exit_status = wait_thr.value
       if exit_status.success?
-        puts "done"
+        puts Rainbow("done").green
       else
-        abort "FAILED! --> #{stdout_err}"
+        abort Rainbow("FAILED!").red + " --> #{stdout_err}" 
       end
     end
   end # exec_cmd
@@ -65,10 +65,12 @@ module Frachtraum
   end
   module_function :pretty_IEC_bytes
   
-  def attach(password, depot=nil)
+  def attach(password, volume=nil)
     case RUBY_PLATFORM
-      when /bsd/   then attach_bsd   password, depot
-      when /linux/ then attach_linux password, depot
+      when /bsd/    then attach_bsd   password, volume
+      when /linux/  then attach_linux password, volume
+      #when /darwin/ then attach_osx   password, volume
+      else abort "OS not supported"
     end
   end
   module_function :attach
@@ -76,9 +78,9 @@ module Frachtraum
   def capacity()
     total_used  = 0
     total_avail = 0
-    DEPOTS.each do |depot|
-      used  = %x( zfs get -o value -Hp used #{MOUNTPOINT}/#{depot} )
-      avail = %x( zfs get -o value -Hp available #{MOUNTPOINT}/#{depot} )
+    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
@@ -90,31 +92,67 @@ module Frachtraum
   end
   module_function :capacity
   
+  def report()
+    
+    report_table = {}
+    reported_values = [:used,:available,:compression,:compressratio]
+    
+    (Frachtraum::VOLUMES + Frachtraum::TIMEMACHINE_TARGETS).each do |dataset|
+      dataset_info = {}
+      if zfs_dataset_exists?(dataset)
+        reported_values.each do |repval|
+          dataset_info[repval] = %x( zfs get -o value -Hp #{repval.to_s} #{dataset} )
+        end
+      else
+        reported_values.each {|repval| dataset_info[repval] = "N/A" } 
+      end
+      report_table[dataset] = dataset_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
+      when /bsd/    then setupdisk_bsd   dev, label, password, compression, encryption, keylength, mountpoint
+      when /linux/  then setupdisk_linux dev, label, password, compression, encryption, keylength, mountpoint
+      #when /darwin/ then setupdisk_osx   dev, label, password, compression, encryption, keylength, mountpoint
       else abort "OS not supported"
     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| 
+      if zfs_dataset_exists?(volume)
+        # TODO
+      end
+    end
+  end
+  module_function :sweep
+  
 
   def run_system_test()
     tool_list = []  
     case RUBY_PLATFORM
-      when /bsd/   then tool_list = REQUIRED_TOOLS_BSD
-      when /linux/ then tool_list = REQUIRED_TOOLS_LINUX
+      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 do |tool|
-      find_executable tool
-    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')
@@ -125,30 +163,16 @@ module Frachtraum
   def zfs_dataset_exists?(dataset)
     output = %x( zfs get -H mounted #{dataset} 2>&1 )
     case output
-      when /yes/
-        return true
-      when /dataset does not exist/, /permission denied/ 
-        return false
-      else 
-        abort "can't handle output of zfs_dataset_exists?: #{output}"
+    when /yes/
+      return true
+    when /dataset does not exist/, /permission denied/ 
+      return false
+    else 
+      abort "can't handle output of zfs_dataset_exists?: #{output}"
     end
   end
   module_function :zfs_dataset_exists?
   
-  def zfs_dataset_compression_ratio(dataset)
-    cmd = "zfs get compressratio #{dataset} | grep compressratio"
-    Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
-      output = stdout_err.gets
-      if output == ""
-        return "N/A"
-      else
-        parts = output.split(' ')
-        return parts[2] # => ratio
-      end
-    end
-  end
-  module_function :zfs_dataset_compression_ratio
-  
 end # Frachtraum
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frachtraum
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Maximilian Irro
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
 description: lorem ipsum
 email: max@disposia.org
 executables:
@@ -73,6 +87,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -81,6 +96,7 @@ files:
 - frachtraum.gemspec
 - lib/frachtraum.rb
 - lib/frachtraum/bsd.rb
+- lib/frachtraum/cli.rb
 - lib/frachtraum/config.rb
 - lib/frachtraum/linux.rb
 - lib/frachtraum/osx.rb