hackmac 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a23e0590d9f48c2f7b18432140531bc240f91e67bb5e459c6786d451920db43
-  data.tar.gz: efe3f22eb263b39b20722cb98bd249d3ef26f832ce4e77252a15a7bfcc3c8718
+  metadata.gz: 7b280a3a7695d3ca2acc44f274d9602bcfccb8f24ea43a6e49b490830efed1e0
+  data.tar.gz: a8fdf6d9ccaf9cf736218a10e462c4522139e938ef0677234fe48af3ea278179
 SHA512:
-  metadata.gz: 81dc68295902e4a986c3356fc13645549df3c9fa1e2c49b465ce32911f99ceda5c8abd028f9aab41b5c4d87c2afaf9d6af98fc9fcb1c02dd415bd2c54ef35011
-  data.tar.gz: fe12bed6b4bbabdfb002b16bfbc3c6d1bdc1c363da20b9d4d960c72d11fb9f8622ae3dd8dc8416de0388400167b3988c53ccc0d2b0f1fb5b98c2a63d91e5630a
+  metadata.gz: 6cb72a600ddd93ac37f453b952b49e748a40626f1405d89803a64401c8aee7331c800d5b07d699ec45132ce1a26aa0288f2969798a1dcb6b1ee7598e1a090584
+  data.tar.gz: 32d42271e8814c01c80ac2ecb63d15080042abc9a2f265fccd82536680dbcfd17e595ba2cee78c05ee73a6595c41e0212a6ed834ca9c52929cb3ab40f595c633

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.4.0

data/bin/gfxmon

@@ -13,7 +13,7 @@ require 'amatch'
 require 'search_ui'
 include SearchUI
 
-$opts = go 'c:g:n:jlh', defaults: { ?s => true, ?n => 10 }
+$opts = go 'c:m:n:jlh', defaults: { ?s => true, ?n => 5 }
 
 def usage
   puts <<~end
@@ -25,7 +25,7 @@ def usage
       -l          output GPU performance data as list
       -j          output GPU performance data as json
       -n SECONDS  measure every SECONDS
-      -g METRIC   output graph for performance METRIC
+      -m METRIC   output graph for performance METRIC
       -c COLOR    output graph in this terminal COLOR (between 0 - 255)
 
   end
@@ -45,23 +45,16 @@ 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
+  include Hackmac::Graph::Formatters
   puts ps.map { |n, v|
-    ("%-#{max}s" % n) + " " + ("%s" % format_bytes(n, v)).bold
+    ("%-#{max}s" % n) + " " + ("%s" % send(derive_formatter(n), v)).bold
   }
 end
 
 def choose_metric(ps)
-  case metric = $opts[?g]
+  case metric = $opts[?m]
   when nil
     ps_names = ps.keys
     metric = Search.new(
@@ -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/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.2.1 ruby lib
+# stub: hackmac 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.2.1"
+  s.version = "1.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 = "2023-05-14"
+  s.date = "2023-05-28"
   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/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.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/display.rb

@@ -0,0 +1,200 @@
+class Hackmac::Graph
+  class Display
+    ANSI = Term::ANSIColor
+
+    class Cell < Struct.new(:char, :color, :on_color, :styles)
+      def ==(other)
+        to_a == other.to_a
+      end
+
+      def to_s
+        ANSI.color(color) {
+          ANSI.on_color(on_color) {
+            styles.inject(char) { |c, s|
+              ANSI.send(s) { c }
+            }
+          }
+        }
+      end
+    end
+
+    def initialize(lines, columns)
+      @lines_range   = 1..lines
+      @columns_range = 1..columns
+      clear
+    end
+
+    def clear
+      @x        = 1
+      @y        = 1
+      @color    = 15
+      @on_color = 0
+      @styles   = []
+      @cells    =
+        Array.new(lines) {
+          Array.new(columns) {
+            Cell.new(' ', @color, @on_color, @styles)
+          }
+        }
+      reset
+    end
+
+    def reset
+      @color    = 15
+      @on_color = 0
+      @styles   = []
+      self
+    end
+
+    def each(&block)
+      Enumerator.new do |enum|
+        @lines_range.each do |y|
+          @columns_range.each do |x|
+            enum.yield y, x, @cells[y - 1][x - 1]
+          end
+        end
+      end.each(&block)
+    end
+
+    def -(old)
+      dimensions != old.dimensions and raise ArgumentError,
+        "old dimensions #{old.dimensions.inspect} don't match #{dimensions.inspect}"
+      result = ''
+      each.zip(old.each) do |(my, mx, me), (_, _, old)|
+        if me != old
+          result << ANSI.move_to(my, mx) << me.to_s
+        end
+      end
+      result
+    end
+
+    def to_s
+      each.inject(ANSI.clear_screen)  do |s, (y, x, c)|
+        s << ANSI.move_to(y, x) << c.to_s
+      end
+    end
+
+    def inspect
+      "#<#{self.class}: #{columns}×#{lines}>"
+    end
+
+    attr_reader :x
+
+    attr_reader :y
+
+    def lines
+      @lines_range.end
+    end
+
+    def columns
+      @columns_range.end
+    end
+
+    def dimensions
+      [ lines, columns ]
+    end
+
+    def styled(*s)
+      if nope = s.find { !style?(_1) }
+        raise ArgumentError, "#{nope} is not a style"
+      end
+      @styles = s
+      self
+    end
+
+    def at(y, x)
+      @lines_range.include?(y) or
+        raise ArgumentError, "y #{y} out of lines range #@lines_range"
+      @columns_range.include?(x) or
+        raise ArgumentError, "x #{x} out of columns range #@columns_range"
+      @y, @x = y, x
+      self
+    end
+
+    def put(char)
+      char.size == 1 or
+        raise ArgumentError, "#{char} is not single character"
+      @cells[@y - 1][@x - 1] = Cell.new(char, @color, @on_color, @styles)
+      self
+    end
+
+    def write(string)
+      string.each_char do |char|
+        put(char)
+        if x < columns - 1
+          at(y, x + 1)
+        else
+          break
+        end
+      end
+      self
+    end
+
+    def top
+      at(1, x)
+    end
+
+    def bottom
+      at(lines, x)
+    end
+
+    def left
+      at(y, 1)
+    end
+
+    def right
+      at(y, columns)
+    end
+
+    def centered
+      at(lines / 2, columns / 2)
+    end
+
+    def write_centered(string)
+      at(@y, (columns - string.size) / 2).write(string)
+    end
+
+    def get
+      @cells[@y - 1][@x - 1]
+    end
+
+    def color(color)
+      @color = attribute!(color)
+      self
+    end
+
+    def on_color(on_color)
+      @on_color = attribute!(on_color)
+      self
+    end
+
+    private
+
+    def style?(s)
+      [
+        :bold,
+        :dark,
+        :faint,
+        :italic,
+        :underline,
+        :underscore,
+        :blink,
+        :rapid_blink,
+        :reverse,
+        :negative,
+        :concealed,
+        :conceal,
+        :strikethrough,
+      ].member?(s)
+    end
+
+    def attribute?(a)
+      Term::ANSIColor::Attribute[a]
+    end
+
+    def attribute!(a)
+      attribute?(a) or
+        raise ArgumentError, "#{a.inspect} is not a color attribute"
+    end
+  end
+end

data/lib/hackmac/graph.rb

@@ -0,0 +1,201 @@
+require 'term/ansicolor'
+require 'tins'
+
+class Hackmac::Graph
+  include Term::ANSIColor
+
+  include\
+  module Formatters
+    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
+
+    self
+  end
+
+  def initialize(
+    title:,
+    value: -> i { 0 },
+    format_value: nil,
+    sleep: nil,
+    color: nil
+  )
+    sleep >= 0 or raise ArgumentError, 'sleep has to be >= 0'
+    @title        = title
+    @value        = value
+    @format_value = format_value
+    @sleep        = sleep
+    @continue     = false
+    @data         = []
+    @color        = color
+    @mutex        = Mutex.new
+  end
+
+  def start
+    install_handlers
+    full_reset
+    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
+    @continue = true
+    while @continue
+      @full_reset and full_reset
+      perform hide_cursor
+
+      @data << @value.(i)
+      @data = data.last(columns)
+
+      y_width = (data.max - data.min).to_f
+      if y_width == 0
+        @display.reset.bottom.styled(:bold).
+          write_centered("#@title / #{sleep_duration}").
+          reset.centered.styled(:italic).write_centered("no data")
+        perform_display_diff
+        sleep_now
+        next
+      end
+
+      @display.reset
+      data.each_with_index do |value, x|
+        x = x + columns - data.size + 1
+        y = lines - (((value - data.min) * lines / y_width)).round + 1
+        y.upto(lines) do |iy|
+          @display.at(iy, x).on_color(
+            y == iy ? color : color_light
+          ).write(' ')
+        end
+      end
+
+      @display.reset.bottom.styled(:bold).
+        write_centered("#@title #{format_value(data.last)} / #{sleep_duration}")
+      @display.reset.styled(:bold).
+        left.top.write(format_value(data.max)).
+        left.bottom.write(format_value(data.min))
+
+      perform_display_diff
+      sleep_now
+    end
+  ensure
+    stop
+  end
+
+  def perform(*a)
+    print *a
+  end
+
+  def columns
+    @display.columns
+  end
+
+  def lines
+    @display.lines
+  end
+
+  attr_reader :data
+
+  def sleep_duration
+    "#{@sleep}s"
+  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 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 sleep_now
+    sleep @sleep
+  end
+
+  def perform_display_diff
+    @mutex.synchronize do
+      unless @old_display && @old_display.dimensions == @display.dimensions
+        @old_display = @display.dup.clear
+      end
+      perform @display - @old_display
+      @display, @old_display = @old_display.clear, @display
+      perform move_to(lines, columns)
+    end
+  end
+
+
+  def normalize_value(value)
+    case value
+    when Float
+      value
+    else
+      value.to_i
+    end
+  end
+
+  def full_reset
+    @mutex.synchronize do
+      perform reset, clear_screen, move_home, show_cursor
+      winsize = Tins::Terminal.winsize
+      @display     = Hackmac::Graph::Display.new(*winsize)
+      @old_display = Hackmac::Graph::Display.new(*winsize)
+      perform @display
+      @full_reset = false
+    end
+  end
+
+  def install_handlers
+    at_exit { full_reset }
+    trap(:SIGWINCH) do
+      @full_reset = true
+      perform reset, clear_screen, move_home, 'Zzz…'
+    end
+  end
+end
+
+require 'hackmac/graph/display'

data/lib/hackmac/version.rb

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

@@ -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.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-14 00:00:00.000000000 Z
+date: 2023-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -150,6 +150,8 @@ extra_rdoc_files:
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/github_source.rb
+- lib/hackmac/graph.rb
+- lib/hackmac/graph/display.rb
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/oc.rb
@@ -174,6 +176,8 @@ files:
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/github_source.rb
+- lib/hackmac/graph.rb
+- lib/hackmac/graph/display.rb
 - lib/hackmac/hackmac.yml
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb