upm 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e29ff72e67c8c3d41fc81f20ea1bcd602750f5ab997e2bc96d8bf241e13c93e
-  data.tar.gz: ea27773719646de552edada4c42557f61b56768811bf5e9e2e723a459fea1eaf
+  metadata.gz: 3bca79b16263ae9e7ac025695b61ec7bd88f81334b15564611e3f6977861ddcc
+  data.tar.gz: cbba1be68aa1f5deb00d59a0ec72ef912a790f04f2cccb7f185f6931eb8d76ad
 SHA512:
-  metadata.gz: a9415ca2e35cc161f196b0e4ba44e27bb71181962893a4273fc04fadbedb5f12298f60cd738efcb38eb08218e0897d45aa54fc8aadb03103bacbfb37bc4b8a47
-  data.tar.gz: 1c4df75f46acb38709627f71dcf874b158f93b694ad5040740c6470de1750b3a4e74fc051a58adfcc21c397183f8b0e89cebf2cb19b180df0141269a4fb7c630
+  metadata.gz: 9642d123de6aaf546cc328c18ef942e0883bc526d53fe6eefd28cc10573220dccc9a1e6a308e68559459b3d2e22b2161cbda623b147095b3114ba97f711b6126
+  data.tar.gz: 9439866b904f66b394f9680c03bf8e77646bd493012696de2fd64335b38fed05263dda5ca04ed482dfd26a2d0e6a5628fbe57eb65da1c3409d54678b9bb552ef

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/upm/lesspipe.rb

@@ -23,6 +23,8 @@
 #    :color  => Allow ANSI colour codes?
 #    :wrap   => Wrap long lines?
 #    :always => Always page, even if there's less than one page of text?
+#    :tail   => Seek to the end of the stream
+#    :search => <regexp> searches the output using the "/" operator
 #
 def lesspipe(*args)
   if args.any? and args.last.is_a?(Hash)
@@ -44,14 +46,17 @@ def lesspipe(*args)
   end
 
   params = []
-  params << "-R" unless options[:color] == false
-  params << "-S" unless options[:wrap] == true
+  params << "-R" unless options[:color]  == false
+  params << "-S" unless options[:wrap]   == true
   params << "-F" unless options[:always] == true
-  if options[:tail] == true
+  params << "-X"
+  
+  if regexp = options[:search]
+    params << "+/#{regexp}"
+  elsif options[:tail] == true
     params << "+\\>"
     $stderr.puts "Seeking to end of stream..."
   end
-  params << "-X"
 
   IO.popen("less #{params * ' '}", "w") do |less|
     if output

data/lib/upm/tool_dsl.rb

@@ -33,7 +33,7 @@ module UPM
           end
 
           @cmds[name] = proc do |args|
-            query = highlight ? args.join(" ") : nil
+            query = highlight ? args.join("\\\\s+") : nil
             run(*shell_command, *args, paged: paged, root: root, highlight: query)
           end
 
@@ -85,11 +85,11 @@ module UPM
             #   IO.copy_stream(command_io, STDOUT)
             # end
 
-            highlight_proc = if highlight
-              proc { |line| line.gsub(highlight) { |m| "\e[33;1m#{m}\e[0m" } }
-            else
-              proc { |line| line }
-            end
+            # highlight_proc = if highlight
+            #   proc { |line| line.gsub(highlight) { |m| "\e[33;1m#{m}\e[0m" } }
+            # else
+            #   proc { |line| line }
+            # end
 
             grep_proc = if grep
               proc { |line| line[grep] }
@@ -97,9 +97,10 @@ module UPM
               proc { true }
             end
 
-            lesspipe(disabled: !paged) do |less|
+            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 highlight_proc.(line) if grep_proc.(line)
+                less.puts line if grep_proc.(line)
               end
             end
 

data/lib/upm/tools/pkg.rb

@@ -18,6 +18,8 @@ UPM::Tool.new "pkg" do
     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

metadata

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