getch 0.1.6 → 0.1.9

data/lib/getch/void/chroot.rb

@@ -1,4 +1,4 @@
-require_relative '../helpers'
+# frozen_string_literal: true
 
 module Getch
   module Void
@@ -6,7 +6,7 @@ module Getch
       include Helpers::Void
 
       def initialize
-        @state = Getch::States.new()
+        @state = Getch::States.new
         @pkgs = []
         mount
       end
@@ -14,39 +14,40 @@ module Getch
       # https://docs.voidlinux.org/installation/guides/chroot.html#install-base-system-rootfs-method-only
       def update
         return if STATES[:gentoo_update]
-        command_output "/usr/bin/xbps-install -Suy xbps" # y to force (--yes)
-        command_output "/usr/bin/xbps-install -uy"
-        command_output "/usr/bin/xbps-install -y base-system"
-        #command_output "/usr/bin/xbps-remove base-voidstrap"
+
+        command_output '/usr/bin/xbps-install -Suy xbps' # y to force (--yes)
+        command_output '/usr/bin/xbps-install -uy'
+        command_output '/usr/bin/xbps-install -y base-system'
+        #command_output '/usr/bin/xbps-remove base-voidstrap'
         @state.update
       end
 
       def extras
-        @pkgs << "vim"
-        @pkgs << "iptables"
-        @pkgs << "iwd"
+        @pkgs << 'vim'
+        @pkgs << 'iptables'
+        @pkgs << 'iwd'
       end
 
       def fs
-        @pkgs << "lvm2" if OPTIONS[:fs] == 'lvm'
-        @pkgs << "zfs" if OPTIONS[:fs] == 'zfs'
-        @pkgs << "cryptsetup" if OPTIONS[:encrypt]
+        @pkgs << 'lvm2' if OPTIONS[:fs] == 'lvm'
+        @pkgs << 'zfs' if OPTIONS[:fs] == 'zfs'
+        @pkgs << 'cryptsetup' if OPTIONS[:encrypt]
       end
 
       def install_pkgs
-        all_pkgs = @pkgs.join(" ")
+        all_pkgs = @pkgs.join(' ')
         command_output "/usr/bin/xbps-install -y #{all_pkgs}"
       end
 
       private
 
       def mount
-        puts "Populate /proc, /sys and /dev."
-        Helpers::exec_or_die("mount --types proc /proc \"#{MOUNTPOINT}/proc\"")
-        Helpers::exec_or_die("mount --rbind /sys \"#{MOUNTPOINT}/sys\"")
-        Helpers::exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/sys\"")
-        Helpers::exec_or_die("mount --rbind /dev \"#{MOUNTPOINT}/dev\"")
-        Helpers::exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/dev\"")
+        puts 'Populate /proc, /sys and /dev.'
+        Helpers.exec_or_die("mount --types proc /proc \"#{MOUNTPOINT}/proc\"")
+        Helpers.exec_or_die("mount --rbind /sys \"#{MOUNTPOINT}/sys\"")
+        Helpers.exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/sys\"")
+        Helpers.exec_or_die("mount --rbind /dev \"#{MOUNTPOINT}/dev\"")
+        Helpers.exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/dev\"")
         # Maybe add /dev/shm like describe here:
         # https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Base
       end

data/lib/getch/void/config.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'securerandom'
-require_relative '../helpers'
 
 module Getch
   module Void
@@ -22,34 +23,34 @@ module Getch
       end
 
       def network
-        print " => Copying /etc/resolv.conf..."
+        print ' => Copying /etc/resolv.conf...'
         src = '/etc/resolv.conf'
         dest = "#{@network_dir}/resolv.conf"
-        FileUtils.copy_file(src, dest, preserve = true)
+        FileUtils.copy_file(src, dest)
         puts "\s[Ok]"
       end
 
       def system
-        print " => Updating configs system..."
+        print ' => Updating configs system...'
         control_options
         rc = "#{MOUNTPOINT}/etc/rc.conf"
-        add_line(rc, "HARDWARECLOCK=\"UTC\"") if !search(rc, /^HARDWARECLOCK/)
-        add_line(rc, "KEYMAP=\"#{OPTIONS[:keymap]}\"") if !search(rc, /^KEYMAP/)
-        add_line(rc, "TIMEZONE=\"#{OPTIONS[:zoneinfo]}\"") if !search(rc, /^TIMEZONE/)
-        add_line(rc, "HOSTNAME=\"#{@hostname}\"") if !search(rc, /^HOSTNAME/)
+        add_line(rc, 'HARDWARECLOCK="UTC"') unless search(rc, /^HARDWARECLOCK/)
+        add_line(rc, "KEYMAP=\"#{OPTIONS[:keymap]}\"") unless search(rc, /^KEYMAP/)
+        add_line(rc, "TIMEZONE=\"#{OPTIONS[:zoneinfo]}\"") unless search(rc, /^TIMEZONE/)
+        add_line(rc, "HOSTNAME=\"#{@hostname}\"") unless search(rc, /^HOSTNAME/)
         puts "\s[OK]"
       end
 
       def locale
-        print " => Updating locale system..."
+        print ' => Updating locale system...'
         control_options
         conf = "#{MOUNTPOINT}/etc/locale.conf"
         File.write(conf, "LANG=#{@lang}\n")
-        add_line(conf, "LC_COLLATE=C")
+        add_line(conf, 'LC_COLLATE=C')
         conf = "#{MOUNTPOINT}/etc/default/libc-locales"
         add_line(conf, @utf8)
         puts "\s[OK]"
-        command "xbps-reconfigure -f glibc-locales"
+        command 'xbps-reconfigure -f glibc-locales'
       end
 
       private
@@ -65,7 +66,7 @@ module Getch
         Dir.glob("#{MOUNTPOINT}/usr/share/kbd/keymaps/**/#{keys}.map.gz") { |f|
           @keymap = f
         }
-        raise ArgumentError, "No keymap #{@keymap} found" if ! @keymap
+        raise ArgumentError, "No keymap #{@keymap} found" unless @keymap
       end
 
       def search_zone(zone)
@@ -76,11 +77,13 @@ module Getch
 
       def search_utf8(lang)
         @utf8, @lang = nil, nil
-        File.open("#{MOUNTPOINT}/etc/default/libc-locales").each { |l|
-          @utf8 = $~[0] if l.match(/#{lang}[. ]+[utf\-8 ]+/i)
-          @lang = $~[0] if l.match(/#{lang}[. ]+utf\-8/i)
-        }
-        raise ArgumentError, "Lang #{lang} no found" if !@utf8
+        File.open("#{MOUNTPOINT}/etc/default/libc-locales").each do |l|
+          @utf8 = l.delete_prefix('#') if l.match(/#{lang}.UTF-8/)
+
+          found = l.split if l.match(/#{lang}.UTF-8/)
+          @lang = found[0].delete_prefix('#') if found
+        end
+        raise ArgumentError, "Lang #{lang} no found" unless @utf8
       end
     end
   end

data/lib/getch/void/stage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'open3'
 
@@ -5,8 +7,8 @@ module Getch
   module Void
     class RootFS
       def initialize
-        @url = "https://alpha.de.repo.voidlinux.org/live/current"
-        @file = "sha256sum.sig"
+        @url = 'https://alpha.de.repo.voidlinux.org/live/current'
+        @file = 'sha256sum.txt'
         @xbps = false
         Dir.chdir(MOUNTPOINT)
       end
@@ -15,17 +17,18 @@ module Getch
       def search_archive
         yurl = "#{@url}/#{@file}"
         puts "Open #{yurl}"
-        Helpers::get_file_online(yurl, @file)
-        File.open(@file).each { |l|
-          @xbps = l.tr('()', '').split(" ") if l.match(/void-x86_64-ROOTFS-[\d._]+.tar.xz/)
-        }
+        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/)
+        end
       end
 
       def download
-        raise StandardError, "No file found, retry later." if !@xbps
+        raise StandardError, 'No file found, retry later.' unless @xbps
         return if File.exist? @xbps[1]
+
         puts "Downloading #{@xbps[1]}..."
-        Helpers::get_file_online("#{@url}/#{@xbps[1]}", @xbps[1])
+        Helpers.get_file_online("#{@url}/#{@xbps[1]}", @xbps[1])
       end
 
       def checksum
@@ -58,12 +61,8 @@ module Getch
       end
 
       def cleaning
-        Dir.glob("void-x86_64*.tar.xz").each do |f|
-          File.delete(f)
-        end
-        Dir.glob("sha256*").each do |f|
-          File.delete(f)
-        end
+        Dir.glob('void-x86_64*.tar.xz').each { |f| File.delete(f) }
+        Dir.glob('sha256*').each { |f| File.delete(f) }
       end
     end
   end

data/lib/getch/void.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'void/stage'
 require_relative 'void/config'
 require_relative 'void/chroot'
@@ -8,11 +10,12 @@ module Getch
   module Void
     class Main
       def initialize
-        @state = Getch::States.new()
+        @state = Getch::States.new
       end
 
       def root_fs
         return if STATES[:gentoo_base]
+
         xbps = Getch::Void::RootFS.new
         xbps.search_archive
         xbps.download
@@ -22,6 +25,7 @@ module Getch
 
       def config
         return if STATES[:gentoo_config]
+
         config = Getch::Void::Config.new
         config.host
         config.network
@@ -32,6 +36,7 @@ module Getch
 
       def chroot
         return if STATES[:gentoo_kernel]
+
         chroot = Getch::Void::Chroot.new
         chroot.update
         chroot.fs
@@ -41,6 +46,7 @@ module Getch
 
       def kernel
         return if STATES[:gentoo_kernel]
+
         Getch::Void::Sources.new
         @state.kernel
       end

data/lib/getch.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
+require_relative 'getch/helpers'
 require_relative 'getch/options'
 require_relative 'getch/states'
 require_relative 'getch/gentoo'
 require_relative 'getch/void'
 require_relative 'getch/filesystem'
 require_relative 'getch/command'
-require_relative 'getch/helpers'
 require_relative 'getch/log'
 require_relative 'getch/config'
 require_relative 'getch/guard'
@@ -34,10 +36,11 @@ module Getch
     :gentoo_base => false,
     :gentoo_config => false,
     :gentoo_update => false,
+    :gentoo_bootloader => false,
     :gentoo_kernel => false
   }
 
-  MOUNTPOINT = "/mnt/gentoo"
+  MOUNTPOINT = '/mnt/gentoo'
 
   DEFAULT_FS = {
     true => {
@@ -67,7 +70,8 @@ module Getch
     end
 
     def resume
-      raise "No disk, use at least getch with -d DISK" if !OPTIONS[:disk]
+      raise '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]}"
@@ -82,7 +86,7 @@ module Getch
       puts "\tseparate-cache disk: #{OPTIONS[:cache_disk]}"
       puts "\tseparate-home disk: #{OPTIONS[:home_disk]}"
       puts
-      print "Continue? (y,N) "
+      print 'Continue? (y,N) '
       case gets.chomp
       when /^y|^Y/
         return
@@ -93,11 +97,12 @@ module Getch
 
     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")
+        @log.info('Partition start')
         @class_fs::Partition.new
       else
         exit
@@ -106,11 +111,13 @@ module Getch
 
     def format
       return if STATES[:format]
+
       @class_fs::Format.new
     end
 
     def mount
       return if STATES[:mount]
+
       @class_fs::Mount.new.run
     end
 
@@ -130,6 +137,7 @@ module Getch
       gentoo.stage3
       gentoo.config
       gentoo.chroot
+      gentoo.bootloader
       gentoo.kernel
       gentoo.boot
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   F9Dl4EPzjBJOgQWf+NxzxNuNKI46Lp5Q8AI+xtDUHAPbSswHa40BA6ChFehP+j0L
   fg==
   -----END CERTIFICATE-----
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -48,14 +48,15 @@ extra_rdoc_files:
 files:
 - README.md
 - assets/network-stack.conf
+- assets/system.conf
 - bin/getch
+- lib/cmdline.rb
 - lib/getch.rb
 - lib/getch/command.rb
 - lib/getch/config.rb
 - lib/getch/config/gentoo.rb
 - lib/getch/config/void.rb
 - lib/getch/filesystem.rb
-- lib/getch/filesystem/.mount.rb.swp
 - lib/getch/filesystem/clean.rb
 - lib/getch/filesystem/device.rb
 - lib/getch/filesystem/ext4.rb
@@ -97,7 +98,6 @@ files:
 - lib/getch/filesystem/zfs/deps.rb
 - lib/getch/filesystem/zfs/device.rb
 - lib/getch/filesystem/zfs/encrypt.rb
-- lib/getch/filesystem/zfs/encrypt/.mount.rb.swp
 - lib/getch/filesystem/zfs/encrypt/config.rb
 - lib/getch/filesystem/zfs/encrypt/deps.rb
 - lib/getch/filesystem/zfs/encrypt/device.rb
@@ -111,6 +111,7 @@ files:
 - lib/getch/filesystem/zfs/void.rb
 - lib/getch/gentoo.rb
 - lib/getch/gentoo/boot.rb
+- lib/getch/gentoo/bootloader.rb
 - lib/getch/gentoo/chroot.rb
 - lib/getch/gentoo/config.rb
 - lib/getch/gentoo/sources.rb
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A CLI tool to install Gentoo