hackmac 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4022d9645a534a9b141079da3c6121d13b9b5a25d4e0e29bba7ce7b91146ac
-  data.tar.gz: b5071b21969668dcbd888dc1140c4b6ecc3ec4d95c4a78066a842344e1d7ced8
+  metadata.gz: 59f8d61d5c86ebfc3dc59e41fba9c82bde1ee0bb2aa95396ff6c878165ff37c6
+  data.tar.gz: 95932d40323add3994a44450337c9209be21f8378509c60ec512151e8a6ada31
 SHA512:
-  metadata.gz: e609a275e5e1e70105dec55074f0b52a8ecd1976031c1c252aaf82a0ba1e0e755483e1bfb98393e0cc2de6f8823679c003cb3703e299f5203739842a343919d9
-  data.tar.gz: bf5b34a5a8cc4c336eedb1a0e2c1bbd51de7ddf4ff384170c9dfca679acbcdc0a7de676d50971b17319505b64aae36bf3d0da100187ce76b15b3d52fc872a8cf
+  metadata.gz: 8af76a612daf738c8d4fb8423f8570e053d5db96696d3627d1413f391d8e1a6028e0331e915860e96742c6abe88295df0b41b459aa7f2621e4cb4b12f3f91eda
+  data.tar.gz: e4ac35e14b25e5c111eb4fe7d4bb7a25edd602afb667beb94e3d8302e2974bdbf229776e2f418e0a27c5f1089abfa844c3398b30df376f08b7243424c7aa73f8

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/bin/gfxmon

@@ -45,18 +45,11 @@ def ps
   }
 end
 
-def format_bytes(n, v)
-  if n =~ /bytes/i
-    Tins::Unit.format(v, format: '%.3f%U', unit: '')
-  else
-    v.to_s
-  end
-end
-
 def list(ps)
   max = ps.keys.max_by(&:size)&.size&.to_i
+  graph = Hackmac::Graph.new(title: '')
   puts ps.map { |n, v|
-    ("%-#{max}s" % n) + " " + ("%s" % format_bytes(n, v)).bold
+    ("%-#{max}s" % n) + " " + ("%s" % graph.send(derive_formatter(n), v)).bold
   }
 end
 
@@ -87,75 +80,36 @@ def choose_metric(ps)
   fail "Metric #{metric} not known"
 end
 
+def derive_formatter(metric)
+  case metric
+  when /bytes/i
+    :as_bytes
+  when /Hz/
+    :as_hertz
+  when /\(C\)/
+    :as_celsius
+  when /\(%\)/
+    :as_percent
+  else
+    :as_default
+  end
+end
+
 def display_graph
   if metric = choose_metric(ps)
     sleep_duration = [ 1, ($opts[?n] || 10).to_i ].max
-    data = []
-    print hide_cursor
-    at_exit do
-      print reset, clear_screen, move_home, show_cursor
-    end
-    trap(:SIGWINCH) {
-      lines, cols = Tins::Terminal.winsize
-      print clear_screen,
-        move_to(lines / 2, (cols - "Zzz…".size) / 2) { "Zzz…".italic }
-    }
-    loop do
-      print clear_screen
-
-      lines, cols = Tins::Terminal.winsize
-
-      as_title = -> t {
-        move_to(lines, (cols - t.size) / 2) { t.bold }
-      }
-
-      case value = ps[metric]
-      when Float
-        data << value
-      else
-        data << value.to_i
-      end
-      data = data.last(cols)
-
-      y_width = (data.max - data.min).to_f
-      if y_width == 0
-        print(
-          as_title.("#{metric} / #{sleep_duration}s"),
-          move_to(lines / 2, (cols - "no data".size) / 2) { "no data".italic }
-        )
-        sleep sleep_duration
-        print clear_screen
-        next
-      end
-
-      unless c = $opts[?c]
-        cs = (21..226).select { |d|
-          Term::ANSIColor::Attribute[d].to_rgb_triple.to_hsl_triple.
-            lightness < 40
-        }
-        c = cs[ metric.bytes.reduce(0, :+) % cs.size ]
-      end
-      color       = Term::ANSIColor::Attribute[c]
-      color_light = color.to_rgb_triple.to_hsl_triple.lighten(15) rescue color
-
-      data.each_with_index do |value, x|
-        x = x + cols - data.size + 1
-        y = lines - (((value - data.min) * lines / y_width)).round + 1
-        y.upto(lines) do |iy|
-          print move_to(iy, x) { ' '.on_color(y == iy ? color : color_light) }
-        end
-      end
-
-      print(
-        as_title.("#{metric} #{format_bytes(metric, data.last)} / #{sleep_duration}s"),
-        move_home { format_bytes(metric, data.max).bold },
-        move_to_line(lines) { format_bytes(metric, data.min).bold }
-      )
-
-      sleep sleep_duration
-    end
+    format_value = derive_formatter(metric)
+    graph = Hackmac::Graph.new(
+      title: metric,
+      sleep: sleep_duration,
+      value: -> _ { ps[metric] },
+      color: $opts[?c],
+      format_value:
+    )
+    graph.start
   end
-rescue Interrupt
+ensure 
+  graph&.stop
 end
 
 case

data/bin/usb

@@ -15,12 +15,15 @@ mountpoint_efi = '/Volumes/%s' % $config.devices.usb.name
 unless File.exist?($config.usb.os)
   fail "Cannot find #{$config.usb.os.inspect}!"
 end
-
+cim = "#{$config.usb.os}/Contents/Resources/createinstallmedia"
+unless File.exist?(cim)
+  fail "Cannot find #{cim.inspect}!"
+end
 ask("Really erase #{dev.inspect} and install #{$config.usb.os.inspect}? (y/n) ") or exit
 
 x %{diskutil partitionDisk #{dev.inspect} GPT JHFS+ "USB" 100%}
 
-x %{sudo "#{$config.usb.os}/Contents/Resources/createinstallmedia" --volume #{mountpoint.inspect} --nointeraction}
+x %{sudo #{cim.inspect} --volume #{mountpoint.inspect} --nointeraction}
 
 x %{sudo mkdir -p #{mountpoint_efi.inspect}}
 x %{sudo mount -t msdos #{('/dev/' + dev + 's1').inspect} #{mountpoint_efi.inspect}}

data/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.2.0 ruby lib
+# stub: hackmac 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.2.0"
+  s.version = "1.3.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-04-23"
+  s.date = "2023-05-27"
   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/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/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/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/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.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

data/lib/hackmac/graph.rb

@@ -0,0 +1,176 @@
+require 'term/ansicolor'
+require 'tins'
+
+class Hackmac::Graph
+  include Term::ANSIColor
+
+  def initialize(title:, value: -> i { 0 }, format_value: nil, sleep: nil, color: nil)
+    @title        = title
+    @value        = value
+    @format_value = format_value
+    @sleep        = sleep
+    @continue     = false
+    @data         = []
+    @color        = color
+  end
+
+  def start
+    install_handlers
+    full_reset
+    perform hide_cursor
+    @continue = true
+    start_loop
+  end
+
+  def stop
+    full_reset
+    @continue = false
+  end
+
+  private
+
+  def start_loop
+    full_reset
+    color       = pick_color
+    color_light = color.to_rgb_triple.to_hsl_triple.lighten(15) rescue color
+    i           = 0
+    while @continue
+      @lines, @cols = winsize
+
+      @data << @value.(i)
+      @data = data.last(cols)
+
+      y_width = (data.max - data.min).to_f
+      if y_width == 0
+        perform(
+          clear_screen,
+          as_title("#@title / #{sleep_duration}"),
+          move_to(lines / 2, (cols - "no data".size) / 2) { italic{"no data"} }
+        )
+        maybe_sleep
+        next
+      end
+
+      perform clear_screen
+      data.each_with_index do |value, x|
+        x = x + cols - data.size + 1
+        y = lines - (((value - data.min) * lines / y_width)).round + 1
+        y.upto(lines) do |iy|
+          perform move_to(iy, x) { on_color(y == iy ? color : color_light){' '} }
+        end
+      end
+
+      perform(
+        as_title("#@title #{format_value(data.last)} / #{sleep_duration}"),
+        move_home { format_value(data.max).bold },
+        move_to_line(lines) { format_value(data.min).bold }
+      )
+
+      maybe_sleep
+    end
+    full_reset
+  rescue *[ Interrupt, defined?(IRB::Abort) && IRB::Abort ].compact
+    stop
+  end
+
+  def perform(*a)
+    print *a
+  end
+
+  attr_reader :cols
+
+  attr_reader :lines
+
+  attr_reader :data
+
+  def as_title(text)
+    move_to(lines, (cols - text.size) / 2) { bold{text} }
+  end
+
+  def sleep_duration
+    @sleep ? "#{@sleep}s" : "once"
+  end
+
+  def format_value(value)
+    case @format_value
+    when Proc
+      @format_value.(value)
+    when Symbol
+      send(@format_value, value)
+    else
+      send(:as_default, value)
+    end
+  end
+
+  def as_bytes(value)
+    Tins::Unit.format(value, prefix: :uc, format: '%.3f%U', unit: 'B')
+  end
+
+  def as_hertz(value)
+    Tins::Unit.format(value, prefix: :uc, format: '%.3f%U', unit: 'Hz')
+  end
+
+  def as_celsius(value)
+    "#{value}°"
+  end
+
+  def as_percent(value)
+    "#{value}%"
+  end
+
+  def as_default(value)
+    value.to_s
+  end
+
+  def pick_color
+    Term::ANSIColor::Attribute[
+      case @color
+      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 ]
+      else
+        @color
+      end
+    ]
+  end
+
+  def maybe_sleep
+    if @sleep
+      sleep @sleep
+    else
+      @continue = false
+    end
+  end
+
+  def normalize_value(value)
+    case value
+    when Float
+      value
+    else
+      value.to_i
+    end
+  end
+
+  def full_reset
+    perform reset, clear_screen, move_home, show_cursor
+  end
+
+  def winsize
+    Tins::Terminal.winsize
+  end
+
+  def install_handlers
+    at_exit { full_reset }
+
+    trap(:SIGWINCH) {
+      lines, cols = winsize
+      perform clear_screen,
+        move_to(lines / 2, (cols - "Zzz…".size) / 2) { "Zzz…".italic }
+    }
+  end
+end

data/lib/hackmac/version.rb

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

@@ -17,3 +17,4 @@ require 'hackmac/oc_upgrader'
 require 'hackmac/oc_validator'
 require 'hackmac/config'
 require 'hackmac/utils'
+require 'hackmac/graph'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -150,6 +150,7 @@ extra_rdoc_files:
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/github_source.rb
+- lib/hackmac/graph.rb
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/oc.rb
@@ -174,6 +175,7 @@ files:
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/github_source.rb
+- lib/hackmac/graph.rb
 - lib/hackmac/hackmac.yml
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb