getch 0.1.9 → 0.3.3

data/lib/getch/void/pre_config.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Getch
+  module Void
+    class PreConfig
+      def initialize
+        x
+      end
+
+      private
+
+      def x
+        Getch::Config::Locale.new
+        Getch::Config::PreNetwork.new
+      end
+    end
+  end
+end

data/lib/getch/void/services.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Getch
+  module Void
+    class Services
+      def initialize
+        x
+      end
+
+      protected
+
+      def x
+        Config::Iwd.new
+        Config::Dhcp.new
+      end
+    end
+  end
+end

data/lib/getch/void/{stage.rb → tarball.rb}

@@ -5,59 +5,79 @@ require 'open3'
 
 module Getch
   module Void
-    class RootFS
+    class Tarball
       def initialize
+        @log = Log.new
         @url = 'https://alpha.de.repo.voidlinux.org/live/current'
         @file = 'sha256sum.txt'
         @xbps = false
-        Dir.chdir(MOUNTPOINT)
+        Dir.chdir OPTIONS[:mountpoint]
+      end
+
+      def x
+        search_archive
+        download
+        checksum
+        install
+      end
+
+      protected
+
+      def tarball
+        OPTIONS[:musl] ?
+          /void-x86_64-musl-ROOTFS-[\d._]+.tar.xz/ :
+          /void-x86_64-ROOTFS-[\d._]+.tar.xz/
       end
 
       # Search only the glibc x86_64 for now
       def search_archive
         yurl = "#{@url}/#{@file}"
-        puts "Open #{yurl}"
+        @log.info "Opening #{yurl}...\n"
         Helpers.get_file_online(yurl, @file)
         File.open(@file).each do |l|
-          @xbps = l.tr('()', '').split(' ') if l.match(/void-x86_64-ROOTFS-[\d._]+.tar.xz/)
+          @xbps = l.tr('()', '').split(' ') if l.match(tarball)
         end
       end
 
       def download
-        raise StandardError, 'No file found, retry later.' unless @xbps
+        @log.fatal 'No file found, retry later.' unless @xbps
         return if File.exist? @xbps[1]
 
-        puts "Downloading #{@xbps[1]}..."
+        @log.info "Downloading #{@xbps[1]}..."
         Helpers.get_file_online("#{@url}/#{@xbps[1]}", @xbps[1])
+        @log.result_ok
       end
 
       def checksum
-        print ' => Checking SHA256 checksum...'
+        @log.info 'Checking SHA256 checksum...'
         # Should contain 2 spaces...
         command = "echo #{@xbps[3]}  #{@xbps[1]} | sha256sum --check"
         _, stderr, status = Open3.capture3(command)
         if status.success? then
-          puts "\t[OK]"
-          decompress
-          cleaning
+          @log.result_ok
           return
         end
         cleaning
-        raise "Problem with the checksum, stderr\n#{stderr}"
+        @log.fatal "Problem with the checksum, stderr\n#{stderr}"
+      end
+
+      def install
+        decompress
+        cleaning
       end
 
       private
 
       def decompress
-        print " => Decompressing archive #{@xbps[1]}..."
+        @log.info "Decompressing #{@xbps[1]}..."
         cmd = "tar xpf #{@xbps[1]} --xattrs-include=\'*.*\' --numeric-owner"
         _, stderr, status = Open3.capture3(cmd)
         if status.success? then
-          puts "\s[OK]"
+          @log.result_ok
           return
         end
         cleaning
-        raise "Fail to decompress archive #{@xbps[1]} - #{stderr}."
+        @log.fatal "Fail to decompressing #{@xbps[1]} - #{stderr}."
       end
 
       def cleaning

data/lib/getch/void/terraform.rb

@@ -0,0 +1,28 @@
+module Getch
+  module Void
+    class Terraform
+      def initialize
+        x
+      end
+
+      protected
+
+      def x
+        install_pkgs
+      end
+
+      def install_pkgs
+        @pkgs = 'sudo'
+        @pkgs << ' vim'
+        @pkgs << ' iptables'
+        @pkgs << ' runit-iptables'
+        @pkgs << ' iwd'
+        @pkgs << ' dhcpcd'
+        @pkgs << ' lvm2' if OPTIONS[:fs] == 'lvm'
+        @pkgs << ' zfs' if OPTIONS[:fs] == 'zfs'
+        @pkgs << ' cryptsetup' if OPTIONS[:encrypt]
+        Install.new(@pkgs)
+      end
+    end
+  end
+end

data/lib/getch/void/update.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Getch
+  module Void
+    class Update
+      def initialize
+        @log = Log.new
+        x
+      end
+
+      protected
+
+      # https://docs.voidlinux.org/installation/guides/chroot.html#install-base-system-rootfs-method-only
+      def x
+        sync
+        update
+      end
+
+      private
+
+      def sync
+        @log.info "Synchronize index...\n"
+        ChrootOutput.new '/usr/bin/xbps-install', '-Suy', 'xbps'
+      end
+
+      def update
+        ChrootOutput.new '/usr/bin/xbps-install -uy'
+        ChrootOutput.new '/usr/bin/xbps-install -y base-system'
+        ChrootOutput.new '/usr/bin/xbps-remove -y base-voidstrap'
+      end
+    end
+  end
+end

data/lib/getch/void.rb

@@ -1,65 +1,15 @@
 # frozen_string_literal: true
 
-require_relative 'void/stage'
-require_relative 'void/config'
-require_relative 'void/chroot'
-#require_relative 'void/sources'
-require_relative 'void/boot'
-
 module Getch
   module Void
-    class Main
-      def initialize
-        @state = Getch::States.new
-      end
-
-      def root_fs
-        return if STATES[:gentoo_base]
-
-        xbps = Getch::Void::RootFS.new
-        xbps.search_archive
-        xbps.download
-        xbps.checksum
-        @state.stage3
-      end
-
-      def config
-        return if STATES[:gentoo_config]
-
-        config = Getch::Void::Config.new
-        config.host
-        config.network
-        config.system
-        config.locale
-        @state.config
-      end
-
-      def chroot
-        return if STATES[:gentoo_kernel]
-
-        chroot = Getch::Void::Chroot.new
-        chroot.update
-        chroot.fs
-        chroot.extras
-        chroot.install_pkgs
-      end
-
-      def kernel
-        return if STATES[:gentoo_kernel]
-
-        Getch::Void::Sources.new
-        @state.kernel
-      end
-
-      def boot
-        boot = Getch::Void::Boot.new
-        boot.new_user
-        boot.fstab
-        boot.dracut
-        boot.grub
-        boot.initramfs
-        boot.finish
-      end
-    end
   end
 end
+
+require_relative 'void/tarball'
+require_relative 'void/pre_config'
+require_relative 'void/update'
+require_relative 'void/post_config'
+require_relative 'void/terraform'
+require_relative 'void/services'
+require_relative 'void/bootloader'
+require_relative 'void/finalize'

data/lib/getch.rb

@@ -5,7 +5,10 @@ require_relative 'getch/options'
 require_relative 'getch/states'
 require_relative 'getch/gentoo'
 require_relative 'getch/void'
+require_relative 'getch/device'
 require_relative 'getch/filesystem'
+require_relative 'getch/tree'
+require_relative 'getch/assembly'
 require_relative 'getch/command'
 require_relative 'getch/log'
 require_relative 'getch/config'
@@ -15,72 +18,65 @@ require_relative 'getch/version'
 module Getch
 
   OPTIONS = {
-    :language => 'en_US',
-    :zoneinfo => 'US/Eastern',
-    :keymap => 'us',
-    :disk => false,
-    :fs => 'ext4',
-    :username => false,
-    :os => 'gentoo',
-    :boot_disk => false,
-    :cache_disk => false,
-    :home_disk => false,
-    :encrypt => false,
-    :verbose => false
+    boot_disk: false,
+    disk: false,
+    cache_disk: false,
+    encrypt: false,
+    fs: 'ext4',
+    home_disk: false,
+    keymap: 'us',
+    language: 'en_US',
+    luks_name: 'luks',
+    lvm: false,
+    mountpoint: '/mnt/getch',
+    musl: false,
+    os: 'gentoo',
+    timezone: 'UTC',
+    username: false,
+    verbose: false,
+    vg_name: 'vg4',
+    zfs_name: 'pool'
   }
 
   STATES = {
-    :partition => false,
-    :format => false,
-    :mount => false,
-    :gentoo_base => false,
-    :gentoo_config => false,
-    :gentoo_update => false,
-    :gentoo_bootloader => false,
-    :gentoo_kernel => false
+    partition: false,
+    format: false,
+    mount: false,
+    tarball: false,
+    pre_config: false,
+    update: false,
+    post_config: false,
+    terraform: false,
+    bootloader: false,
+    services: false,
+    finalize: false,
   }
 
-  MOUNTPOINT = '/mnt/gentoo'
-
-  DEFAULT_FS = {
-    true => {
-      ext4: FileSystem::Ext4::Encrypt,
-      lvm: FileSystem::Lvm::Encrypt,
-      zfs: FileSystem::Zfs::Encrypt
-    },
-    false => {
-      ext4: FileSystem::Ext4,
-      lvm: FileSystem::Lvm,
-      zfs: FileSystem::Zfs,
-    }
-  }.freeze
-
-  def self.select_fs
-    encrypt = OPTIONS[:encrypt]
-    fs_sym = OPTIONS[:fs].to_sym
-    DEFAULT_FS[encrypt][fs_sym]
-  end
+  MOUNTPOINT = '/mnt/getch'
+  DEVS = {}
 
   class Main
     def initialize(argv)
       argv[:cli]
-      @class_fs = Getch::select_fs
       @log = Log.new
-      Getch::States.new # Update States
+      @assembly = Assembly.new
     end
 
     def resume
-      raise 'No disk, use at least getch with -d DISK' unless OPTIONS[:disk]
+      STATES[:partition] && return
+
+      @log.fatal 'No disk, use at least getch with -d DISK' unless OPTIONS[:disk]
 
       puts "\nBuild " + OPTIONS[:os].capitalize + " Linux with the following args:\n"
       puts
       puts "\tLang: #{OPTIONS[:language]}"
-      puts "\tZoneinfo: #{OPTIONS[:zoneinfo]}"
+      puts "\tTimezone: #{OPTIONS[:timezone]}"
       puts "\tKeymap: #{OPTIONS[:keymap]}"
       puts "\tDisk: #{OPTIONS[:disk]}"
       puts "\tFilesystem: #{OPTIONS[:fs]}"
       puts "\tUsername: #{OPTIONS[:username]}"
       puts "\tEncrypt: #{OPTIONS[:encrypt]}"
+      puts "\tMusl: #{OPTIONS[:musl]}"
       puts
       puts "\tseparate-boot disk: #{OPTIONS[:boot_disk]}"
       puts "\tseparate-cache disk: #{OPTIONS[:cache_disk]}"
@@ -89,67 +85,39 @@ module Getch
       print 'Continue? (y,N) '
       case gets.chomp
       when /^y|^Y/
-        return
       else
         exit
       end
     end
 
-    def partition
-      return if STATES[:partition]
-
-      puts
-      print "Partition and format disk #{OPTIONS[:disk]}, this will erase all data, continue? (y,N) "
-      case gets.chomp
-      when /^y|^Y/
-        @log.info('Partition start')
-        @class_fs::Partition.new
-      else
-        exit
-      end
+    def prepare_disk
+      @assembly.clean
+      @assembly.partition
+      @assembly.format
+      @assembly.mount
     end
 
-    def format
-      return if STATES[:format]
-
-      @class_fs::Format.new
+    def install_system
+      @assembly.tarball
+      @assembly.pre_config
+      @assembly.update
+      @assembly.post_config
     end
 
-    def mount
-      return if STATES[:mount]
-
-      @class_fs::Mount.new.run
+    def terraform
+      @assembly.terraform
+      @assembly.services
     end
 
-    def install
-      if OPTIONS[:os] == 'gentoo'
-        install_gentoo
-      elsif OPTIONS[:os] == 'void'
-        install_void
-      else
-        puts "Options #{OPTIONS[:os]} not supported...."
-        exit 1
-      end
+    def bootloader
+      @assembly.luks_keys
+      @assembly.bootloader
     end
 
-    def install_gentoo
-      gentoo = Getch::Gentoo::Main.new
-      gentoo.stage3
-      gentoo.config
-      gentoo.chroot
-      gentoo.bootloader
-      gentoo.kernel
-      gentoo.boot
+    def finalize
+      @assembly.finalize
     end
 
-    def install_void
-      void = Getch::Void::Main.new
-      void.root_fs
-      void.config
-      void.chroot
-      void.boot
-    end
-    
     def configure
       config = Getch::Config::Main.new
       config.ethernet