upm 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f969ff4647460fdbbd74e46dce038f1faf7d227f05bf1798fbfa682132ed3c7
-  data.tar.gz: 51e1fb0bb7874548fee681d9a2775b3c758af6703c0e61553273fcc5b62cac7b
+  metadata.gz: 2f8e2c0aca1eba8bc509f6f89582039a586d77e943ffced223e343860dfd378b
+  data.tar.gz: 5934a3b056109aceaa4f48e7d9403af2b9187fc4d64654596e4d99c97f1ce14a
 SHA512:
-  metadata.gz: 5cb6838c1f72cd573cee81ee4df3750005dc92e8d458622aad04355a6341f36afc7c621f3764e926901f99109430013a4a119a00ca4c0cf4875cb3e0e026295f
-  data.tar.gz: 2b56430e000bef935520e43225b332fc0f9c6838e5a0ebe20325db28527f0be725827f8bc391bdecac1014f6bab4c9baaaf30350a26c8e136894425cbf1ccc5b
+  metadata.gz: e660590380098da3bb5faf99a8d57f7e87aaa8d310a4d9526f743a7b76a40071fd3ba83bd06b6de4bcd002bbf5ea3630cea0e12df7e1ebe3b15e964e9aaf575f
+  data.tar.gz: 48986e26050f65d7665092cf48458cf88ef179edc5bf09550d52c8a92026acfdb16e973e5d99c2264c7b75e00f6a2b7e31922bcaacbaa1fcbadfa61a42873732

data/TODO.md

@@ -1,5 +1,13 @@
 # TODO
 
+## Performance
+
+It's currently very clunky on the rpi2.
+
+## 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.

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/upm/freshports_search.rb

@@ -0,0 +1,29 @@
+require 'open-uri'
+require 'upm/colored'
+
+class FreshportsSearch
+  NUM_RESULTS = 20
+  SEARCH_URL  = "https://www.freshports.org/search.php?query=%s&num=#{NUM_RESULTS}&stype=name&method=match&deleted=excludedeleted&start=1&casesensitivity=caseinsensitive"
+  SVN_URL     = "svn://svn.FreeBSD.org/ports/head/%s/%s"
+
+  def print(results)
+    results.each do |path, desc, version|
+      _, category, package = path.split("/")
+      puts "<9>#{category}<8>/<11>#{package} <8>(<7>#{version}<8>)".colorize
+      puts "  #{desc}"
+      puts "  #{SVN_URL % [category, package]}".light_green
+    end
+  end
+
+  def search!(query)
+    puts "<8>* <7>Searching for <15>#{query}<7>...".colorize
+    html = open(SEARCH_URL % query, &:read)
+    puts
+    results = html.scan(%r{<DT>\s*<BIG><B><a href="([^"]+)/">.+?</BIG>\s*<span class="[^"]+">([^<]+)</span><br>\s*<b>\s*([^<]+)\s*</b>}im)
+    print(results)
+  end
+end
+
+if __FILE__ == $0
+  FreshportsSearch.new.search!("silver_searcher")
+end

data/lib/upm/tool.rb

@@ -19,8 +19,9 @@ module UPM
     COMMAND_HELP = {
       "install"          => "install a package",
       "remove/uninstall" => "remove a package",
-      "build"            => "compile a package from source and install it",
-      "search"           => "using the fastest known API or service",
+      "search"           => "search packages",
+      "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)",
       "info"             => "show metadata about a package",
       "update/sync"      => "retrieve the latest package list or manifest",
@@ -54,6 +55,7 @@ module UPM
       "s"       => "search",
       "f"       => "files",
       "r"       => "remove",
+      "source-search" => "search-sources",
     }
 
     def initialize(name, &block)

data/lib/upm/tool_dsl.rb

@@ -17,8 +17,15 @@ module UPM
         @cmds ||= {}
 
         if block_given?
-          @cmds[name] = block
+          
+          if root and Process.uid != 0
+            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
@@ -29,6 +36,7 @@ module UPM
             query = highlight && args.join(" ") 
             run(*shell_command, *args, paged: paged, root: root, highlight: query)
           end
+
         end
       end
 
@@ -97,6 +105,13 @@ module UPM
         end
       end
 
+      def curl(url)
+        IO.popen(["curl", "-Ss", url], &:read)
+      rescue Errno::ENOENT
+        puts "Error: 'curl' isn't installed. You need this!"
+        exit 1
+      end
+
       def print_files(*paths, include: nil, exclude: nil)
         lesspipe do |less|
           paths.each do |path|

data/lib/upm/tools/pacman.rb

@@ -1,4 +1,3 @@
-
 UPM::Tool.new "pacman" do
 
   os "arch"
@@ -10,16 +9,14 @@ UPM::Tool.new "pacman" do
   command "upgrade", [*bin, "-Syu"], root: true
   command "remove",  [*bin, "-R"],   root: true
 
-  # command "check",  [*bin, "-Qkk"]
-  command "verify" do |args|
+  command "verify", root: true do |args|
     require 'upm/pacman_verifier'
     UPM::PacmanVerifier.new.verify!(*args)
   end
 
   command "audit",  "arch-audit",  paged: true
   command "files",  [*bin, "-Ql"], paged: true
-  command "search", [*bin, "-Ss"], paged: true
-
+  command "search", [*bin, "-Ss"], paged: true, highlight: true
 
   command "info" do |args|
     run(*bin, "-Qi", *args, paged: true) || run(*bin, "-Si", *args, paged: true)
@@ -108,7 +105,4 @@ UPM::Tool.new "pacman" do
 
   end
 
-
 end
-
-

data/lib/upm/tools/pkg.rb

@@ -1,3 +1,5 @@
+require 'upm/freshports_search'
+
 UPM::Tool.new "pkg" do
 
   os "FreeBSD"
@@ -11,6 +13,24 @@ UPM::Tool.new "pkg" do
 
   command "files",   "pkg list",    paged: true
   command "search",  "pkg search",  paged: true, highlight: true
+  command "search-sources" do |*args|
+    query = args.join(" ")
+    FreshportsSearch.new.search!(query)
+  end
+
+  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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upm
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies: []
 description: Wrap all known command-line package tools with a consistent and pretty
   interface.
@@ -31,6 +31,7 @@ files:
 - lib/upm.rb
 - lib/upm/colored.rb
 - lib/upm/core_ext.rb
+- lib/upm/freshports_search.rb
 - lib/upm/lesspipe.rb
 - lib/upm/log_parser.rb
 - lib/upm/pacman_verifier.rb
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Universal Package Manager