getch 0.0.9 → 0.1.5

data/lib/getch/helpers.rb

@@ -1,7 +1,6 @@
 require 'open-uri'
 require 'open3'
 require 'fileutils'
-require_relative 'command'
 
 module Helpers
   def self.efi?
@@ -31,20 +30,12 @@ module Helpers
     File.write path, content if ! File.exist? path
   end
 
-  def self.emerge(pkgs, path)
-    cmd = "chroot #{path} /bin/bash -c \"
-      source /etc/profile
-      emerge --changed-use #{pkgs}
-    \""
-    Getch::Command.new(cmd).run!
+  def self.mkdir(dir)
+    FileUtils.mkdir_p dir if ! Dir.exist? dir
   end
 
-  def self.run_chroot(cmd, path)
-    script = "chroot #{path} /bin/bash -c \"
-      source /etc/profile
-      #{cmd}
-    \""
-    Getch::Command.new(script).run!
+  def self.touch(file)
+    File.write file, '' if ! File.exist? file
   end
 
   def self.grep?(file, regex)
@@ -64,4 +55,31 @@ 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)
+    if dev.match(/[0-9]/)
+      sleep 1
+      `lsblk -o PARTUUID #{dev}`.delete("\n").delete("PARTUUID").match(/[\w]{5}/)
+    else
+      puts "Please, enter a pool name"
+      while true
+        print "\n> "
+        value = gets
+        if value.match(/[a-z]{4,20}/)
+          return value
+        end
+        puts "Bad name, you enter: #{value}"
+        puts "Valid pool name use character only, between 4-20."
+      end
+    end
+  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)
@@ -24,22 +27,34 @@ module Getch
           @language = lang
         end
         opts.on("-z", "--zoneinfo ZONE", "Default is US/Eastern") do |zone|
-          @zoneinfo = zone
+          @zoneinfo = Getch::Guard.zone(zone)
         end
         opts.on("-k", "--keymap KEY", "Default is us") do |key|
-          @keymap = key
+          @keymap = Getch::Guard.keymap(key)
         end
-        opts.on("-d", "--disk DISK", "Disk where install Gentoo (sda,sdb)") do |disk|
-          @disk = disk
+        opts.on("-d", "--disk DISK", "Disk where install Gentoo (sda,sdb), default use #{@disk}") do |disk|
+          @disk = Getch::Guard.disk(disk)
         end
-        opts.on("-f", "--format FS", "Can be ext4, lvm. Default use ext4") do |fs|
-          @fs = fs
+        opts.on("-f", "--format FS", "Can be ext4, lvm or zfs. Default use ext4") do |fs|
+          @fs = Getch::Guard.format(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 = Getch::Guard.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 = Getch::Guard.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 = Getch::Guard.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.0.9'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.5
 platform: ruby
 authors:
 - szorfein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1zem9y
-  ZmVpbi9EQz1wcm90b25tYWlsL0RDPWNvbTAeFw0yMDA0MzAxNzAxNDBaFw0yMTA0
-  MzAxNzAxNDBaMCgxJjAkBgNVBAMMHXN6b3JmZWluL0RDPXByb3Rvbm1haWwvREM9
+  ZmVpbi9EQz1wcm90b25tYWlsL0RDPWNvbTAeFw0yMTA1MTEyMTAzNDZaFw0yMjA1
+  MTEyMTAzNDZaMCgxJjAkBgNVBAMMHXN6b3JmZWluL0RDPXByb3Rvbm1haWwvREM9
   Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAxCTYZRndCTRy18rE
   exr2wig/staa0G5kt99xqaBYD0dnIRBr/GO5dFntlBVwmefQlTrNbygVUIYTb8Vg
   B1oX3v/LLW9SRQcWaZwou0tARqanm5WhgV1ZYQTs22endTazsDHw0uhM3V+FgDh+
@@ -25,19 +25,19 @@ cert_chain:
   BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUc8XWveAjxS5fVEOZeeZe
   uUQmbhMwIgYDVR0RBBswGYEXc3pvcmZlaW5AcHJvdG9ubWFpbC5jb20wIgYDVR0S
   BBswGYEXc3pvcmZlaW5AcHJvdG9ubWFpbC5jb20wDQYJKoZIhvcNAQELBQADggGB
-  AG4K1ZJdzcVABSnVuD83z5ne9eBlrYscHHSXev5FX32jFdKxl19FQ+eorjSOTsNq
-  SIgKneQOKdsWIlv8M6NDiUDcc1s504fOpIVtMbP+6n47hBGz4bzGlAdtvTO1PewK
-  tW6ii8TOCOJ3Pv6bTzQlsaQrADi2MHuVHTb14H7uoSFJNzfU4sYJn1C3PRMC3G7n
-  Qe/zVOdMf0bkwBnfQNojbwx3Vy1jr2JSQWjK25NYimpuKV0skanU0iBiqru6VCbK
-  zhDNufCgCnWLwXXET3onVQMZsiLTUFf30BXX7PY1O0Km15MQn1HzOecJ3ZIDBWtS
-  d/lg1MHB7+/FQAY5FujZqvVv5i2M9wLx+7N4ONRA7MsWD86hLiYN68QeRsHI+LNf
-  AnVdw7i28f3GhZldcdllblGeTOjSfwl9wL4yBb1UwVjvcwMR5SDed0yPmHPXBiAC
-  J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
-  Tw==
+  AHuRqWvtAx1PSIEcvq1uzgBclzP+Lhp6J1f7McvbfzHAZuLo5Nv9iFHkLl2ad9gx
+  p/X2/p8PmgiUNFSXDdB12Pn/VbX4DdoQujwXvmZbQo2KmooklHIhM6AJMafOHW1N
+  qjHIwGvMY5bJfn+3qEQNV+yip6KnCUQVklw132IFvdusoBOPfEP48p41deXbIhNP
+  GNJQ4qkZfXWdLumikb2Y432kIIeugIIAL57VD+wwDUJ3MciiLufYT7v9WNSFRenV
+  JDNGIh3AYiCnNO2DWIArrW6/jaof3A0OnjRQ64vS+EKhZFp8+y6rfC3Clrfjdjse
+  a4zH3TI57bnzfkx5xhjhIu6LJnBpk0x8Y/N2kVmwB+GonFiRcVzZpIfOLvy03tn5
+  dAHfUn//hrBJAT9EXRHNUoLyEmFsCPabTCXjQH6EM2uBcsrjQN4SlgBNzsKc8bS4
+  F9Dl4EPzjBJOgQWf+NxzxNuNKI46Lp5Q8AI+xtDUHAPbSswHa40BA6ChFehP+j0L
+  fg==
   -----END CERTIFICATE-----
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - szorfein@protonmail.com
 executables:
@@ -54,7 +54,10 @@ files:
 - getch.gemspec
 - lib/getch.rb
 - lib/getch/command.rb
+- lib/getch/config.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,12 +86,31 @@ 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
+- lib/getch/filesystem/zfs/device.rb
+- lib/getch/filesystem/zfs/encrypt.rb
+- lib/getch/filesystem/zfs/encrypt/config.rb
+- lib/getch/filesystem/zfs/encrypt/deps.rb
+- lib/getch/filesystem/zfs/encrypt/device.rb
+- lib/getch/filesystem/zfs/encrypt/format.rb
+- lib/getch/filesystem/zfs/encrypt/mount.rb
+- lib/getch/filesystem/zfs/encrypt/partition.rb
+- lib/getch/filesystem/zfs/format.rb
+- lib/getch/filesystem/zfs/mount.rb
+- lib/getch/filesystem/zfs/partition.rb
 - lib/getch/gentoo.rb
 - lib/getch/gentoo/boot.rb
 - lib/getch/gentoo/chroot.rb
 - lib/getch/gentoo/config.rb
 - lib/getch/gentoo/sources.rb
 - lib/getch/gentoo/stage.rb
+- lib/getch/gentoo/use.rb
+- lib/getch/gentoo/use_flag.rb
+- lib/getch/guard.rb
 - lib/getch/helpers.rb
 - lib/getch/log.rb
 - lib/getch/options.rb
@@ -101,7 +123,7 @@ metadata:
   changelog_uri: https://github.com/szorfein/getch/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/szorfein/getch/issues
   wiki_uri: https://github.com/szorfein/getch
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A CLI tool to install Gentoo
 test_files: []