getch 0.1.0 → 0.1.1

data/lib/getch/gentoo/sources.rb

@@ -15,7 +15,7 @@ module Getch
 
       def build_kspp
         puts "Adding KSPP to the kernel source"
-        garden("-b -a systemd")
+        bask("-b -a systemd")
       end
 
       def make
@@ -26,8 +26,8 @@ module Getch
         end
       end
 
-      def init_config
-        Getch::Make.new("make localyesconfig").run!
+      def localmodconfig
+        Getch::Make.new("make localmodconfig").run!
       end
 
       private
@@ -43,37 +43,37 @@ module Getch
       def virtualbox_guest
         systemd=`systemd-detect-virt`.chomp
         return if ! ismatch?('vmwgfx') || systemd.match(/none/)
-        garden("-a virtualbox-guest")
+        bask("-a virtualbox-guest")
         Getch::Emerge.new("app-emulation/virtualbox-guest-additions").pkg!
       end
 
       def qemu_guest
-        garden("-a kvm-guest") if ismatch?('virtio')
-        garden("-a kvm") if ismatch?('kvm')
+        bask("-a kvm-host") if ismatch?('kvm')
+        bask("-a kvm-guest") if ismatch?('virtio')
       end
 
       def ismatch?(arg)
         @lsmod.match?(/#{arg}/)
       end
 
-      def garden(cmd)
-        Getch::Garden.new(cmd).run!
+      def bask(cmd)
+        Getch::Bask.new(cmd).run!
       end
 
       def install_wifi
         return if ! ismatch?('cfg80211')
-        garden("-a wifi")
+        bask("-a wifi")
         wifi_drivers
         Getch::Emerge.new("net-wireless/iw wpa_supplicant net-wireless/iwd").pkg!
       end
 
       def install_audio
         return if ! ismatch?('snd_pcm')
-        garden("-a sound")
+        bask("-a sound")
       end
 
       def wifi_drivers
-        garden("-a ath9k-driver") if ismatch?('ath9k')
+        bask("-a ath9k-driver") if ismatch?('ath9k')
       end
     end
   end

data/lib/getch/helpers.rb

@@ -55,4 +55,17 @@ module Helpers
       raise "Error with #{cmd}"
     end
   end
+
+  def self.partuuid(dev)
+    `lsblk -o PARTUUID #{dev}`.match(/[\w]+-[\w]+-[\w]+-[\w]+-[\w]+/)
+  end
+
+  def self.uuid(dev)
+    `lsblk -do UUID #{dev}`.match(/[\w]+-[\w]+-[\w]+-[\w]+-[\w]+/)
+  end
+
+  # Used with ZFS for the pool name
+  def self.pool_id(dev)
+    `lsblk -o PARTUUID #{dev}`.delete("\n").delete("PARTUUID").match(/[\w]{5}/)
+  end
 end

data/lib/getch/options.rb

@@ -2,7 +2,7 @@ require 'optparse'
 
 module Getch
   class Options
-    attr_reader :language, :zoneinfo, :keymap, :disk, :fs, :username, :encrypt, :verbose
+    attr_reader :language, :zoneinfo, :keymap, :disk, :fs, :username, :boot_disk, :cache_disk, :home_disk, :encrypt, :verbose
 
     def initialize(argv)
       @language = DEFAULT_OPTIONS[:language]
@@ -11,6 +11,9 @@ module Getch
       @disk = DEFAULT_OPTIONS[:disk]
       @fs = DEFAULT_OPTIONS[:fs]
       @username = DEFAULT_OPTIONS[:username]
+      @boot_disk = DEFAULT_OPTIONS[:boot_disk]
+      @cache_disk = DEFAULT_OPTIONS[:cache_disk]
+      @home_disk = DEFAULT_OPTIONS[:home_disk]
       @encrypt = DEFAULT_OPTIONS[:encrypt]
       @verbose = DEFAULT_OPTIONS[:verbose]
       parse(argv)
@@ -29,17 +32,29 @@ module Getch
         opts.on("-k", "--keymap KEY", "Default is us") do |key|
           @keymap = key
         end
-        opts.on("-d", "--disk DISK", "Disk where install Gentoo (sda,sdb)") do |disk|
+        opts.on("-d", "--disk DISK", "Disk where install Gentoo (sda,sdb), default use #{@disk}") do |disk|
           @disk = disk
         end
-        opts.on("-f", "--format FS", "Can be ext4, lvm. Default use ext4") do |fs|
+        opts.on("-f", "--format FS", "Can be ext4, lvm or zfs. Default use ext4") do |fs|
           @fs = fs
           DEFAULT_OPTIONS[:fs] = fs # dont known why, but it should be enforce
         end
-        opts.on("-u", "--username USERNAME", "Initialize /home/username") do |user|
+        opts.on("-u", "--username USERNAME", "Create a new user /home/USERNAME with password.") do |user|
           @username = user
         end
-        opts.on("--encrypt", "Encrypt your system with Luks2.") do
+        opts.on("--separate-boot DISK", "Disk for the boot/efi partition, default use #{@disk}") do |boot|
+          @boot_disk = boot
+          DEFAULT_OPTIONS[:boot_disk] = boot
+        end
+        opts.on("--separate-cache DISK", "Disk for the swap partition, add ZIL/L2ARC for ZFS when set, default use #{@disk}") do |swap|
+          @cache_disk = swap
+          DEFAULT_OPTIONS[:cache_disk] = swap
+        end
+        opts.on("--separate-home DISK", "Disk for the /home partition, default is nil") do |home|
+          @home_disk = home
+          DEFAULT_OPTIONS[:home_disk] = home
+        end
+        opts.on("--encrypt", "Encrypt your system.") do
           @encrypt = true
         end
         opts.on("--verbose", "Write more messages to the standard output.") do

data/lib/getch/version.rb

@@ -1,3 +1,3 @@
 module Getch
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -55,6 +55,8 @@ files:
 - lib/getch.rb
 - lib/getch/command.rb
 - lib/getch/filesystem.rb
+- lib/getch/filesystem/clean.rb
+- lib/getch/filesystem/device.rb
 - lib/getch/filesystem/ext4.rb
 - lib/getch/filesystem/ext4/config.rb
 - lib/getch/filesystem/ext4/deps.rb
@@ -83,6 +85,8 @@ files:
 - lib/getch/filesystem/lvm/format.rb
 - lib/getch/filesystem/lvm/mount.rb
 - lib/getch/filesystem/lvm/partition.rb
+- lib/getch/filesystem/mount.rb
+- lib/getch/filesystem/partition.rb
 - lib/getch/filesystem/zfs.rb
 - lib/getch/filesystem/zfs/config.rb
 - lib/getch/filesystem/zfs/deps.rb