hackmac 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f25cc8626236ba947d5d0b80832612e3cab36b86e625d68fd89efb2549e600ef
-  data.tar.gz: bcb21df5c03cb05b09c432c61e7f18475a7be130cb695e499b963f6f8a49a321
+  metadata.gz: d7acc13fd5dee07de07b479330881c9c630179f8dc785400c2effaea44c3190c
+  data.tar.gz: 2bb42e69cd439b93d38e9abd06cfb4142e3e987b1f049135e13416b2f610d099
 SHA512:
-  metadata.gz: 50330b8e379462829f47fec861fc2492608535aa5c3ac6550fec8b25531b15148f872f1e9cac280c315ef65b331c6a3ed4152042344675aec8b0e0ec90b77307
-  data.tar.gz: 614b174361b3efa2bfd3d4a92110e62e06aed129f864589f30d7b1894de8ceffd8c6623cb2a1689e10d240e2cd2efd85465d52d70863a99f493efaa9e756f73c
+  metadata.gz: cd15589d99e9f8c25ed2ab45f44a584e7e02786c1b0bdcaaec0dea2becc74a7cdfe3f26170af2e16b440842169c10dbd0c06864b16fb045d9c2e0a28fd1f3934
+  data.tar.gz: a6a78acc6c898182d4614f6bab884de53d9a5540eadf84eae6bea708cdbc88dda3a3f72b41fea3cc0af458011a60ce93c75b8116c8c3d6c0c458216c1bdc3bc9

data/Rakefile

@@ -22,5 +22,6 @@ GemHadar do
   dependency  'amatch'
   dependency  'plist'
   dependency  'tabulo'
+  dependency  'search_ui'
   development_dependency 'byebug'
 end

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/bin/gfxmon

@@ -10,6 +10,8 @@ end
 require 'hackmac'
 include Hackmac
 require 'amatch'
+require 'search_ui'
+include SearchUI
 
 $opts = go 'c:g:n:jlh', defaults: { ?s => true, ?n => 10 }
 
@@ -62,7 +64,7 @@ def choose_metric(ps)
   case metric = $opts[?g]
   when nil
     ps_names = ps.keys
-    metric = SearchUI.new(
+    metric = Search.new(
       match: -> answer {
         matcher = Amatch::PairDistance.new(answer.downcase)
         matches = ps_names.map { |n| [ n, -matcher.similar(n.downcase) ] }.

data/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.3.4 ruby lib
+# stub: hackmac 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.3.4"
+  s.version = "0.4.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 = "2020-02-07"
+  s.date = "2020-02-11"
   s.description = "This ruby gem provides some useful tools for working with a Hackintosh.".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["gfxmon".freeze, "usb".freeze, "efi".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
-  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "bin/usb".freeze, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "bin/usb".freeze, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
   s.homepage = "http://github.com/flori/hackmac".freeze
   s.rdoc_options = ["--title".freeze, "Hackmac - Some useful tools for working with a Hackintosh".freeze, "--main".freeze, "README.md".freeze]
   s.rubygems_version = "3.1.2".freeze
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<amatch>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<plist>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<tabulo>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
     s.add_dependency(%q<byebug>.freeze, [">= 0"])
@@ -41,5 +42,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<amatch>.freeze, [">= 0"])
     s.add_dependency(%q<plist>.freeze, [">= 0"])
     s.add_dependency(%q<tabulo>.freeze, [">= 0"])
+    s.add_dependency(%q<search_ui>.freeze, [">= 0"])
   end
 end

data/lib/hackmac/version.rb

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

data/lib/hackmac.rb

@@ -5,7 +5,6 @@ require 'json'
 require 'tins/xt'
 require 'hackmac/version'
 require 'hackmac/plist'
-require 'hackmac/search_ui'
 require 'hackmac/disks'
 require 'hackmac/kext'
 require 'hackmac/kext_source'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: search_ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This ruby gem provides some useful tools for working with a Hackintosh.
 email: flori@ping.de
 executables:
@@ -137,7 +151,6 @@ extra_rdoc_files:
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_source.rb
 - lib/hackmac/plist.rb
-- lib/hackmac/search_ui.rb
 - lib/hackmac/utils.rb
 - lib/hackmac/version.rb
 files:
@@ -156,7 +169,6 @@ files:
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_source.rb
 - lib/hackmac/plist.rb
-- lib/hackmac/search_ui.rb
 - lib/hackmac/utils.rb
 - lib/hackmac/version.rb
 homepage: http://github.com/flori/hackmac

data/lib/hackmac/search_ui.rb

@@ -1,87 +0,0 @@
-require 'term/ansicolor'
-
-class Hackmac::SearchUI
-  include Term::ANSIColor
-
-  def initialize(
-    match:,
-    query:,
-    found:,
-    output: STDOUT,
-    prompt: 'Search? %s'
-  )
-    @match        = match
-    @query        = query
-    @found        = found
-    @output       = output
-    @prompt       = prompt
-    @selector     = 0
-    @max_selector = nil
-    @answer       = ''
-  end
-
-  def start
-    @output.print reset
-    @matches = @match.(@answer)
-    @selector = [ 0, [ @selector, @matches.size - 1 ].min ].max
-    result = @query.(@answer, @matches, @selector)
-    @output.print clear_screen
-    @output.print move_home { ?\n + result }
-    loop do
-      @output.print move_home { @prompt % @answer }
-      case getc
-      when true
-        @output.print clear_screen, move_home, reset
-        if result = @found.(@answer, @matches, @selector)
-          return result
-        else
-          return nil
-        end
-      when false
-        return nil
-      end
-      @matches = @match.(@answer)
-      @selector = [ 0, [ @selector, @matches.size - 1 ].min ].max
-      result = @query.(@answer, @matches, @selector)
-      @output.print clear_screen
-      @output.print move_home { ?\n + result }
-    end
-  end
-
-  private
-
-  def getc
-    system 'stty raw -echo'
-    c = STDIN.getc
-    system 'stty cooked echo'
-    case c
-    when "\x03"
-      false
-    when "\e"
-      STDIN.getc == ?[ or return nil
-      STDIN.getc =~ /\A([AB])\z/ or return nil
-      if $1 == ?A
-        @selector -= 1
-      else
-        @selector += 1
-      end
-      nil
-    when ?\r
-      true
-    when "\x7f"
-      @selector = 0
-      @answer.chop!
-      nil
-    when "\v"
-      @selector = 0
-      @answer.clear
-      nil
-    when /\A[\x00-\x1f]\z/
-      nil
-    else
-      @selector = 0
-      @answer << c
-      nil
-    end
-  end
-end