upm 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5ec80be1569a58c23402685f57f02f46cebd10ae87b2684eb2aa8d132aa7cf
-  data.tar.gz: d2fee9bb7b69d36df657e749a109dd29cdc3bbabef9b83b7a1731f83afa504f4
+  metadata.gz: 5643e0647bd7382b413354291acc5fa62ca282b21ea09a6ec7e714993fb0559c
+  data.tar.gz: 1370ad6461b00a72e138aaf0bed8d98e868372416c19b62cf8081db3a582467f
 SHA512:
-  metadata.gz: e1c9ea83290760c4fc2c7ea7cab2580ea50ef5053751d49e7414f6d57b7b2e84b35064ec5ae4dbece2c5f00b5c7456ff80d72caf084d4c43a9668834937e25e8
-  data.tar.gz: 51dbea8086d5162b4f5b90b83028e924195f34a293c2481c05cc3e4e573752f1291f7bb73d2ecf0941ee6fbd351c6294f347c6f2ee0b4250065fc99cb7fdb6ce
+  metadata.gz: 9674e0839137df4b9efd4dc4730930df426c79b449b1b999ecd894bc48b00ab2df4ded3cbc915f2b333ed21aebc0f6eb7128eb6f36a5837e3c916a074e6f49e7
+  data.tar.gz: 996b34e98a0654a72fa3814d10101942fab1580448d9a34778baa95f3a93a6f551eee5b2b9803325f022377119c913fc827d57fca0275372646f69a04b27c44d

data/README.md

@@ -8,12 +8,20 @@ Wraps all known package managers to provide a consistent and pretty interface, a
 - pinning
 - fuzzy search
 - containerization/sandboxing
-- learning (community statistics and user choices)
+- learning what packages are cool (community statistics, user favorites)
 
-All tools will give you modern, pretty, colourful, piped-to-less output, and you'll only have to remember one consistent set of commands. It'll also prompt you with a text UI whenever faced with ambiguity.
+No matter what package manager you're using, you'll get a modern, pretty, colourful, output that's piped-to-less, and you only have to remember one consistent set of commands. It'll also prompt you with a text UI whenever faced with ambiguity.
 
 You can maintain lists of your favorite packages (and sync them to some remote server), so that you can automatically install them whenever you setup a new machine. (This can include git repos full of dotfiles/scripts, to give you a comfortable home environment, regardless of which OS you're using.)
 
+## Reality:
+
+Currently, `upm` provides a consistent interface to a number of tools: apk (Alpine), apt (Debian/Ubuntu), guix, opkg (OpenWRT), pacman (Arch), pkg (FreeBSD), pkg_add (OpenBSD), pkgin (Solaris/NetBSD), xbps (Void), and yum (Fedora).
+
+All the tools support the basic operations (installing, searching, listing, removing), and some support more advanced features, like grabbing search results from the web and showing the installation logs, and the output is always paged to `less`.
+
+The more advanced features, like consistent output, colorization, fuzzy filtering, etc. are not yet implemented.
+
 ## Installation:
 
 First, install Ruby. Then:
@@ -51,6 +59,7 @@ u <command> <pkg>
 * `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")
+* `switch` - set a default tool (eg: if you're on a system with both `apt-get` and `nix`, you can switch to `nix` so that you don't need to prefix every package with `nix:`)
 
 ### Any command that takes a package name can be prefixed with the package tool's namespace:
 
@@ -127,6 +136,19 @@ Rollback:
 * Context-dependent operation
   * eg: if you're in a ruby project's directory, set the 'ruby' namespace to highest priority
 
+## Dotfiles
+
+* Manage and version-control dotfiles
+* Sync sqlite databases
+  * sqlitesync tool?
+
+## Themes
+
+* Font packs
+* Theme browser/downloader for GTK{2,3}, Qt, XFCE4, and Compiz
+  * Populate `~/.themes` and set ENVIRONMENT variables
+* Store/load from favorites
+
 ## Containers, VMs, and Virtual Environments:
 
 Containers, VMs, and Virtual Environments are another pile of tools which do roughly the same thing: they gather together the dependencies for a specific program, or small set of programs, into a bundle, and create an isolated environment in which it can run.
@@ -149,7 +171,7 @@ In the future, these could be wrapped by `ucm` (Universal Container Manager), if
   * podman
   * nanobox
   * SmartOS zones
-  * BSD jails
+  * BSD jails (iocage)
 * Wine environments:
   * wine prefixes
   * playonlinuxs
@@ -169,4 +191,5 @@ In the future, these could be wrapped by `ucm` (Universal Container Manager), if
 
 * [PackageKit](https://en.wikipedia.org/wiki/PackageKit)
 * [libraries.io](https://libraries.io)
+* [pkgs.org](https://pkgs.org)
 * [Repology](https://repology.org)

data/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?
 
 ## Custom help for command
 eg: command "something", help: "does stuff", root: true do ... end

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.18

data/lib/upm/tool.rb

@@ -25,42 +25,50 @@ module UPM
       "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/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))
       "files"            => "list files in a package",
-      "info"             => "show metadata about a package",
+      "rdeps/depends"    => "reverse dependencies (which packages depend on this package?)",
+      "locate"           => "search contents of packages (local or remote)",
+      "info/show"        => "show metadata about a package",
       "update/sync"      => "retrieve the latest package list or manifest",
       "upgrade"          => "update package list and install updates",
+      "selfupdate"       => "update the package manager",
       "download"         => "download package list and updates, but don't insatall them",
       "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",
-      "audit/vuln"       => "show known vulnerabilities in installed packages",
+      "repair"           => "fix corrupted 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",
-      "mirrors/sources"  => "manage remote repositories and mirrors",
       "clean"            => "clear out the local package cache",
       "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)",
+      "repos/mirrors/sources/channels" => "manage subscriptions to remote repositories/mirrors/channels",
     }
 
     ALIASES = {
-      "file"    => "files",
-      "sync"    => "update",
-      "sources" => "mirrors",
-      "show"    => "info",
-      "vuln"    => "audit",
-      "vulns"   => "audit",
-      "check"   => "verify",
-      "u"       => "upgrade",
-      "i"       => "install",
-      "d"       => "download",
-      "s"       => "search",
-      "f"       => "files",
-      "r"       => "remove",
+      "u"             => "upgrade",
+      "i"             => "install",
+      "d"             => "download",
+      "s"             => "search",
+      "f"             => "files",
+      "r"             => "remove",
+      "m"             => "mirrors",
+      "file"          => "files",
+      "vuln"          => "audit",
       "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
 

data/lib/upm/tool_class_methods.rb

@@ -2,6 +2,11 @@ module UPM
   class Tool
     class << self
 
+      def error(message)
+        $stderr.puts message
+        exit 1
+      end
+
       def tools; @@tools; end
 
       def register_tools!
@@ -15,7 +20,7 @@ module UPM
           end
           Hash[pairs]
         rescue Errno::ENOENT
-          {}
+          nil
         end
       end
 
@@ -26,13 +31,18 @@ module UPM
         else
           # `uname -s` => Darwin|FreeBSD|OpenBSD
           # `uname -o` => Android|Cygwin
-          [`uname -s`, `uname -o`].map(&:chomp).uniq
+          names = [`uname -s`]
+          names << `uname -o` unless names.first =~ /OpenBSD/
+          names.map(&:chomp).uniq
         end
       end
 
       def nice_os_name
-        os_release.values_at("PRETTY_NAME", "NAME", "ID", "ID_LIKE").first || 
-          (`uname -o`.chomp rescue nil)
+        if os_release
+          os_release.values_at("PRETTY_NAME", "NAME", "ID", "ID_LIKE").first
+        else
+          (`uname -o 2> /dev/null`.chomp rescue nil)
+        end
       end
 
       def installed
@@ -45,14 +55,14 @@ module UPM
         tool = nil
 
         if os_names.any?
-          tool = @@tools.find { |name, tool| os_names.any? { |name| tool.os.include? name } }
+          tool = @@tools.find { |name, tool| os_names.any? { |name| tool.os&.include? name } }
         end
 
         if tool.nil?
           tool = @@tools.find { |name, tool| File.which(tool.identifying_binary) }
         end
 
-        tool.last
+        tool&.last
       end
 
     end

data/lib/upm/tools/guix.rb

@@ -0,0 +1,60 @@
+class GUIXPackage < Struct.new(:name, :version, :out, :path)
+  def self.from_line(line)
+    new(*line.chomp.split)
+  end
+
+  def self.installed
+    @installed_packages ||= IO.popen(["guix", "package", "--list-installed"]) { |io| io.each_line.map { |line| GUIXPackage.from_line(line) } }
+  end
+
+  def self.avaialble
+    @available_packages ||= IO.popen(["guix", "package", "--list-available"]) { |io| io.each_line.map { |line| GUIXPackage.from_line(line) } }
+  end
+
+  def installed?
+    !!path[%r{^/gnu/store/}]
+  end
+end
+
+
+UPM::Tool.new "guix" do
+
+  identifying_binary "guix"
+
+  command "install",    "guix install"
+  command "remove",     "guix remove"
+  command "info",       "guix show"
+  command "rollback",   "guix package –roll-back"
+  command "selfupdate", "guix pull"
+  command "upgrade",    "guix package --upgrade"
+
+  command "files", paged: true do |args|
+    error "Ope, you forgot the package name!" if args.empty?
+
+    args.each do |arg|
+      if pkg = GUIXPackage.installed.find { |pkg| pkg.name == arg }
+        run "find", pkg.path, paged: true
+      else
+        error "#{arg.inspect} not found"
+      end
+    end
+  end
+
+  command "search" do |args|
+    query           = args.join(" ")
+    highlight_query = args.join(".+")
+    grep_query      = args.join(".+")
+    run "guix", "package", "--list-available", sort: true, grep: grep_query, paged: true, highlight: highlight_query
+  end
+
+  command "list" do |args|
+    if args.any?
+      highlight_query = args.join(".+")
+      grep_query = /#{highlight_query}/
+      run "guix", "package", "--list-installed", grep: grep_query, highlight: highlight_query, paged: true
+    else
+      run "guix", "package", "--list-installed", paged: true
+    end
+  end
+
+end

data/lib/upm/tools/pacman.rb

@@ -1,5 +1,4 @@
 UPM::Tool.new "pacman" do
-
   os "arch"
 
   bin = ["pacman", "--color=always"]
@@ -17,6 +16,7 @@ UPM::Tool.new "pacman" do
   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 @@ UPM::Tool.new "pacman" do
 
   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
+
+

data/lib/upm/tools/pkg_add.rb

@@ -0,0 +1,24 @@
+UPM::Tool.new "pkg_add" do
+
+  os "OpenBSD"
+
+  command "install",  "pkg_add",      root: true
+  command "remove",   "pkg_delete",   root: true
+  command "upgrade",  "pkg_add -u",   root: true
+  command "clean",    "yum clean",    root: true
+  command "info",     "pkg_info",     paged: true
+  command "files",    "pkg_info -L",  paged: true
+  command "search",   "pkg_info -Q",  paged: true
+  command "verify",   "pkg_check"
+
+  command "list" do |args|
+    if args.any?
+      highlight_query = args.join(".+")
+      grep_query = /#{highlight_query}/
+      run "pkg_info", grep: grep_query, highlight: highlight_query, paged: true
+    else
+      run "pkg_info", paged: true
+    end
+  end
+
+end

data/lib/upm/tools/xbps.rb

@@ -4,12 +4,28 @@ UPM::Tool.new "xbps" do
 
   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 "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 -X",     paged: true
 
-  command "files",   "xbps-query -f",           paged: true
-  command "search",  "xbps-query --regex -Rs",  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(".*")
+     run "xbps-query", "--regex", "-Rs", query, highlight: /(#{ args.join("|") })/i, paged: true
+  end
   
   command "list" do |args|
     if args.any?
@@ -20,4 +36,49 @@ UPM::Tool.new "xbps" do
     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
+    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upm
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - epitron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies: []
 description: Wrap all known command-line package tools with a consistent and pretty
   interface.
@@ -44,9 +44,11 @@ files:
 - lib/upm/tool_dsl.rb
 - lib/upm/tools/apk.rb
 - lib/upm/tools/apt.rb
+- lib/upm/tools/guix.rb
 - lib/upm/tools/opkg.rb
 - lib/upm/tools/pacman.rb
 - lib/upm/tools/pkg.rb
+- lib/upm/tools/pkg_add.rb
 - lib/upm/tools/pkgin.rb
 - lib/upm/tools/xbps.rb
 - lib/upm/tools/yum.rb
@@ -71,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Universal Package Manager