upm 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bca79b16263ae9e7ac025695b61ec7bd88f81334b15564611e3f6977861ddcc
-  data.tar.gz: cbba1be68aa1f5deb00d59a0ec72ef912a790f04f2cccb7f185f6931eb8d76ad
+  metadata.gz: 9c5ec80be1569a58c23402685f57f02f46cebd10ae87b2684eb2aa8d132aa7cf
+  data.tar.gz: d2fee9bb7b69d36df657e749a109dd29cdc3bbabef9b83b7a1731f83afa504f4
 SHA512:
-  metadata.gz: 9642d123de6aaf546cc328c18ef942e0883bc526d53fe6eefd28cc10573220dccc9a1e6a308e68559459b3d2e22b2161cbda623b147095b3114ba97f711b6126
-  data.tar.gz: 9439866b904f66b394f9680c03bf8e77646bd493012696de2fd64335b38fed05263dda5ca04ed482dfd26a2d0e6a5628fbe57eb65da1c3409d54678b9bb552ef
+  metadata.gz: e1c9ea83290760c4fc2c7ea7cab2580ea50ef5053751d49e7414f6d57b7b2e84b35064ec5ae4dbece2c5f00b5c7456ff80d72caf084d4c43a9668834937e25e8
+  data.tar.gz: 51dbea8086d5162b4f5b90b83028e924195f34a293c2481c05cc3e4e573752f1291f7bb73d2ecf0941ee6fbd351c6294f347c6f2ee0b4250065fc99cb7fdb6ce

data/README.md

@@ -2,11 +2,25 @@
 
 ## Concept:
 
-Wraps all known package managers to provide a consistent and pretty interface, along with advanced features not supported by all tools, such as rollback and pinning.
+Wraps all known package managers to provide a consistent and pretty interface, along with advanced features not supported by all tools, such as:
+- install log
+- rollback
+- pinning
+- fuzzy search
+- containerization/sandboxing
+- learning (community statistics and user choices)
 
 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.
 
-It will also allow users to maintain lists of their favorite packages (and sync them to some remote server), so that they can automatically install them whenever they setup a new machine. (This can include git repos full of dotfiles/scripts, to give the user a comfortable home environment regardless of which OS they're using.)
+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.)
+
+## Installation:
+
+First, install Ruby. Then:
+
+```
+gem install upm
+```
 
 ## Usage:
 
@@ -18,19 +32,19 @@ u <command> <pkg>
 
 ## Commands:
 
-* `install`
-* `remove`
+* `install`/`add` - download and install a package
+* `remove`/`uninstall` - remove a previously installed package
 * `build` - compile a package from source and install it
 * `search` - using the fastest known API or service
 * `list` - show all packages, or the contents of a specific package
 * `info` - show metadata about a package
 * `sync`/`update` - retrieve the latest package list or manifest
 * `upgrade` - install new versions of all packages
-* `verfiy` - verify the integrity of installed files
+* `verify` - verify the integrity of installed files
 * `audit` - show known vulnerabilities for installed packages
 * `pin` - pinning a package means it won't be automatically upgraded
 * `rollback` - revert to an earlier version of a package (including its dependencies)
-* `log` - show history of package installs 
+* `log` - show history of package installs
 * `packagers` - detect installed package managers, and pick which ones upm should wrap
 * `sources`/`mirrors` - select remote repositories and mirrors
 * `clean` - clear out the local package cache
@@ -70,21 +84,23 @@ go:<pkg>,<pkg>,<pkg>
 * NetBSD: `pkgin`/`ports`
 * SmartOS/Illumos: `pkgin`
 * Windows: `apt-cyg`/`mingw-get`/`nuget`/`Windows Update`/(as-yet-not-created package manager, "winget")
-* Wine: `winetricks`
+* Wine/Proton/Steam: `winetricks`/`steam`
 * Ruby: `rubygems`
 * Python: `pip`/`easy_install`
-* Javascript: `npm`
-* Clojure: `leiningen`
-* Java: `gradle`
-* Erlang: `rebar`
-* Scala: `sbt`
+* Javascript/NodeJS: `npm`
 * Rust: `cargo`
+* Dart: `pub`
+* go: `go-get`
 * R: `cran`
+* Qt: `qpm`
 * Lua: `rocks`
 * Julia: `Pkg`
 * Haskell: `cabal`
+* Clojure: `leiningen`
+* Java: `gradle`
+* Erlang: `rebar`
+* Scala: `sbt`
 * Perl: `cpan`
-* go: `go-get`
 
 ...[and many more!](https://en.wikipedia.org/wiki/List_of_software_package_management_systems)
 
@@ -103,8 +119,54 @@ Rollback:
 
 ![pacman-rollback](https://raw.githubusercontent.com/epitron/scripts/master/screenshots/pacman-rollback.png)
 
+# Future Directions
+
 ## TODOs:
 
 * Use the pretty text-mode UI that passenger-install uses
 * Context-dependent operation
   * eg: if you're in a ruby project's directory, set the 'ruby' namespace to highest priority
+
+## 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.
+
+In the future, these could be wrapped by `ucm` (Universal Container Manager), if I get around to it.
+
+### Container tools to wrap:
+
+* Virtual Environments:
+  * Python: `virtualenv`
+  * Ruby: `bundler`
+  * Java: `gradle`
+  * NodeJS: `npm`
+* Containerized Applications/Systems:
+  * AppImage
+  * docker
+  * rkt
+  * snapd
+  * systemd
+  * podman
+  * nanobox
+  * SmartOS zones
+  * BSD jails
+* Wine environments:
+  * wine prefixes
+  * playonlinuxs
+  * proton
+* Virtual Machines:
+  * qemu
+  * virtualbox
+  * VMware
+  * firecracker
+* Hypervisors:
+  * ESXi
+  * Xen
+  * Nova
+
+
+## Similar Projects
+
+* [PackageKit](https://en.wikipedia.org/wiki/PackageKit)
+* [libraries.io](https://libraries.io)
+* [Repology](https://repology.org)

data/TODO.md

@@ -1,19 +1,27 @@
 # TODO
 
-## Performance
+## UI
+* fzf
+* search
 
-It's currently very clunky on the rpi2.
+## Options
+* Proper option/command parser
+* Verbose mode (prints `run` commands)
 
-## Custom help for command
+## 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")
+
+## Performance
+* RPi2 is very clunky
 
+## Custom help for command
 eg: command "something", help: "does stuff", root: true do ... end
 
 ## Pipes and filters
-
 * `Tool::DSL#run` is currently somewhat awkward; it would be simpler if returned an `Enumerator`, which could then be filtered (ie: highlight/grep), or concatenated to other `Enumerator`s.
 
 ## Streaming pipes with colours
-
 * Make the `run` command able to grep the output while streaming the results to the screen.
 * Make run pretend to be a tty, so I don't need `--color=always`.
 * Use spawn, like so:
@@ -24,7 +32,6 @@ spawn(*%w[tr a-z A-Z], in: r)
 ```
 
 ## More package managers
-
 Currently missing:
 * RedHat/Fedora/CentOS
 * OSX
@@ -33,31 +40,26 @@ Currently missing:
 * SuSE
 
 ## Dependency-fetching features
-
 * Use upm to fetch dependencies for any library or script, across any language.
 * Some kind of manifest file (or personifest, to be politically correct)
 * This is a little like bundler, npm, etc., but for any type of package.
 
 ## Ability to install any package from any OS to the user's home directory
-
 Slurps up the packages and their dependencies, then unpacks them into ~/.upm/{bin,lib} or something.
 (Like nix?)
 
 Related tool: intoli/exodus
 
 ## fzf
-
 Use fzf for "list" output (or other commands that require selecting, like "remove")
 
 ## Commandline argument parser
-
 * Add options to commands:
   * upm upgrade --download-only
   * upm install --help
   * upm help install
 
 ## Figure out how to integrate language package managers
-
 * The packages that you can get through gem/pip/luarocks/etc. are often duplicated in the OS-level package managers. Should there be a preference?
 * Should the search command show matches from all available package tools? (There could be a configure step where the user says which package managers should be included, and which have preference)
 * Possibilites: 
@@ -72,36 +74,28 @@ Use fzf for "list" output (or other commands that require selecting, like "remov
 * `upm help --ruby` should show available ruby commands
 
 ## Give identical output on every platform
-
 * Requires parsing the output of every command into a canonical format, or reading the package databases directly.
 
 ## apt: Integrate 'acs' wrapper script
 
 ## Evaluate UPM::Tool.new block in an instance of an anonymous subclass of UPM::Tool
-
 This will allow tools to create classes and modules inside the UPM::Tool block without namespace collisions
 
 ## Themes?
-
 Why not!
 
 ## Mirror Selector
-
 Do a ping test on available mirrors, and use fzf to select.
 
 ## Interrupt catcher
-
 Don't print backtrace when ^C is pressed.
 
 ## Tests
-
 Create fake OS environments that you can chroot into and run upm to test it out.
 
 
-
 # DONE
 
 ## Abbrev cmds
-
 * eg: upm install => upm i => u i
 

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.17

data/bin/upm

@@ -9,13 +9,16 @@ unless tool = UPM::Tool.for_os
   exit 1
 end
 
-command, *args = ARGV
-
-if command.nil?
+if ARGV.any? { |arg| ["help", "version", "--help", "--version", "-h", "-v"].include? arg }
   tool.help
 else
-  begin
-    tool.call_command command, *args
-  rescue Interrupt
+  command, *args = ARGV
+  if command.nil?
+    tool.help
+  else
+    begin
+      tool.call_command command, *args
+    rescue Interrupt
+    end
   end
-end
+end

data/design/Favorite Packages.md

@@ -0,0 +1,7 @@
+# Favorite Packages
+
+## Concept
+
+The user can create their own package groups manually, or dump of their current desktop's package selecitons and organize them.
+
+

data/design/Fuzzy Installer.md

@@ -0,0 +1,28 @@
+# Fuzzy Installer
+
+## Concept 
+
+'upm install <pkg query>' performs a search
+
+If there's one match, install it; if there are multiple matches, show ranked results and let the user pick one (fzf-like picker, but with a hotkey that can expand descriptions).
+
+Ranking of packages by source use statistics and heuristics
+- Which version is newest?
+- Which version is more stable?
+- What has the user picked in the past? (eg: a distro's global ruby-<gem> package vs a globally installed gem vs a locally installed gem)
+- What tools are installed? (docker? gem?)
+- Which package is less likely to break stuff? (some package managers are better than others (*cough*pip))
+- Is it a service that should be instaled in a container?
+
+## Depends on
+
+- A database of package aliases
+- A ranking algorithm
+	- Package type prioritization (manually specified or machine learned, per-package rules based on all users who installed it)
+	- 
+- Distributed statistics
+	- Users can anonymously donate their stats
+	- Stats are all public
+	- Ranking algorithm can run locally or on a distributed system
+
+# 

data/design/Updates Grouped Together for Readability.md

@@ -0,0 +1,18 @@
+# Updates Grouped Together for Readability
+
+## Concept
+
+The design of package update screens is pretty abysmal -- usually just a big blob of package names and versions. This can be improved.
+
+## Groups
+
+Packages can be grouped by any of the following:
+
+- semantic version (MAJOR.MINOR.PATCH):
+  - MAJOR: incompatible API changes
+  - MINOR: backwards-compatible features added
+  - PATCH: bugfixes
+- package's category/tags
+- which repository the package came from
+- who packaged it
+- a tree-view of package dependencies (useful for seeing dependency relationships during package updates)

data/lib/upm/core_ext/file.rb

@@ -0,0 +1,159 @@
+#
+# Beginning of File reached! (Raised when reading a file backwards.)
+#
+class BOFError < Exception; end
+
+class File
+
+  #
+  # A streaming `reverse_each` implementation. (For large files, it's faster and uses less memory.)
+  #
+  def reverse_each(&block)
+    return to_enum(:reverse_each) unless block_given?
+
+    seek_end
+    reverse_each_from_current_pos(&block)
+  end
+  alias_method :reverse_each_line, :reverse_each
+
+  #
+  # Read the previous `length` bytes. After the read, `pos` will be at the beginning of the region that you just read.
+  # Returns `nil` when the beginning of the file is reached.
+  #
+  # If the `block_aligned` argument is `true`, reads will always be aligned to file positions which are multiples of 512 bytes.
+  # (This should increase performance slightly.)
+  #
+  def reverse_read(length, block_aligned=false)
+    raise "length must be a multiple of 512" if block_aligned and length % 512 != 0
+
+    end_pos = pos
+    return nil if end_pos == 0
+
+    if block_aligned
+      misalignment = end_pos % length
+      length      += misalignment
+    end
+
+    if length >= end_pos # this read will take us to the beginning of the file
+      seek(0)
+    else
+      seek(-length, IO::SEEK_CUR)
+    end
+
+    start_pos = pos
+    data      = read(end_pos - start_pos)
+    seek(start_pos)
+
+    data
+  end
+
+  #
+  # Read each line of file backwards (from the current position.)
+  #
+  def reverse_each_from_current_pos
+    return to_enum(:reverse_each_from_current_pos) unless block_given?
+
+    # read the rest of the current line, in case we started in the middle of a line
+    start_pos = pos
+    fragment = readline rescue ""
+    seek(start_pos)
+
+    while data = reverse_read(4096)
+      lines = data.each_line.to_a
+      lines.last << fragment unless lines.last[-1] == "\n"
+
+      fragment = lines.first
+
+      lines[1..-1].reverse_each { |line| yield line }
+    end
+
+    yield fragment
+  end
+
+  #
+  # Seek to `EOF`
+  #
+  def seek_end
+    seek(0, IO::SEEK_END)
+  end
+
+  #
+  # Seek to `BOF`
+  #
+  def seek_start
+    seek(0)
+  end
+
+  #
+  # Read the previous line (leaving `pos` at the beginning of the string that was read.)
+  #
+  def reverse_readline
+    raise BOFError.new("beginning of file reached") if pos == 0
+
+    seek_backwards_to("\n", 512, -2)
+    new_pos = pos
+    data = readline
+    seek(new_pos)
+    data
+  end
+
+  #
+  # Scan through the file until `string` is found, and set the IO's +pos+ to the first character of the matched string.
+  #
+  def seek_to(string, blocksize=512)
+    raise "Error: blocksize must be at least as large as the string" if blocksize < string.size
+
+    loop do
+      data = read(blocksize)
+
+      if index = data.index(string)
+        seek(-(data.size - index), IO::SEEK_CUR)
+        break
+      elsif eof?
+        return nil
+      else
+        seek(-(string.size - 1), IO::SEEK_CUR)
+      end
+    end
+
+    pos
+  end
+
+  #
+  # Scan backwards in the file until `string` is found, and set the IO's +pos+ to the first character after the matched string.
+  #
+  def seek_backwards_to(string, blocksize=512, rindex_end=-1)
+    raise "Error: blocksize must be at least as large as the string" if blocksize < string.size
+
+    loop do
+      data = reverse_read(blocksize)
+
+      if index = data.rindex(string, rindex_end)
+        seek(index+string.size, IO::SEEK_CUR)
+        break
+      elsif pos == 0
+        return nil
+      else
+        seek(string.size - 1, IO::SEEK_CUR)
+      end
+    end
+
+    pos
+  end
+  alias_method :reverse_seek_to, :seek_backwards_to
+
+  #
+  # Iterate over each line of the file, yielding the line and the byte offset of the start of the line in the file
+  #
+  def each_line_with_offset
+    return to_enum(:each_line_with_offset) unless block_given?
+
+    offset = 0
+
+    each_line do |line|
+      yield line, offset
+      offset = tell
+    end
+  end
+
+end

data/lib/upm/lesspipe.rb

@@ -46,19 +46,42 @@ def lesspipe(*args)
   end
 
   params = []
-  params << "-R" unless options[:color]  == false
-  params << "-S" unless options[:wrap]   == true
-  params << "-F" unless options[:always] == true
-  params << "-X"
-  
-  if regexp = options[:search]
-    params << "+/#{regexp}"
-  elsif options[:tail] == true
-    params << "+\\>"
-    $stderr.puts "Seeking to end of stream..."
+
+  less_bin = File.which("less")
+
+  if File.symlink?(less_bin) and File.readlink(less_bin)[/busybox$/]
+    # busybox less only supports one option!
+    params << "-S" unless options[:wrap]   == true
+  else
+    # authentic less
+    params << "-R" unless options[:color]  == false
+    params << "-S" unless options[:wrap]   == true
+    params << "-F" unless options[:always] == true
+    params << "-X"
+    params << "-I"
+
+    if regexp = options[:search]
+      params << "+/#{regexp}"
+    elsif options[:tail] == true
+      params << "+\\>"
+      $stderr.puts "Seeking to end of stream..."
+    end
   end
 
-  IO.popen("less #{params * ' '}", "w") do |less|
+  env = {
+    "LESS_TERMCAP_mb" => "\e[01;31m",
+    "LESS_TERMCAP_md" => "\e[01;37m",
+    "LESS_TERMCAP_me" => "\e[0m",
+    "LESS_TERMCAP_se" => "\e[0m",
+    # "LESS_TERMCAP_so" => "\e[30;44m",      # highlight: black on blue
+    "LESS_TERMCAP_so" => "\e[01;44;33m", # highlight: bright yellow on blue
+    # "LESS_TERMCAP_so" => "\e[30;43m",    # highlight: black on yellow
+    "LESS_TERMCAP_ue" => "\e[0m",
+    "LESS_TERMCAP_us" => "\e[01;32m",
+  }
+
+  IO.popen(env, [less_bin, *params], "w") do |less|
+    # less.puts params.inspect
     if output
       less.puts output
     else

data/lib/upm/tool.rb

@@ -16,6 +16,8 @@ module UPM
 
     include UPM::Tool::DSL
 
+    # TODO: Show unlisted commands
+
     COMMAND_HELP = {
       "install"          => "install a package",
       "remove/uninstall" => "remove a package",
@@ -23,6 +25,7 @@ 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)",
+      "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",
@@ -60,6 +63,11 @@ module UPM
 
     def initialize(name, &block)
       @name = name
+
+      set_default :cache_dir, "~/.cache/upm"
+      set_default :config_dir, "~/.cache/upm"
+      set_default :max_database_age, 15*60 # 15 minutes
+
       instance_eval(&block)
 
       @@tools[name] = self

data/lib/upm/tool_class_methods.rb

@@ -10,9 +10,10 @@ module UPM
 
       def os_release
         @os_release ||= begin
-          open("/etc/os-release") do |io|
+          pairs = open("/etc/os-release") do |io|
             io.read.scan(/^(\w+)="?(.+?)"?$/)
-          end.to_h
+          end
+          Hash[pairs]
         rescue Errno::ENOENT
           {}
         end
@@ -44,14 +45,14 @@ module UPM
         tool = nil
 
         if os_names.any?
-          tool = @@tools.find { |name, tool| os_names.any? { |name| tool.os.include? name } }&.last
+          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) }&.last
+          tool = @@tools.find { |name, tool| File.which(tool.identifying_binary) }
         end
 
-        tool
+        tool.last
       end
 
     end

data/lib/upm/tool_dsl.rb

@@ -1,8 +1,11 @@
+require 'pathname'
+require 'fileutils'
+
 module UPM
   class Tool
     module DSL
       def identifying_binary(id_bin=nil)
-        if id_bin 
+        if id_bin
           @id_bin = id_bin
         else
           @id_bin || @name
@@ -13,19 +16,41 @@ module UPM
         @prefix = name
       end
 
+      def os(*args)
+        args.any? ? @os = args : @os
+      end
+
+      def max_database_age(age)
+        @max_database_age = age.to_i
+      end
+
+      def cache_dir(dir)
+        @cache_dir = Pathname.new(dir).expand_path
+        @cache_dir.mkpath unless @cache_dir.exist?
+      end
+
+      def config_dir(dir)
+        @config_dir = Pathname.new(dir).expand_path
+        @config_dir.mkpath unless @config_dir.exist?
+      end
+
+      def set_default(key, value)
+        send(key, value)
+      end
+
       def command(name, shell_command=nil, root: false, paged: false, highlight: nil, &block)
         @cmds ||= {}
 
         if block_given?
-          
+
           if root and Process.uid != 0
-            exec("sudo", $PROGRAM_NAME, *ARGV)
+            @cmds[name] = proc { exec("sudo", $PROGRAM_NAME, *ARGV) }
           else
             @cmds[name] = block
           end
 
         elsif shell_command
-          
+
           if shell_command.is_a? String
             shell_command = shell_command.split
           elsif not shell_command.is_a? Array
@@ -33,44 +58,38 @@ module UPM
           end
 
           @cmds[name] = proc do |args|
-            query = highlight ? args.join("\\\\s+") : nil
+            query = highlight ? args.join("\\s+") : nil
             run(*shell_command, *args, paged: paged, root: root, highlight: query)
           end
 
         else
-          
           raise "Error: Must supply a block or shell command"
-        
         end
       end
 
-      def os(*names)
-        names.any? ? @os = names : @os
-      end
-
       ## Helpers
 
-      def run(*args, root: false, paged: false, grep: nil, highlight: nil)
+      def run(*args, root: false, paged: false, grep: nil, highlight: nil, sort: false)
         if root
           if Process.uid != 0
-            if File.which("sudo") 
+            if File.which("sudo")
               args.unshift "sudo"
             elsif File.which("su")
               args = ["su", "-c"] + args
             else
               raise "Error: You must be root to run this command. (And I couldn't find the 'sudo' *or* 'su' commands.)"
             end
-          end   
+          end
         end
 
-        if !paged and !grep
+
+        unless paged or grep or sort
           system(*args)
         else
-
           IO.popen(args, err: [:child, :out]) do |command_io|
-            
+
             # if grep
-            #   pattern = grep.is_a?(Regexp) ? grep.source : grep.to_s 
+            #   pattern = grep.is_a?(Regexp) ? grep.source : grep.to_s
             #   grep_io = IO.popen(["grep", "--color=always", "-Ei", pattern], "w+")
             #   IO.copy_stream(command_io, grep_io)
             #   grep_io.close_write
@@ -91,17 +110,16 @@ module UPM
             #   proc { |line| line }
             # end
 
-            grep_proc = if grep
-              proc { |line| line[grep] }
-            else
-              proc { true }
-            end
-
-            lesspipe(disabled: !paged, search: highlight, always: true) do |less|
-              command_io.each_line do |line|
-                # less.puts highlight_proc.(line) if grep_proc.(line)
-                less.puts line if grep_proc.(line)
+            lesspipe(disabled: !paged, search: highlight, always: false) do |less|
+              each_proc = if grep
+                proc { |line| less.puts line if line[grep] }
+              else
+                proc { |line| less.puts line }
               end
+
+              lines = command_io.each_line
+              lines = lines.to_a.sort if sort
+              lines.each(&each_proc)
             end
 
           end
@@ -140,7 +158,30 @@ module UPM
         end
       end
 
+      def database_lastupdate_file
+        raise "Error: Tool 'name' is not set" unless @name
+        raise "Error: 'cache_dir' is not set" unless @cache_dir
+        @cache_dir/"#{@name}-last-update"
+      end
+
+      def database_updated!
+        FileUtils.touch(database_lastupdate_file)
+      end
+
+      def database_lastupdate
+        database_lastupdate_file.exist? ? File.mtime(database_lastupdate_file) : 0
+      end
+
+      def database_age
+        Time.now.to_i - database_lastupdate.to_i
+      end
+
+      def database_needs_updating?
+        database_age > @max_database_age
+      end
+
       def help
+        puts "    UPM version: #{File.read("#{__dir__}/../../VERSION")}"
         if osname = Tool.nice_os_name
           puts "    Detected OS: #{osname}"
         end

data/lib/upm/tools/apk.rb

@@ -0,0 +1,27 @@
+UPM::Tool.new "apk" do
+
+  os "alpine"
+
+  command "install", "apk add",      root: true
+  command "remove",  "apk del",      root: true
+  command "update",  "apk update",   root: true
+  command "upgrade", "apk upgrade",  root: true
+  command "clean",   "apk clean",    root: true
+
+  command "files",   "apk info -L",  paged: true
+  command "search" do |args|
+    query = args.join(".+")
+    run "apk", "search", *args, sort: true, paged: true, highlight: query
+  end
+
+  command "list" do |args|
+    if args.any?
+      highlight_query = args.join(".+")
+      grep_query = /#{highlight_query}/
+      run "apk", "info", grep: grep_query, highlight: highlight_query, paged: true
+    else
+      run "apk", "info", paged: true
+    end
+  end
+
+end

data/lib/upm/tools/opkg.rb

@@ -0,0 +1,26 @@
+UPM::Tool.new "opkg" do
+
+  os "openwrt", "lede"
+
+  command "install", "opkg install",      root: true
+  command "update",  "opkg update",       root: true
+  command "upgrade", root: true do |args|
+    pkgs = `opkg list-upgradable`.each_line.map { |line| line.split.first }
+    run "opkg", "upgrade", *pkgs
+  end
+
+  command "search" do |args|
+    query = args.join
+    run "opkg", "list", grep: query, paged: true
+  end
+
+  command "list" do |args|
+    if args.any?
+      query = args.join
+      run "opkg", "list-installed", grep: query, paged: true
+    else
+      run "opkg", "list-installed", paged: true
+    end
+  end
+
+end

data/lib/upm/tools/pacman.rb

@@ -6,7 +6,7 @@ UPM::Tool.new "pacman" do
 
   command "install", [*bin, "-S"],   root: true
   command "update",  [*bin, "-Sy"],  root: true
-  command "upgrade", [*bin, "-Syu"], root: true
+  command "upgrade", [*bin, "-Syu", "--noconfirm"], root: true
   command "remove",  [*bin, "-R"],   root: true
 
   command "verify", root: true do |args|
@@ -33,6 +33,7 @@ UPM::Tool.new "pacman" do
 
   command "mirrors" do
     print_files("/etc/pacman.d/mirrorlist", exclude: /^(#|$)/)
+    print_files("/etc/pacman.conf", include: /^Server\s*=/, exclude: /^(#|$)/)
   end
 
   command "depends" do |args|

data/lib/upm/tools/pkg.rb

@@ -1,24 +1,69 @@
-require 'upm/freshports_search'
-
 UPM::Tool.new "pkg" do
 
   os "FreeBSD"
 
-  command "install", "pkg install", root: true
-  command "update",  "pkg update",  root: true
-  command "upgrade", "pkg upgrade", root: true
-  command "info",    "pkg clean",   root: true
+  command "update", root: true do
+    if database_needs_updating?
+      run "pkg", "update" 
+      database_updated!
+    else
+      puts "Database has already been updated recently. Skipping."
+    end
+  end
+
+  command "install", root: true do |args|
+    call_command "update"
+    run "pkg", "install", "--no-repo-update", *args
+  end
+
+  command "upgrade", root: true do
+    call_command "update"
+    run "pkg", "upgrade", "--no-repo-update"
+  end
+
+  command "remove",  "pkg remove",  root: true
   command "audit",   "pkg audit",   root: true
+  command "clean",   "pkg clean -a",root: true
   command "verify",  "pkg check --checksums", root: true
+  command "which",   "pkg which"
+
+  command "files" do |args|
+    if args.empty?
+      run "pkg", "info", "--list-files", "--all", paged: true
+    else
+      run "pkg", "list", *args, paged: true
+    end
+  end
+
+  # the "pkg-provides" plugin is similar to arch's "pkgfile" (requires updates), and needs to be added to the plugins section of pkg's config ("pkg plugins" shows loaded plugins)
+  command "provides" do |args|
+    run "pkg", "info", "--list-files", "--all", grep: /#{args.join(".+")}/, highlight: true
+  end
 
-  command "files",   "pkg list",    paged: true
   command "search",  "pkg search",  paged: true, highlight: true
   command "search-sources" do |*args|
+    require 'upm/freshports_search'
     query = args.join(" ")
     FreshportsSearch.new.search!(query)
   end
 
-  command "log", "grep pkg: /var/log/messages", paged: true
+  # command "log", "grep -E 'pkg.+installed' /var/log/messages", paged: true
+  command "log" do
+    require 'upm/core_ext/file'
+    lesspipe do |less|
+      open("/var/log/messages").reverse_each_line do |line|
+        # Jan 19 18:25:21 freebsd pkg[815]: pcre-8.43_2 installed
+        # Apr  1 16:55:58 freebsd pkg[73957]: irssi-1.2.2,1 installed
+        if line =~ /^(\S+\s+\S+\s+\S+) (\S+) pkg(?:\[\d+\])?: (\S+)-(\S+) installed/
+          timestamp = DateTime.parse($1)
+          host = $2
+          pkgname = $3
+          pkgver = $4
+          less.puts "#{timestamp} | #{pkgname} #{pkgver}"
+        end
+      end
+    end
+  end
 
   command "build" do |*args|
     # svn checkout --depth empty svn://svn.freebsd.org/ports/head /usr/ports
@@ -48,4 +93,10 @@ UPM::Tool.new "pkg" do
     print_files("/etc/pkg/FreeBSD.conf", exclude: /^(#|$)/)
   end
 
+  # pkg clean # cleans /var/cache/pkg/
+  # rm -rf /var/cache/pkg/* # just remove it all
+  # pkg update -f # forces update  of repository catalog
+  # rm /var/db/pkg/repo-*.sqlite # removes all remote repository catalogs
+  # pkg bootstrap -f # forces reinstall of pkg
+
 end

data/lib/upm/tools/pkgin.rb

@@ -0,0 +1,49 @@
+UPM::Tool.new "pkgin" do
+
+  os "MINIX", "NetBSD"
+
+  command "install", "pkgin install", root: true
+  command "update",  "pkgin update",  root: true
+  command "upgrade", "pkgin upgrade", root: true
+  command "info",    "pkgin clean",   root: true
+  command "audit",   "pkgin audit",   root: true
+  command "verify",  "pkgin check --checksums", root: true
+
+  command "files",   "pkgin list",    paged: true
+  command "search",  "pkgin search",  paged: true, highlight: true
+  command "search-sources" do |*args|
+    query = args.join(" ")
+    FreshportsSearch.new.search!(query)
+  end
+
+  command "log", "grep pkg: /var/log/messages", paged: true
+
+  command "build" do |*args|
+    # svn checkout --depth empty svn://svn.freebsd.org/ports/head /usr/ports
+    # cd /usr/ports
+    # svn update --set-depth files
+    # svn update Mk
+    # svn update Templates
+    # svn update Tools
+    # svn update --set-depth files $category
+    # cd $category
+    # svn update $port
+    puts "Not implemented"
+  end
+
+  command "info",    "pkg info",    paged: true
+
+  command "list" do |args|
+    if args.any?
+      query = args.join
+      run "pkg", "info", grep: query, highlight: query, paged: true
+    else
+      run "pkg", "info", paged: true
+    end
+  end
+
+  command "mirrors" do
+    print_files("/etc/pkg/FreeBSD.conf", exclude: /^(#|$)/)
+  end
+
+end

data/lib/upm/tools/yum.rb

@@ -0,0 +1,27 @@
+UPM::Tool.new "yum" do
+
+  os "centos", "fedora", "rhel"
+
+  command "install", "yum install",    root: true
+  command "remove",  "yum remove",     root: true
+  command "update",  "yum updateinfo", root: true
+  command "upgrade", "yum update",     root: true
+  command "clean",   "yum clean",      root: true
+
+  command "files",   "rpm -ql",  paged: true
+  command "search" do |args|
+    query = args.join(".+")
+    run "yum", "search", *args, sort: true, paged: true, highlight: query
+  end
+
+  command "list" do |args|
+    if args.any?
+      highlight_query = args.join(".+")
+      grep_query = /#{highlight_query}/
+      run "yum", "list", "installed", grep: grep_query, highlight: highlight_query, paged: true
+    else
+      run "yum", "list", "installed", paged: true
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upm
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - epitron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies: []
 description: Wrap all known command-line package tools with a consistent and pretty
   interface.
@@ -28,9 +28,13 @@ files:
 - TODO.md
 - VERSION
 - bin/upm
+- design/Favorite Packages.md
+- design/Fuzzy Installer.md
+- design/Updates Grouped Together for Readability.md
 - lib/upm.rb
 - lib/upm/colored.rb
 - lib/upm/core_ext.rb
+- lib/upm/core_ext/file.rb
 - lib/upm/freshports_search.rb
 - lib/upm/lesspipe.rb
 - lib/upm/log_parser.rb
@@ -38,17 +42,21 @@ files:
 - lib/upm/tool.rb
 - lib/upm/tool_class_methods.rb
 - lib/upm/tool_dsl.rb
+- lib/upm/tools/apk.rb
 - lib/upm/tools/apt.rb
+- lib/upm/tools/opkg.rb
 - lib/upm/tools/pacman.rb
 - lib/upm/tools/pkg.rb
+- lib/upm/tools/pkgin.rb
 - lib/upm/tools/xbps.rb
+- lib/upm/tools/yum.rb
 - spec/core_ext_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/epitron/upm/
 licenses:
 - WTFPL
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Universal Package Manager
 test_files: []