upm 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 675637d1104dcbf53a07642dcce7385e24d83019730394a28662aba0146e6445
-  data.tar.gz: '04598f9d40c671d90ff4a129cae40426ed33c332632a570366d238159a4156fb'
+  metadata.gz: d35aa5412644879ebc18e848569dff6bf7274e09831a5733d63ab5fedffa1916
+  data.tar.gz: '09b5f1c4461fea7e092cc3ce630e7586c5bd127e849e173245f4c00c9df1d79f'
 SHA512:
-  metadata.gz: 1b7503c5afe5f88a482611ca8dc9b05a1189571522e4b7c5234e4651f15e418fe106e9ec627ab164aa0edc9bf6584004e1415bcbbc068e2cdff93bea5889eb94
-  data.tar.gz: 569590e5f1e8298a63ea04cfa784c52316868535acf40f1f74f8c1307b3708ffe5ae1cc0330f27efdd8359eb7a6e3f10279d51d146505d404dc9031071a422f7
+  metadata.gz: d7837f1491c9bdfa1c08fd8a5bcad5f265bbef08d26c0bdfc2b8ee526d1ad50106b6b598edb92c7af658c8c9df6602e26ac94516a7502261a368d405e3894bfc
+  data.tar.gz: 35a96cabe424135bafbab8b760b4cfc2de04b4c2d9811420c004625ab9cb8aea67bbfa1108c8ddaf68d3324eea94fe808b9ce3674100779d6ba4495c61588b75

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/lib/upm/lesspipe.rb

@@ -49,7 +49,7 @@ def lesspipe(*args)
 
   less_bin = File.which("less")
 
-  if File.symlink?(less_bin) and File.readlink(lessbin)[/busybox$/]
+  if File.symlink?(less_bin) and File.readlink(less_bin)[/busybox$/]
     # busybox less only supports one option!
     params << "-S" unless options[:wrap]   == true
   else

data/lib/upm/tool_dsl.rb

@@ -2,7 +2,7 @@ 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
@@ -25,7 +25,7 @@ module UPM
           end
 
         elsif shell_command
-          
+
           if shell_command.is_a? String
             shell_command = shell_command.split
           elsif not shell_command.is_a? Array
@@ -38,9 +38,9 @@ module UPM
           end
 
         else
-          
+
           raise "Error: Must supply a block or shell command"
-        
+
         end
       end
 
@@ -50,27 +50,27 @@ module UPM
 
       ## 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 +91,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

data/lib/upm/tools/apk.rb

@@ -3,18 +3,22 @@ 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",  "apk search",  paged: 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 "clean",   "apk clean"
-  
   command "list" do |args|
     if args.any?
-      query = args.join
-      run "apk", "info", grep: query, paged: true
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upm
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies: []
 description: Wrap all known command-line package tools with a consistent and pretty
   interface.