upm 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e927dff0f1b722f702c94b7d6cfcaf05c75e89fa42d491175f9972d08d2e92
-  data.tar.gz: cbde740ccc8cbd0aedb16393b579c2d38f2a614747762edfe777fe5fd9574a8d
+  metadata.gz: 9c5ec80be1569a58c23402685f57f02f46cebd10ae87b2684eb2aa8d132aa7cf
+  data.tar.gz: d2fee9bb7b69d36df657e749a109dd29cdc3bbabef9b83b7a1731f83afa504f4
 SHA512:
-  metadata.gz: f47b0ba2f51bb57a3dc52dab2df1e3ca8f85f96cf0e5bb32882a7514b999dc7885c3041d438e7ac1a1a2c34128c100b62b65006b5c0346147816816efd4eb751
-  data.tar.gz: '00483805c6f1a67d352c2e83e1266a5546b3934649d01472f00e85731a8e9eb7d6b434ddddef75814f6dccf10a8355aa7fbbf81ae328df983efba02044db46e0'
+  metadata.gz: e1c9ea83290760c4fc2c7ea7cab2580ea50ef5053751d49e7414f6d57b7b2e84b35064ec5ae4dbece2c5f00b5c7456ff80d72caf084d4c43a9668834937e25e8
+  data.tar.gz: 51dbea8086d5162b4f5b90b83028e924195f34a293c2481c05cc3e4e573752f1291f7bb73d2ecf0941ee6fbd351c6294f347c6f2ee0b4250065fc99cb7fdb6ce

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.16
+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/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/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_dsl.rb

@@ -1,3 +1,6 @@
+require 'pathname'
+require 'fileutils'
+
 module UPM
   class Tool
     module DSL
@@ -13,6 +16,28 @@ 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 ||= {}
 
@@ -38,16 +63,10 @@ module UPM
           end
 
         else
-
           raise "Error: Must supply a block or shell command"
-
         end
       end
 
-      def os(*args)
-        args.any? ? @os = args : @os
-      end
-
       ## Helpers
 
       def run(*args, root: false, paged: false, grep: nil, highlight: nil, sort: false)
@@ -139,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/pacman.rb

@@ -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,19 +1,32 @@
-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 "remove",  "pkg remove", 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",   "pkg list",    paged: true
   command "files" do |args|
     if args.empty?
       run "pkg", "info", "--list-files", "--all", paged: true
@@ -29,16 +42,19 @@ UPM::Tool.new "pkg" do
 
   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 -E 'pkg.+installed' /var/log/messages", paged: true
   command "log" do
+    require 'upm/core_ext/file'
     lesspipe do |less|
-      open("/var/log/messages").each_line do |line|
+      open("/var/log/messages").reverse_each_line do |line|
         # Jan 19 18:25:21 freebsd pkg[815]: pcre-8.43_2 installed
-        if line =~ /^(\S+ \S+ \S+) (\S+) pkg(?:\[\d+\])?: (\S+)-(\S+) 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
@@ -77,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upm
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - epitron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-22 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.
@@ -34,6 +34,7 @@ files:
 - 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
@@ -55,7 +56,7 @@ homepage: http://github.com/epitron/upm/
 licenses:
 - WTFPL
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -70,8 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Universal Package Manager
 test_files: []