feat: add Manifest module, re-sort directory

Author: initdc

lib/rootfs/manifest.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RootFS
+  # Ubuntu mainfest style
+  module Manifest
+    def manifest_readlines(any, &block)
+      if File.file?(any)
+        IO.readlines(any, &block)
+      else
+        String(any).readlines(&block)
+      end
+    end
+
+    def manifest_each_line(any, &block)
+      if File.file?(any)
+        IO.readlines(any, &block).each(&block)
+      else
+        String(any).readlines(&block)
+      end
+    end
+
+    def manifest_package(any)
+      lines = if File.file?(any)
+                IO.readlines(any)
+              else
+                String(any).readlines
+              end
+      list = []
+      lines.each do |line|
+        pkg = line.include?("\t") ? line.split("\t")[0] : line.split(" ")[0]
+        list.push(pkg)
+      end
+      list
+    end
+  end
+end

lib/rootfs/package/manifest/jammy-base-arm64.manifest renamed to lib/rootfs/manifest/ubuntu/jammy-base-arm64.manifest

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 require "libexec"
+require_relative "../manifest"
 
 module RootFS
   module Package
     module Dpkg
+      extend RootFS::Manifest
+      include RootFS::Manifest
+
       # https://manpages.ubuntu.com/manpages/jammy/man1/dpkg-query.1.html
       def installed
         list = []
@@ -30,20 +34,9 @@ def generate_manifest(file = nil)
         end
       end
 
-      def parse_manifest(file, &block)
-        IO.readlines(file, &block)
-      end
+      def can_install(any)
+        pkgs = any.instance_of?(Array) ? any : manifest_package(any)
 
-      def manifest_package(file)
-        list = []
-        IO.readlines(file).each do |line|
-          pkg = line.include?("\t") ? line.split("\t")[0] : line.split(" ")[0]
-          list.push(pkg)
-        end
-        list
-      end
-
-      def can_install(pkgs)
         ignores = []
         Libexec.each_line("apt-get install #{pkgs.join(" ")} 2>&1") do |line|
           err_pre = "E: Unable to locate package "
@@ -57,14 +50,6 @@ def can_install(pkgs)
         pkgs -= ignores
         can_install(pkgs)
       end
-
-      def can_from_file(file)
-        pkgs = []
-        IO.readlines(file).each do |line|
-          pkgs.push(line.chomp)
-        end
-        can_install(pkgs)
-      end
     end
   end
 end

lib/rootfs/package/manifest/jammy-desktop-arm64.manifest renamed to lib/rootfs/manifest/ubuntu/jammy-desktop-arm64.manifest

@@ -12,17 +12,17 @@ class MyClass
 # pp u.installed
 # u.generate_manifest
 # u.generate_manifest(".rspec_status")
-# u.parse_manifest(".rspec_status").each do |line|
+# u.manifest_readlines(".rspec_status").each do |line|
 #   puts line.split("\t").first
 # end
 # puts u.manifest_package(".rspec_status") - u.installed_by_user
 
-# raspi_server_pkgs = u.manifest_package("manifest/rel/ubuntu-22.04.1-preinstalled-server-arm64+raspi.manifest")
-# raspi_desktop_pkgs = u.manifest_package("manifest/rel/ubuntu-22.04.1-preinstalled-desktop-arm64+raspi.manifest")
+# raspi_server_pkgs = u.manifest_package("../manifest/ubuntu/rel/ubuntu-22.04.1-preinstalled-server-arm64+raspi.manifest")
+# raspi_desktop_pkgs = u.manifest_package("../manifest/ubuntu/rel/ubuntu-22.04.1-preinstalled-desktop-arm64+raspi.manifest")
 
 # raspi_desktop = raspi_desktop_pkgs - raspi_server_pkgs
 # puts raspi_desktop
-# puts server_pkgs - desktop_pkgs
+# puts raspi_server_pkgs - raspi_desktop_pkgs
 
 # comm_desktop = raspi_desktop.filter do |pkg|
 #   pkg != "pi-bluetooth" &&
@@ -32,15 +32,15 @@ class MyClass
 # end
 # puts comm_desktop
 
-base_pkg = u.manifest_package("manifest/jammy-base-arm64.manifest")
-live_server_pkgs = u.manifest_package("manifest/jammy-live-server-arm64.manifest")
-live_desktop_pkgs = u.manifest_package("manifest/jammy-desktop-arm64.manifest")
+base_pkg = u.manifest_package("../manifest/ubuntu/jammy-base-arm64.manifest")
+live_server_pkgs = u.manifest_package("../manifest/ubuntu/jammy-live-server-arm64.manifest")
+live_desktop_pkgs = u.manifest_package("../manifest/ubuntu/jammy-desktop-arm64.manifest")
 
 server = live_server_pkgs - base_pkg
 desktop = live_desktop_pkgs - base_pkg
 
 # puts server
 # puts desktop
 
-puts u.can_install(desktop)
-# puts u.can_from_file("install.txt")
+# puts u.can_install(desktop)
+puts u.can_install("install.txt")