upm 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bca79b16263ae9e7ac025695b61ec7bd88f81334b15564611e3f6977861ddcc
-  data.tar.gz: cbba1be68aa1f5deb00d59a0ec72ef912a790f04f2cccb7f185f6931eb8d76ad
+  metadata.gz: 675637d1104dcbf53a07642dcce7385e24d83019730394a28662aba0146e6445
+  data.tar.gz: '04598f9d40c671d90ff4a129cae40426ed33c332632a570366d238159a4156fb'
 SHA512:
-  metadata.gz: 9642d123de6aaf546cc328c18ef942e0883bc526d53fe6eefd28cc10573220dccc9a1e6a308e68559459b3d2e22b2161cbda623b147095b3114ba97f711b6126
-  data.tar.gz: 9439866b904f66b394f9680c03bf8e77646bd493012696de2fd64335b38fed05263dda5ca04ed482dfd26a2d0e6a5628fbe57eb65da1c3409d54678b9bb552ef
+  metadata.gz: 1b7503c5afe5f88a482611ca8dc9b05a1189571522e4b7c5234e4651f15e418fe106e9ec627ab164aa0edc9bf6584004e1415bcbbc068e2cdff93bea5889eb94
+  data.tar.gz: 569590e5f1e8298a63ea04cfa784c52316868535acf40f1f74f8c1307b3708ffe5ae1cc0330f27efdd8359eb7a6e3f10279d51d146505d404dc9031071a422f7

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

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(lessbin)[/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_dsl.rb

@@ -17,9 +17,9 @@ module UPM
         @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
@@ -33,7 +33,7 @@ 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
 

data/lib/upm/tools/apk.rb

@@ -0,0 +1,23 @@
+UPM::Tool.new "apk" do
+
+  os "alpine"
+
+  command "install", "apk add",      root: true
+  command "update",  "apk update",   root: true
+  command "upgrade", "apk upgrade",  root: true
+
+  command "files",   "apk info -L", paged: true
+  command "search",  "apk search",  paged: true
+
+  command "clean",   "apk clean"
+  
+  command "list" do |args|
+    if args.any?
+      query = args.join
+      run "apk", "info", grep: query, paged: true
+    else
+      run "apk", "info", 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.13
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies: []
 description: Wrap all known command-line package tools with a consistent and pretty
   interface.
@@ -38,6 +38,7 @@ 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/pacman.rb
 - lib/upm/tools/pkg.rb