getch 0.0.4 → 0.0.9

data/lib/getch/gentoo/chroot.rb

@@ -3,21 +3,22 @@ module Getch
     class Chroot
       def initialize
         @state = Getch::States.new()
+        @pkgs = []
         mount
       end
 
       def update
         return if STATES[:gentoo_update]
         puts "Downloading the last ebuilds for Gentoo..."
-        cmd = "emerge-webrsync"
+        Helpers::create_dir("#{MOUNTPOINT}/var/db/repos/gentoo")
+        cmd = "emaint sync --auto"
         exec_chroot(cmd)
       end
 
       def world
         return if STATES[:gentoo_update]
-        puts "Update Gentoo"
-        cmd = "emerge --update --deep --newuse @world"
-        exec_chroot(cmd)
+        puts "Update Gentoo world"
+        Getch::Emerge.new("emerge --update --deep --newuse @world").run!
         @state.update
       end
 
@@ -29,10 +30,10 @@ module Getch
 
       def kernel
         return if Dir.exist? "#{MOUNTPOINT}/usr/src/linux"
-        puts "Installing kernel gentoo-sources..."
         license = "#{MOUNTPOINT}/etc/portage/package.license"
         File.write(license, "sys-kernel/linux-firmware linux-fw-redistributable no-source-code\n")
-        Helpers::emerge("sys-kernel/gentoo-sources linux-firmware", MOUNTPOINT)
+        @pkgs << "sys-kernel/gentoo-sources"
+        @pkgs << "dev-util/dwarves"
       end
 
       def kernel_deps
@@ -41,8 +42,12 @@ module Getch
         garden_dep
       end
 
-      def install_tools
-        Helpers::emerge("dhcpcd", MOUNTPOINT)
+      def install_pkgs
+        @pkgs << "app-admin/sudo"
+        @pkgs << "app-editors/vim"
+        all_pkgs = @pkgs.join(" ")
+        puts "Installing #{all_pkgs}..."
+        Getch::Emerge.new(all_pkgs).pkg!
       end
 
       private
@@ -54,14 +59,13 @@ module Getch
 
         Dir.chdir("#{MOUNTPOINT}/root")
         Helpers::get_file_online(url, file)
-        Helpers::exec_or_die("tar xzf #{file}") if ! Dir.exist? 'garden-master'
+        Getch::Command.new("tar xzf #{file}").run! if ! Dir.exist? 'garden-master'
       end
 
       def garden_dep
-        Helpers::emerge("gentoolkit", MOUNTPOINT)
-        cmd = "euse -p sys-apps/kmod -E lzma"
-        Helpers::emerge("kmod", MOUNTPOINT)
-        exec_chroot(cmd)
+        Getch::Emerge.new("gentoolkit").pkg!
+        exec_chroot("euse -p sys-apps/kmod -E lzma")
+        @pkgs << "sys-apps/kmod"
       end
 
       def mount
@@ -80,7 +84,7 @@ module Getch
           source /etc/profile
           #{cmd}
         \""
-        Helpers::exec_or_die(script)
+        Getch::Command.new(script).run!
       end
     end
   end

data/lib/getch/gentoo/config.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'tempfile'
+require 'securerandom'
 
 module Getch
   module Gentoo
@@ -10,29 +11,38 @@ module Getch
 
       def portage
         nproc = `nproc`.chomp()
-        efi = Helpers::efi? ? 'GRUB_PLATFORMS="efi-64"' : ''
+        grub_pc = Helpers::efi? ? '' : 'GRUB_PLATFORMS="pc"'
+        quiet = DEFAULT_OPTIONS[:verbose] ? '' : "EMERGE_DEFAULT_OPTS=\"--jobs=#{nproc} --load-average=#{nproc}\""
         data = [
           '',
-          'ACCEPT_KEYWORD="amd64 ~amd64"',
+          'ACCEPT_KEYWORDS="amd64"',
           "MAKEOPTS=\"-j#{nproc} -l#{nproc}\"",
+          quiet,
           'INPUT_DEVICES="libinput"',
-          efi
+          grub_pc
         ]
         File.write(@make, data.join("\n"), mode: "a")
       end
 
+      # Write a repos.conf/gentoo.conf with the gpg verification
       def repo
         src = "#{MOUNTPOINT}/usr/share/portage/config/repos.conf"
         dest = "#{MOUNTPOINT}/etc/portage/repos.conf"
         FileUtils.mkdir dest, mode: 0644 if ! Dir.exist?(dest)
+        tmp = Tempfile.new('gentoo.conf')
         line_count = 0
-        tmp_file = Tempfile.new('gentoo.conf')
+
         File.open(src).each { |l|
-          File.write(tmp_file, "sync-allow-hardlinks = yes\n", mode: 'a') if line_count == 2
-          File.write(tmp_file, l, mode: 'a')
+          File.write(tmp, "sync-allow-hardlinks = yes\n", mode: 'a') if line_count == 2
+          if l.match(/^sync-type = rsync/)
+            File.write(tmp, "sync-type = webrsync\n", mode: 'a')
+          else
+            File.write(tmp, l, mode: 'a')
+          end
           line_count += 1
         }
-        FileUtils.copy_file(tmp_file, "#{dest}/gentoo.conf", preserve = false)
+
+        FileUtils.copy_file(tmp, "#{dest}/gentoo.conf", preserve = false)
       end
 
       def network
@@ -47,7 +57,12 @@ module Getch
         File.write("#{MOUNTPOINT}/etc/locale.conf", "LANG=#{@lang}\n")
         File.write("#{MOUNTPOINT}/etc/locale.conf", 'LC_COLLATE=C', mode: 'a')
         File.write("#{MOUNTPOINT}/etc/timezone", "#{options.zoneinfo}")
-        File.write("#{MOUNTPOINT}/etc/vconsole.conf", "KEYMAP=#{options.keyboard}")
+        File.write("#{MOUNTPOINT}/etc/vconsole.conf", "KEYMAP=#{options.keymap}")
+      end
+
+      def hostname
+        id = SecureRandom.hex(2)
+        File.write("#{MOUNTPOINT}/etc/hostname", "gentoo-hatch-#{id}")
       end
 
       def portage_fs
@@ -66,7 +81,7 @@ module Getch
       def control_options(options)
         search_zone(options.zoneinfo)
         search_utf8(options.language)
-        search_key(options.keyboard)
+        search_key(options.keymap)
       end
 
       def search_key(keys)

data/lib/getch/gentoo/sources.rb

@@ -3,63 +3,88 @@ module Getch
     class Sources
       def initialize
         @lsmod = `lsmod`.chomp
-        @linux = '/usr/src/linux'
+        @filesystem = Getch.class_fs::Deps.new()
       end
 
       def build_others
-        install_wifi if ismatch?('iwlwifi')
         install_zfs if ismatch?('zfs')
-        exec("./kernel.sh -b -a virtualbox-guest -k #{@linux}") if ismatch?('vmwgfx')
+        virtualbox_guest
+        qemu_guest
+        install_wifi
+        install_audio
       end
 
       def build_kspp
         puts "Adding KSPP to the kernel source"
-        exec("./kernel.sh -b -a systemd -k #{@linux}")
+        garden("-b -a systemd")
       end
 
       def make
-        puts "Compiling kernel sources"
-        only_make
-        cmd = "cd #{@linux} && make modules_install && make install"
-        exec_chroot(cmd)
+        if DEFAULT_OPTIONS[:fs] == 'lvm' or DEFAULT_OPTIONS[:encrypt]
+          @filesystem.make
+        else
+          just_make
+        end
       end
 
-      def only_make
-        exec_chroot("cd #{@linux} && make -j$(nproc)")
+      def init_config
+        Getch::Make.new("make localyesconfig").run!
       end
 
       private
 
+      def only_make
+        Getch::Make.new("make -j$(nproc)").run!
+      end
+
+      def just_make
+        puts "Compiling kernel sources"
+        cmd = "make -j$(nproc) && make modules_install && make install"
+        Getch::Make.new(cmd).run!
+        is_kernel = Dir.glob("#{MOUNTPOINT}/boot/vmlinuz-*")
+        raise "No kernel installed, compiling source fail..." if is_kernel == []
+      end
+
+      def virtualbox_guest
+        return if ! ismatch?('vmwgfx')
+        garden("-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')
+      end
+
       def ismatch?(arg)
         @lsmod.match?(/#{arg}/)
       end
 
-      def exec(cmd)
-        script = "chroot #{MOUNTPOINT} /bin/bash -c \"
-          source /etc/profile
-          cd /root/garden-master
-          #{cmd}
-        \""
-        Helpers::exec_or_die(script)
+      def garden(cmd)
+        Getch::Garden.new(cmd).run!
       end
 
-      def exec_chroot(cmd)
-        script = "chroot #{MOUNTPOINT} /bin/bash -c \"
-          source /etc/profile
-          #{cmd}
-        \""
-        Helpers::exec_or_die(script)
+      def install_wifi
+        return if ! ismatch?('cfg80211')
+        garden("-a wifi")
+        wifi_drivers
+        Getch::Emerge.new("net-wireless/iw wpa_supplicant net-wireless/iwd").pkg!
       end
 
-      def install_wifi
-        exec("./kernel.sh -b -a wifi -k #{@linux}")
-        Helpers::emerge("net-wireless/iw wpa_supplicant", MOUNTPOINT)
+      def install_audio
+        return if ! ismatch?('snd_pcm')
+        garden("-a sound")
       end
 
       def install_zfs
-        exec("./kernel.sh -b -a zfs -k #{@linux}")
-        only_make # a first make is necessary before emerge zfs
-        Helpers::emerge("zfs", MOUNTPOINT)
+        return if ! DEFAULT_OPTIONS[:fs] == 'zfs'
+        garden("-a zfs")
+        only_make # a first 'make' is necessary before emerge zfs
+        Getch::Emerge.new("sys-fs/zfs").pkg!
+      end
+
+      def wifi_drivers
+        garden("-a ath9k-driver") if ismatch?('ath9k')
       end
     end
   end

data/lib/getch/gentoo/stage.rb

@@ -60,8 +60,8 @@ module Getch
       # https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Stage
       def decompress
         puts "Decompressing archive #{@stage_file}..."
-        cmd = "tar xpvf #{@stage_file} --xattrs-include='*.*' --numeric-owner"
-        Helpers::exec_or_die(cmd)
+        cmd = "tar xpf #{@stage_file} --xattrs-include=\'*.*\' --numeric-owner"
+        Getch::Command.new(cmd).run!
       end
 
       def cleaning

data/lib/getch/helpers.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'open3'
 require 'fileutils'
+require_relative 'command'
 
 module Helpers
   def self.efi?
@@ -35,6 +36,32 @@ module Helpers
       source /etc/profile
       emerge --changed-use #{pkgs}
     \""
-    exec_or_die(cmd)
+    Getch::Command.new(cmd).run!
+  end
+
+  def self.run_chroot(cmd, path)
+    script = "chroot #{path} /bin/bash -c \"
+      source /etc/profile
+      #{cmd}
+    \""
+    Getch::Command.new(script).run!
+  end
+
+  def self.grep?(file, regex)
+    is_found = false
+    return is_found if ! File.exist? file
+    File.open(file) do |f|
+      f.each do |line|
+        is_found = true if line.match(regex)
+      end
+    end
+    is_found
+  end
+
+  def self.sys(cmd)
+    system(cmd)
+    unless $?.success?
+      raise "Error with #{cmd}"
+    end
   end
 end

data/lib/getch/log.rb

@@ -0,0 +1,54 @@
+require 'logger'
+
+module Getch
+  class Log
+    def initialize
+      @log_file = '/tmp/log_install.txt'
+      check_file
+      init_log
+      init_log_text
+    end
+
+    def info(msg)
+      @logger.info(msg)
+      @logger_text.info(msg)
+    end
+
+    def error(msg)
+      @logger.error(msg)
+      @logger_text.error(msg)
+    end
+
+    def debug(msg)
+      @logger.debug(msg)
+      @logger_text.debug(msg)
+    end
+
+    def fatal(msg)
+      @logger.fatal(msg)
+      @logger_text.fatal(msg)
+    end
+
+    private
+
+    def check_file
+      puts "Creating log at #{@log_file}" if ! File.exist? @log_file
+    end
+
+    def init_log
+      @logger = Logger.new(STDOUT)
+      @logger.level = DEFAULT_OPTIONS[:verbose] ? Logger::DEBUG : Logger::INFO
+      @logger.formatter = proc { |severity, datetime, progname, msg|
+        "#{severity}, #{msg}\n" 
+      }
+    end
+
+    def init_log_text
+      @logger_text = Logger.new(@log_file, 1)
+      @logger_text.level = Logger::DEBUG
+      @logger_text.formatter = proc { |severity, datetime, progname, msg|
+        "#{severity}, #{datetime}, #{msg}\n" 
+      }
+    end
+  end
+end

data/lib/getch/options.rb

@@ -2,15 +2,17 @@ require 'optparse'
 
 module Getch
   class Options
-    attr_reader :language, :zoneinfo, :keyboard, :disk, :fs, :username
+    attr_reader :language, :zoneinfo, :keymap, :disk, :fs, :username, :encrypt, :verbose
 
     def initialize(argv)
       @language = DEFAULT_OPTIONS[:language]
-      @zoneinfo = DEFAULT_OPTIONS[:location]
-      @keyboard = DEFAULT_OPTIONS[:keyboard]
+      @zoneinfo = DEFAULT_OPTIONS[:zoneinfo]
+      @keymap = DEFAULT_OPTIONS[:keymap]
       @disk = DEFAULT_OPTIONS[:disk]
       @fs = DEFAULT_OPTIONS[:fs]
       @username = DEFAULT_OPTIONS[:username]
+      @encrypt = DEFAULT_OPTIONS[:encrypt]
+      @verbose = DEFAULT_OPTIONS[:verbose]
       parse(argv)
     end
 
@@ -24,23 +26,30 @@ module Getch
         opts.on("-z", "--zoneinfo ZONE", "Default is US/Eastern") do |zone|
           @zoneinfo = zone
         end
-        opts.on("-k", "--keyboard KEY", "Default is us") do |key|
-          @keyboard = key
+        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|
           @disk = disk
         end
-        opts.on("-f", "--format FS", "Default use ext4") do |fs|
+        opts.on("-f", "--format FS", "Can be ext4, lvm. 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|
           @username = user
         end
+        opts.on("--encrypt", "Encrypt your system with Luks2.") do
+          @encrypt = true
+        end
+        opts.on("--verbose", "Write more messages to the standard output.") do
+          @verbose = true
+        end
         opts.on("-h", "--help", "Display this") do
           puts opts
           exit
         end
-      end.parse!
+      end.parse!(into: DEFAULT_OPTIONS)
     end
   end
 end

data/lib/getch/version.rb

@@ -1,3 +1,3 @@
 module Getch
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -53,7 +53,36 @@ files:
 - bin/setup.sh
 - getch.gemspec
 - lib/getch.rb
-- lib/getch/disk.rb
+- lib/getch/command.rb
+- lib/getch/filesystem.rb
+- lib/getch/filesystem/ext4.rb
+- lib/getch/filesystem/ext4/config.rb
+- lib/getch/filesystem/ext4/deps.rb
+- lib/getch/filesystem/ext4/device.rb
+- lib/getch/filesystem/ext4/encrypt.rb
+- lib/getch/filesystem/ext4/encrypt/config.rb
+- lib/getch/filesystem/ext4/encrypt/deps.rb
+- lib/getch/filesystem/ext4/encrypt/device.rb
+- lib/getch/filesystem/ext4/encrypt/format.rb
+- lib/getch/filesystem/ext4/encrypt/mount.rb
+- lib/getch/filesystem/ext4/encrypt/partition.rb
+- lib/getch/filesystem/ext4/format.rb
+- lib/getch/filesystem/ext4/mount.rb
+- lib/getch/filesystem/ext4/partition.rb
+- lib/getch/filesystem/lvm.rb
+- lib/getch/filesystem/lvm/config.rb
+- lib/getch/filesystem/lvm/deps.rb
+- lib/getch/filesystem/lvm/device.rb
+- lib/getch/filesystem/lvm/encrypt.rb
+- lib/getch/filesystem/lvm/encrypt/config.rb
+- lib/getch/filesystem/lvm/encrypt/deps.rb
+- lib/getch/filesystem/lvm/encrypt/device.rb
+- lib/getch/filesystem/lvm/encrypt/format.rb
+- lib/getch/filesystem/lvm/encrypt/mount.rb
+- lib/getch/filesystem/lvm/encrypt/partition.rb
+- lib/getch/filesystem/lvm/format.rb
+- lib/getch/filesystem/lvm/mount.rb
+- lib/getch/filesystem/lvm/partition.rb
 - lib/getch/gentoo.rb
 - lib/getch/gentoo/boot.rb
 - lib/getch/gentoo/chroot.rb
@@ -61,7 +90,7 @@ files:
 - lib/getch/gentoo/sources.rb
 - lib/getch/gentoo/stage.rb
 - lib/getch/helpers.rb
-- lib/getch/mount.rb
+- lib/getch/log.rb
 - lib/getch/options.rb
 - lib/getch/states.rb
 - lib/getch/version.rb
@@ -87,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A CLI tool to install Gentoo