Merge branch 'master' of github.com:epitron/upm

Author: epitron

TODO.md

@@ -1,8 +1,8 @@
 # TODO
 
 ## UI
-* fzf
-* search
+* fzf/pick
+* scrapers for web-based search engines (especially for "files in packages")
 
 ## Options
 * Proper option/command parser
@@ -11,9 +11,15 @@
 ## DSL
 * Call commands from within other commands, or specify dependencies (eg: command "install", "pkg install", depends: "update" )
 * DSL setting defaults (eg: cache_dir "\~/.cache/upm")
+* Some commands require special packages (eg: "command 'locate', depends: 'pkgfile'") which have their own syncable databases
+  |_ offer to install these dependencies (and sync them (periodically))
+  |_ web-based search is even nicer
+* Page multi-commands (eg: 'args.each { run ..., paged: true }' should all output to the same pager)
+  |_ 'run ..., pager: IO'? will that break grep?
 
 ## Performance
 * RPi2 is very clunky
+  |_ rewrite in... C? rust? go? lua?
 
 ## A language for letting programs specify and auto-install dependencies
 * A DSL for specifying dependencies (eg: `upm py:spotdl rb:epitools pkg:wget docker:aria2c`)

lib/upm/tool.rb

@@ -22,29 +22,32 @@ class Tool
       "install"          => "install a package",
       "remove/uninstall" => "remove a package",
       "search"           => "search packages",
+      "update/sync"      => "retrieve the latest package list or manifest",
+      "upgrade"          => "update package list and install updates",
       "search-sources"   => "search package source (for use with 'build' command)",
-      "build"            => "build a package from source and install it",
       "list"             => "list installed packages (or search their names if extra arguments are supplied)",
-      "selection"        => "list manually installed packages", # this should probably be a `list` option ("upm list --manually-added" or smth (would be nice: rewrite in go and use ipfs' arg parsing library))
       "files"            => "list files in a package",
-      "info"             => "show metadata about a package",
-      "update/sync"      => "retrieve the latest package list or manifest",
-      "upgrade"          => "update package list and install updates",
+      "info/show"        => "show metadata about a package",
+      "rdeps/depends"    => "reverse dependencies (which packages depend on this package?)",
+      "locate"           => "search contents of packages (local or remote)",
       "selfupdate"       => "update the package manager",
       "download"         => "download package list and updates, but don't insatall them",
+      "build"            => "build a package from source and install it",
+      "selection/manual" => "list manually installed packages", # this should probably be a `list` option ("upm list --manually-added" or smth (would be nice: rewrite in go and use ipfs' arg parsing library))
       "pin"              => "pinning a package means it won't be automatically upgraded",
       "rollback"         => "revert to an earlier version of a package (including its dependencies)",
       "verify/check"     => "verify the integrity of packages' files on the filesystem",
       "repair"           => "fix corrupted packages",
-      "audit/vuln"       => "show known vulnerabilities in installed packages",
+      "audit/vulns"      => "show known vulnerabilities in installed packages",
       "log"              => "show history of package installs",
       "packagers"        => "detect installed package managers, and pick which ones upm should wrap",
       "clean"            => "clear out the local package cache",
+      "orphans"          => "dependencies which are no longer needed",
       "monitor"          => "ad-hoc package manager for custom installations (like instmon)",
       "keys"             => "keyrings and package authentication",
       "default"          => "configure the action to take when no arguments are passed to 'upm' (defaults to 'os:update')",
       "stats"            => "show statistics about package database(s)",
-      "mirrors/sources/channels"  => "manage subscriptions to remote repositories/mirrors/channels",
+      "repos/mirrors/sources/channels" => "manage subscriptions to remote repositories/mirrors/channels",
     }
 
     ALIASES = {
@@ -56,16 +59,17 @@ class Tool
       "r"             => "remove",
       "m"             => "mirrors",
       "file"          => "files",
-      "sync"          => "update",
-      "sources"       => "mirrors",
-      "channels"      => "mirrors",
-      "show"          => "info",
       "vuln"          => "audit",
-      "vulns"         => "audit",
-      "check"         => "verify",
       "source-search" => "search-sources",
     }
 
+    COMMAND_HELP.keys.each do |key|
+      cmd, *alts = key.split("/")
+      alts.each do |alt|
+        ALIASES[alt] = cmd
+      end
+    end
+
     def initialize(name, &block)
       @name = name
 

lib/upm/tools/pacman.rb

@@ -1,5 +1,4 @@
 UPM::Tool.new "pacman" do
-
   os "arch"
 
   bin = ["pacman", "--color=always"]
@@ -17,6 +16,7 @@
   command "audit",  "arch-audit",  paged: true
   command "files",  [*bin, "-Ql"], paged: true
   command "search", [*bin, "-Ss"], paged: true, highlight: true
+  command "locate", ["pkgfile", "-r"], paged: true
 
   command "info" do |args|
     run(*bin, "-Qi", *args, paged: true) || run(*bin, "-Si", *args, paged: true)
@@ -106,4 +106,39 @@ def to_s
 
   end
 
+  command "rdeps" do |args|
+    packages_that_depend_on = proc do |package|
+      result = []
+
+      # [`pacman -Sii #{package}`, `pacman -Qi #{package}`].each do |output|
+      [`pacman -Sii #{package}`].each do |output|
+        output.each_line do |l|
+          if l =~ /Required By\s+: (.+)/
+            result += $1.strip.split unless $1["None"]
+            break
+          end
+        end
+      end
+
+      result
+    end
+
+    args.each do |package|
+      puts "<8>=== <14>#{package} <8>============".colorize
+      puts
+
+      packages = packages_that_depend_on.call package
+
+      if packages.empty?
+        puts "  <12>None".colorize
+      else
+        run "pacman", "-Ss", "^(#{packages.join '|'})$" # upstream packages
+        run "pacman", "-Qs", "^(#{packages.join '|'})$" # packages that are only installed locally
+      end
+
+      puts
+    end
+  end
 end
+
+

lib/upm/tools/xbps.rb

@@ -4,11 +4,24 @@
 
   identifying_binary "xbps-install"
 
-  command "install", "xbps-install",      root: true
-  command "update",  "xbps-install -S",   root: true
-  command "upgrade", "xbps-install -Su",  root: true
-  command "files",   "xbps-query -f",           paged: true
-  command "selection", "xbps-query -m"
+  command "install",   "xbps-install",      root: true
+  command "remove",    "xbps-remove",       root: true
+  command "update",    "xbps-install -S",   root: true
+  command "upgrade",   "xbps-install -Su",  root: true
+  command "files",     "xbps-query -f",     paged: true
+  command "locate",    "xlocate",           paged: true
+  command "selection", "xbps-query -m",     paged: true
+  command "rdeps",     "xbps-query -R -X",  paged: true
+  command "orphans",   "xbps-query -O",     paged: true
+
+  command "info" do |args|
+    args.each do |arg|
+      unless run("xbps-query", "-S", arg)
+        run("xbps-query", "-R", "-S", arg)
+      end
+      puts
+    end
+  end
 
   command "search" do |args|
      query = args.join(".*")
@@ -24,4 +37,49 @@
     end
   end
 
+
+
+  class XBPSPackage < Struct.new(:name, :version, :date)
+    def self.from_line(line)
+      # zd1211-firmware-1.5_3: 2021-09-01 15:22 UTC
+      if line =~ /^([\w\-]+)-([\d\.]+_\d+): (.+)$/
+        name, version, date = $1, $2, $3
+        date = DateTime.parse($3)
+        new(name, version, date)
+      else
+        nil
+      end
+    end
+
+    def to_s
+      "[#{date.strftime("%Y-%m-%d %H:%M:%S")}] #{name} #{version}"
+    end
+  end
+
+  command "log" do |args|
+    fakedata = %{
+	xset-1.2.4_1: 2021-11-05 15:03 UTC
+	xsetroot-1.1.2_1: 2021-11-05 15:03 UTC
+	xtools-0.63_1: 2021-11-05 16:36 UTC
+	xtrans-1.4.0_2: 2021-11-05 15:26 UTC
+	xvidcore-1.3.7_1: 2021-11-05 16:45 UTC
+	xvinfo-1.1.4_2: 2021-11-05 15:03 UTC
+	xwd-1.0.8_1: 2021-11-05 15:03 UTC
+	xwininfo-1.1.5_1: 2021-11-05 15:03 UTC
+	xwud-1.0.5_1: 2021-11-05 15:03 UTC
+	xz-5.2.5_2: 2021-11-05 15:12 UTC
+	zd1211-firmware-1.5_3: 2021-09-01 15:22 UTC
+	zip-3.0_6: 2021-11-05 17:45 UTC
+	zlib-1.2.11_4: 2021-09-01 14:14 UTC
+	zlib-devel-1.2.11_4: 2021-11-05 15:26 UTC
+    }
+
+    data = IO.popen(["xbps-query", "-p", "install-date", "-s", ""], &:read)
+    packages = data.each_line.map do |line|
+      XBPSPackage.from_line(line.strip)
+    end.compact
+    packages.sort_by!(&:date)
+    packages.each { |pkg| puts pkg }
+  end
 end
+