hackmac 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0919dce412f314296c00fc6f8bf87bf142b90cef6a437c1a25839fffd58bfee2'
-  data.tar.gz: cb3447775d1e0bc7da5e9f3bf0792dbd0428cba875124a3ae9da8c0006daa0f3
+  metadata.gz: e9e7cfe2bc42ae2f7aee8ac43d49c52814629c99c119eb96ac20a5e932cd3831
+  data.tar.gz: 9f85ee573b12bca903db7bfa12e090d5fab5d5037a81f76fb29269ff908ca5a6
 SHA512:
-  metadata.gz: f45f0701f57c0f7ff66c2d221275291645236d0f5591cfb569f37be457d3da85de796c0a75d4dfd23b76fbc5f3c3d707dcdc8d9ff6b5a008a06c3353aa590043
-  data.tar.gz: c343b4b6a791cfa69718a717a41b84c9fdd48e4c31d1562187511b0a450c6a4e41a3320a55e9adf16514a5f8e1ed8afd7df2753b732bf7b4fcbfc46d28bcc152
+  metadata.gz: a3ff124867aec02b6b9270d80471773be1a7af032caf4262935e1241a1d7b49d6c1c6d2952902c70a690ed16a28fb56a75349ca54b10f518c396bde537e37e56
+  data.tar.gz: e133326410563546d46235ceca5d1519e05cd3fc983386679460b95fbda59b6dcdc802d06558e00812815b2d76b854c5890ca25c66fedef9977822fbf8158ac2

data/LICENSE

@@ -0,0 +1,8 @@
+Copyright 2019-2023 Florian Frank
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.md

@@ -0,0 +1,55 @@
+# HackMac
+
+## Description
+
+Some ruby tools for working with a Hackintosh, which also might be (partially)
+useful an a regular Mac.
+
+## Tools
+
+ - `efi` is a tool to work with OpenCore EFI partitions, that is upgrading
+   OpenCore and Kexts and commiting to its git repository.
+ - `usb` can be used to create a bootable USB containing a MacOs release and
+   uses an EFI partition cloned from a git repository.
+ - `gfxmon` dispays performance statistics for your AMD GPU in the terminal,
+   that is temperature, clock rate, fan rotations, memory and power usage as
+   provided by MacOS, see the screenshot:
+   ![gfxmon Screenshot](./img/gfxmon.png "gfxmon Screenshot")
+
+
+## Installation
+
+You can use rubygems to fetch the gem and install it for you:
+
+    # gem install hackmac
+
+You can also put this line into your Gemfile
+
+    gem 'hackmac'
+
+# Configuration
+
+First start `efi` without arguments this will display the available commands,
+but also initializes a default configuration file in
+`~/.config/hackmac/hackmac.yml` to get you started. If you want work with
+multiple configuration files you can change the path by setting
+
+```
+$ export HACKMAC_CONFIG=~/config/hackmac/other.yml
+```
+
+in your shell.
+
+## Download
+
+The homepage of this library is located at
+
+* https://github.com/flori/complex_config
+
+## Author
+
+[Florian Frank](mailto:flori@ping.de)
+
+## License
+
+This software is licensed under the MIT license.

data/Rakefile

@@ -23,5 +23,6 @@ GemHadar do
   dependency  'plist'
   dependency  'tabulo'
   dependency  'search_ui'
+  dependency  'hashie'
   development_dependency 'debug'
 end

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/bin/efi

@@ -25,7 +25,7 @@ def usage
 
     Usage #{File.basename($0)} [command] [arguments]
 
-    Set CONFIG_PATH to the config file, e. g. ~/.config/hackmac/foobar.yml
+    Set HACKMAC_CONFIG to the config file, e. g. ~/.config/hackmac/foobar.yml
 
     Commands are
 

data/bin/gfxmon

@@ -33,23 +33,15 @@ def usage
 end
 
 def ps
-  `ioreg -l`.lines.find { |l|
-    if l =~ /"PerformanceStatistics" = {([^}]+)}/
-      break Hash[
-        $1.split(?,).map { |a|
-          a = a.split(?=)
-          [ a[0][1..-2], (Integer(a[1]) rescue a[1]) ]
-        }.sort_by { |name, _| name.downcase }
-      ]
-    end
-  }
+  Hackmac::IOReg.new(key: 'PerformanceStatistics').as_hash
 end
 
 def list(ps)
   max = ps.keys.max_by(&:size)&.size&.to_i
   include Hackmac::Graph::Formatters
-  puts ps.map { |n, v|
-    ("%-#{max}s" % n) + " " + ("%s" % send(derive_formatter(n), v)).bold
+  puts ps.sort_by(&:first).map { |n, v|
+    c = derive_color_from_string(n)
+    ("%-#{max}s" % n).color(15).on_color(c) + " " + ("%12s" % send(derive_formatter(n), v)).bold
   }
 end
 

data/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.5.0 ruby lib
+# stub: hackmac 1.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.5.0"
+  s.version = "1.6.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 = "2023-05-28"
+  s.date = "2023-05-29"
   s.description = "This ruby gem provides some useful tools for working with a Hackintosh.".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["efi".freeze, "gfxmon".freeze, "usb".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/graph.rb".freeze, "lib/hackmac/graph/display.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/oc_validator.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.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/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/graph.rb".freeze, "lib/hackmac/graph/display.rb".freeze, "lib/hackmac/hackmac.yml".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/oc_validator.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.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/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/graph.rb".freeze, "lib/hackmac/graph/display.rb".freeze, "lib/hackmac/ioreg.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/oc_validator.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.files = [".gitignore".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "bin/usb".freeze, "hackmac.gemspec".freeze, "img/gfxmon.png".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/graph.rb".freeze, "lib/hackmac/graph/display.rb".freeze, "lib/hackmac/hackmac.yml".freeze, "lib/hackmac/ioreg.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/oc_validator.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.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.3.26".freeze
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     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"])
+    s.add_runtime_dependency(%q<hashie>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
     s.add_dependency(%q<debug>.freeze, [">= 0"])
@@ -43,5 +44,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<plist>.freeze, [">= 0"])
     s.add_dependency(%q<tabulo>.freeze, [">= 0"])
     s.add_dependency(%q<search_ui>.freeze, [">= 0"])
+    s.add_dependency(%q<hashie>.freeze, [">= 0"])
   end
 end

data/lib/hackmac/graph.rb

@@ -1,5 +1,6 @@
 require 'term/ansicolor'
 require 'tins'
+require 'digest/md5'
 
 class Hackmac::Graph
   include Term::ANSIColor
@@ -26,6 +27,15 @@ class Hackmac::Graph
       value.to_s
     end
 
+    def derive_color_from_string(string)
+      cs = (21..226).select { |d|
+        Term::ANSIColor::Attribute[d].to_rgb_triple.to_hsl_triple.
+          lightness < 40
+      }
+      s = Digest::MD5.digest(string).unpack('Q*')
+      cs[ (s.first ^ s.last) % cs.size ]
+    end
+
     self
   end
 
@@ -144,11 +154,7 @@ class Hackmac::Graph
       when Proc
         @color.(@title)
       when nil
-        cs = (21..226).select { |d|
-          Term::ANSIColor::Attribute[d].to_rgb_triple.to_hsl_triple.
-            lightness < 40
-        }
-        cs[ @title.bytes.reduce(0, :+) % cs.size ]
+        derive_color_from_string(@title)
       else
         @color
       end

data/lib/hackmac/hackmac.yml

@@ -2,7 +2,7 @@
 efi:
   source: 'storage.gate.ping.de:/git/EFI-hacmaxi.git'
 usb:
-  os: '/Volumes/Install macOS Monterey/Install macOS Monterey.app'
+  os: '/Volumes/Install macOS Ventura/Install macOS Ventura.app'
   mp: '/Volumes/USB'
 devices:
   main:
@@ -53,4 +53,3 @@ kext:
     #  github: 'Mieze/LucyRTL8125Ethernet'
     USBToolBox:
       github: 'USBToolBox/kext'
-

data/lib/hackmac/ioreg.rb

@@ -0,0 +1,13 @@
+require 'hashie'
+
+module Hackmac
+  class IOReg
+    include Hackmac::Plist
+
+    def initialize(key:)
+      plist *(%w[ioreg -a -p IOService -r -k ] << key)
+      @plist.extend Hashie::Extensions::DeepFind
+      @plist = @plist.deep_find_all(key).max_by(&:size)
+    end
+  end
+end

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '1.5.0'
+  VERSION         = '1.6.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

@@ -7,6 +7,7 @@ require 'tins/xt'
 require 'hackmac/version'
 require 'hackmac/plist'
 require 'hackmac/disks'
+require 'hackmac/ioreg'
 require 'hackmac/asset_tools'
 require 'hackmac/github_source'
 require 'hackmac/url_download'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-28 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  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:
@@ -152,6 +166,7 @@ extra_rdoc_files:
 - lib/hackmac/github_source.rb
 - lib/hackmac/graph.rb
 - lib/hackmac/graph/display.rb
+- lib/hackmac/ioreg.rb
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/oc.rb
@@ -164,6 +179,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -171,6 +187,7 @@ files:
 - bin/gfxmon
 - bin/usb
 - hackmac.gemspec
+- img/gfxmon.png
 - lib/hackmac.rb
 - lib/hackmac/asset_tools.rb
 - lib/hackmac/config.rb
@@ -179,6 +196,7 @@ files:
 - lib/hackmac/graph.rb
 - lib/hackmac/graph/display.rb
 - lib/hackmac/hackmac.yml
+- lib/hackmac/ioreg.rb
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/oc.rb