utils 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37ab9d9db752bd2e79a46c3ae402d09a8f6b1a1e0ad9bf1f1cfb969c58a92c55
-  data.tar.gz: 55c4fcae89c4f36f9ef1376e64a3483f70943f560d444997ecf1eceaf48517b4
+  metadata.gz: 5d34a30035558c666c0079685fe27e636b8cd261291865f822bd7180473e9a6e
+  data.tar.gz: d7022c87ebe943e973fcf5e77e7a491111b66a836773c05ba09e91cf2d9b567b
 SHA512:
-  metadata.gz: 0c33062881cf649b6b966c306ea710c5e404f279f7cded83b0557b2bc6a846bc14ad81b9a37b67ec33cc37f397797686beff2a1dacb9d470f2a6aec275559218
-  data.tar.gz: 8befe84924b2e00f6b8dc7e7f9add2fb7c6765639369603a6eabbd205470d0863e3241b9495532c18630ab0459508dd57c24340d09d073d83899cd220864a971
+  metadata.gz: 2aa7813acb3887eaf9ee143bce270e8bc5470ecd2a37d6bf18107110674b94f4b99146e0440f208524ddf9a9cd82ac1a86365fdc1429615fbc9952976a4ce92a
+  data.tar.gz: 987b1c4a98057c7b317cc5ce2d0b0762cbe4e5335f5ac1756d07a1b431bb6730235973e9236241be733a96f034fe138d3dde73e413c57338ed1d989993957dac

data/VERSION

@@ -1 +1 @@
-0.17.0
+0.18.0

data/lib/utils.rb

@@ -10,7 +10,7 @@ module Utils
   require 'utils/probe_server'
   require 'utils/ssh_tunnel_specification'
   require 'utils/line_blamer'
-  require 'utils/interactive_search'
+  require 'utils/search_ui'
   begin
     require 'utils/line_formatter'
   rescue LoadError

data/lib/utils/{interactive_search.rb → search_ui.rb}

@@ -1,5 +1,6 @@
 require 'term/ansicolor'
-class Utils::InteractiveSearch
+
+class Utils::SearchUI
   include Term::ANSIColor
 
   def initialize(query:, found:, output: STDOUT, prompt: 'Search? %s')
@@ -11,20 +12,24 @@ class Utils::InteractiveSearch
   end
 
   def start
-    @output.print clear_screen
+    @output.print clear_screen, move_home, reset
     loop do
-      @output.print move_home(@prompt % @answer)
+      @output.print move_home { @prompt % @answer }
       case getc
       when true
-        @output.print clear_screen move_home reset
-        return !!@found.(@answer)
+        @output.print clear_screen, move_home, reset
+        if result = @found.(@answer)
+          return result
+        else
+          return nil
+        end
       when false
-        return false
+        return nil
       end
       result = @query.(@answer)
       @output.print clear_screen
       unless @answer.empty?
-        @output.print clear_screen move_to_line(2, result)
+        @output.print move_home { ?\n + result }
       end
     end
   end
@@ -45,6 +50,7 @@ class Utils::InteractiveSearch
       nil
     when "\v"
       @answer.clear
+      nil
     when /\A[\x00-\x1f]\z/
       nil
     else

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.17.0'
+  VERSION         = '0.18.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.17.0 ruby lib
+# stub: utils 0.18.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.17.0"
+  s.version = "0.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2019-11-20"
+  s.date = "2019-12-02"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
-  s.executables = ["discover".freeze, "classify".freeze, "sedit".freeze, "bootdisk".freeze, "irb_connect".freeze, "ascii7".freeze, "path".freeze, "enum".freeze, "unquarantine_apps".freeze, "ssh-tunnel".freeze, "xmp".freeze, "brakeman2err".freeze, "search".freeze, "chroot-exec".freeze, "edit".freeze, "tmproc".freeze, "json_check".freeze, "edit_wait".freeze, "errf".freeze, "untest".freeze, "blameline".freeze, "remote_copy".freeze, "git-empty".freeze, "create_cstags".freeze, "vacuum_firefox_sqlite".freeze, "same_files".freeze, "chroot-libs".freeze, "git-versions".freeze, "strip_spaces".freeze, "number_files".freeze, "rssr".freeze, "serve".freeze, "vcf2alias".freeze, "on_change".freeze, "utils-utilsrc".freeze, "myex".freeze, "long_lines".freeze, "dialog-pick".freeze, "probe".freeze, "create_tags".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/interactive_search.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
-  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/bootdisk".freeze, "bin/brakeman2err".freeze, "bin/chroot-exec".freeze, "bin/chroot-libs".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/dialog-pick".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/errf".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_connect".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/probe".freeze, "bin/remote_copy".freeze, "bin/rssr".freeze, "bin/same_files".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/tmproc".freeze, "bin/unquarantine_apps".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vacuum_firefox_sqlite".freeze, "bin/vcf2alias".freeze, "bin/xmp".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/interactive_search.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "utils.gemspec".freeze]
+  s.executables = ["discover".freeze, "classify".freeze, "sedit".freeze, "irb_connect".freeze, "ascii7".freeze, "path".freeze, "enum".freeze, "unquarantine_apps".freeze, "ssh-tunnel".freeze, "xmp".freeze, "brakeman2err".freeze, "search".freeze, "chroot-exec".freeze, "edit".freeze, "tmproc".freeze, "json_check".freeze, "edit_wait".freeze, "errf".freeze, "untest".freeze, "blameline".freeze, "remote_copy".freeze, "git-empty".freeze, "create_cstags".freeze, "vacuum_firefox_sqlite".freeze, "same_files".freeze, "chroot-libs".freeze, "git-versions".freeze, "strip_spaces".freeze, "number_files".freeze, "rssr".freeze, "serve".freeze, "vcf2alias".freeze, "on_change".freeze, "utils-utilsrc".freeze, "myex".freeze, "long_lines".freeze, "dialog-pick".freeze, "probe".freeze, "create_tags".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/search_ui.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
+  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/brakeman2err".freeze, "bin/chroot-exec".freeze, "bin/chroot-libs".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/dialog-pick".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/errf".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_connect".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/probe".freeze, "bin/remote_copy".freeze, "bin/rssr".freeze, "bin/same_files".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/tmproc".freeze, "bin/unquarantine_apps".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vacuum_firefox_sqlite".freeze, "bin/vcf2alias".freeze, "bin/xmp".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/search_ui.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "utils.gemspec".freeze]
   s.homepage = "http://github.com/flori/utils".freeze
   s.rdoc_options = ["--title".freeze, "Utils - Some useful command line utilities".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.0.6".freeze
+  s.rubygems_version = "3.0.3".freeze
   s.summary = "Some useful command line utilities".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -114,7 +114,6 @@ executables:
 - discover
 - classify
 - sedit
-- bootdisk
 - irb_connect
 - ascii7
 - path
@@ -160,7 +159,6 @@ extra_rdoc_files:
 - lib/utils/file_xt.rb
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
-- lib/utils/interactive_search.rb
 - lib/utils/irb.rb
 - lib/utils/irb/service.rb
 - lib/utils/line_blamer.rb
@@ -168,6 +166,7 @@ extra_rdoc_files:
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
 - lib/utils/probe_server.rb
+- lib/utils/search_ui.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
 - lib/utils/xt/source_location_extension.rb
@@ -180,7 +179,6 @@ files:
 - VERSION
 - bin/ascii7
 - bin/blameline
-- bin/bootdisk
 - bin/brakeman2err
 - bin/chroot-exec
 - bin/chroot-libs
@@ -224,7 +222,6 @@ files:
 - lib/utils/file_xt.rb
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
-- lib/utils/interactive_search.rb
 - lib/utils/irb.rb
 - lib/utils/irb/service.rb
 - lib/utils/line_blamer.rb
@@ -232,6 +229,7 @@ files:
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
 - lib/utils/probe_server.rb
+- lib/utils/search_ui.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
 - lib/utils/xt/source_location_extension.rb
@@ -258,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities

data/bin/bootdisk

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-
-value   = `bdmesg`.lines.find { |l| l =~ /SelfDevicePath=(.*)\r/ and break $1 }
-uuid    = value.split('\\').last[/(?:<?GPT,)([\h-]+)/, 1] or exit 1
-dev     = `partutil --search-uuid #{uuid}`.chomp
-volname = `partutil --show-volumename #{dev}`.chomp
-disk    = `partutil --show-wholedisk #{dev}`.chomp
-sdisk   = `diskutil list #{disk}`.lines.grep(/Apple_APFS/).first.split(/\s+/)[4]
-vols    = `diskutil list #{sdisk}`.lines.grep(/^\s*[1-9]\d*:/).join.scan(/(?:<?Volume\s+)(\S+)/).flatten
-jj({ dev: dev, volname: volname, uuid: uuid, disk: disk, sdisk: sdisk, vols: vols })