hackmac 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59f8d61d5c86ebfc3dc59e41fba9c82bde1ee0bb2aa95396ff6c878165ff37c6
-  data.tar.gz: 95932d40323add3994a44450337c9209be21f8378509c60ec512151e8a6ada31
+  metadata.gz: 52eecabaaacf4b30bdfd2c2d49ca2521d45dd81da1c75f1b3a02af4b94a0d01c
+  data.tar.gz: d84925f226ff82966a7a42f21143ee273715f013ed7907ab3f28273797b241f6
 SHA512:
-  metadata.gz: 8af76a612daf738c8d4fb8423f8570e053d5db96696d3627d1413f391d8e1a6028e0331e915860e96742c6abe88295df0b41b459aa7f2621e4cb4b12f3f91eda
-  data.tar.gz: e4ac35e14b25e5c111eb4fe7d4bb7a25edd602afb667beb94e3d8302e2974bdbf229776e2f418e0a27c5f1089abfa844c3398b30df376f08b7243424c7aa73f8
+  metadata.gz: 0b13786a08e87c4f162d3ce6090115c286f3feaa476aedf354d94e6a74f4e4fb225769d4fb2a3c304eec4fa77423b96e19b5f401ee0631604e4fda816d1c51b8
+  data.tar.gz: b6bb795279266902645e82382f253c050d2eb0d74c0f2c3ad91f7cf02334f28767727baa86b49d99d9c46081f987c3f12034330b87a7e6a4dd6a5581ef1f57fd

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.1

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
@@ -47,14 +47,14 @@ end
 
 def list(ps)
   max = ps.keys.max_by(&:size)&.size&.to_i
-  graph = Hackmac::Graph.new(title: '')
+  include Hackmac::Graph::Formatters
   puts ps.map { |n, v|
-    ("%-#{max}s" % n) + " " + ("%s" % graph.send(derive_formatter(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(

data/hackmac.gemspec

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

@@ -4,7 +4,39 @@ require 'tins'
 class Hackmac::Graph
   include Term::ANSIColor
 
-  def initialize(title:, value: -> i { 0 }, format_value: nil, sleep: nil, color: nil)
+  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
@@ -12,13 +44,12 @@ class Hackmac::Graph
     @continue     = false
     @data         = []
     @color        = color
+    @mutex        = Mutex.new
   end
 
   def start
     install_handlers
     full_reset
-    perform hide_cursor
-    @continue = true
     start_loop
   end
 
@@ -34,42 +65,45 @@ class Hackmac::Graph
     color       = pick_color
     color_light = color.to_rgb_triple.to_hsl_triple.lighten(15) rescue color
     i           = 0
+    @continue = true
     while @continue
-      @lines, @cols = winsize
+      @full_reset and full_reset
+      perform hide_cursor
 
       @data << @value.(i)
-      @data = data.last(cols)
+      @data = data.last(columns)
 
       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
+        @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
 
-      perform clear_screen
+      @display.reset
       data.each_with_index do |value, x|
-        x = x + cols - data.size + 1
+        x = x + columns - 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){' '} }
+          @display.at(iy, x).on_color(
+            y == iy ? color : color_light
+          ).write(' ')
         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 }
-      )
+      @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))
 
-      maybe_sleep
+      perform_display_diff
+      sleep_now
     end
-    full_reset
-  rescue *[ Interrupt, defined?(IRB::Abort) && IRB::Abort ].compact
+  ensure
     stop
   end
 
@@ -77,18 +111,18 @@ class Hackmac::Graph
     print *a
   end
 
-  attr_reader :cols
+  def columns
+    @display.columns
+  end
 
-  attr_reader :lines
+  def lines
+    @display.lines
+  end
 
   attr_reader :data
 
-  def as_title(text)
-    move_to(lines, (cols - text.size) / 2) { bold{text} }
-  end
-
   def sleep_duration
-    @sleep ? "#{@sleep}s" : "once"
+    "#{@sleep}s"
   end
 
   def format_value(value)
@@ -102,26 +136,6 @@ class Hackmac::Graph
     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
@@ -139,14 +153,22 @@ class Hackmac::Graph
     ]
   end
 
-  def maybe_sleep
-    if @sleep
-      sleep @sleep
-    else
-      @continue = false
+  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
@@ -157,20 +179,23 @@ class Hackmac::Graph
   end
 
   def full_reset
-    perform reset, clear_screen, move_home, show_cursor
-  end
-
-  def winsize
-    Tins::Terminal.winsize
+    @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) {
-      lines, cols = winsize
-      perform clear_screen,
-        move_to(lines / 2, (cols - "Zzz…".size) / 2) { "Zzz…".italic }
-    }
+    trap(:SIGWINCH) do
+      @full_reset = true
+      perform reset, clear_screen, move_home, 'Zzz…'
+    end
   end
 end
+
+require 'hackmac/graph/display'

data/lib/hackmac/utils.rb

@@ -13,17 +13,16 @@ module Hackmac
 
     def x(cmd, verbose: true)
       prompt = cmd =~ /\A\s*sudo/ ? ?# : ?$
+      print "#{prompt} #{cmd}".color(27)
+      puts verbose ? "" : " >/dev/null".yellow
       output = `#{cmd} 2>&1`
       if $?.success?
-        print "#{prompt} #{cmd}".green
-        puts verbose ? "" : " >/dev/null".yellow
+        puts "✅ Command succeded!".green
       else
-        print "#{prompt} #{cmd}".red
-        puts verbose ? "" : " >/dev/null".yellow
-        STDERR.puts "command #{cmd.inspect} failed with exit status #{$?.exitstatus}".on_red.white
+        puts "⚠️  Command #{cmd.inspect} failed with exit status #{$?.exitstatus}".on_red.white
       end
       if verbose
-        print output.italic
+        puts output.italic
       end
       output
     end

data/lib/hackmac/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -151,6 +151,7 @@ extra_rdoc_files:
 - 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
@@ -176,6 +177,7 @@ files:
 - 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