hackmac 1.11.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08f36e8e85de7ebec84d0e2f98334ae3f644ef48411852c0299c6b439d19702
-  data.tar.gz: f2659f7f42f980013730bf9efc6830ee98c3a99d7d1f3a92da5d3505aabf7312
+  metadata.gz: 9b629f65f511430e410cca559e31001479cf0b999676decb945870c05ca8a875
+  data.tar.gz: f78ed8d52c1f7b7534987d374102c714c1dfaeea85b3f3d890360aa5d1b48cf0
 SHA512:
-  metadata.gz: 8fbb05e777bcf29ef66888ee69eb84bbdcc6f741400038e80b20eeff98d54bc6b41e8ab5360619535ac82f3ad58e06568cfb6fae879576c7d00a6e839a9f95f4
-  data.tar.gz: 143eda42ce454475b6d1f3e3a4a1e0fca43b220ddab12ad029d3a916261913ce4731da9c5ad48bde29de814b4a44a925764ead523b8b12c1d27f54638acf4056
+  metadata.gz: a54aa8c3755d1acf55c02fb19bacdc64f6b6768244ed2677daecf4069c851d17cf51ebe527efe73efd8255f949ddb43a8372feb83fc00e6e377af7e3e0e20361
+  data.tar.gz: e560214e2e604b9862a7ff2f9bb558646434fea464572db115ccf432c56fe7dcbfaf93b517680e40754a703a10e4a274b7b25f7a0dfa18a010add95d6ef98ac9

data/CHANGES.md

@@ -1,5 +1,29 @@
 # Changes
 
+## 2025-12-16 v2.0.1
+
+- Updated `value` proc in `Graphina::Graph.new` call to scale MHz values by
+  **1000000**
+- Updated dependency list to use proper version specification `~> 0.3` for
+  `graphina`
+
+## 2025-10-27 v2.0.0
+
+- Added `graphina` gem as a runtime dependency in `Rakefile`
+- Replace internal `Hackmac::Graph` implementation with dependency on `graphina` **v1.0.0**
+- Update `bin/gfxmon` to require `graphina` and use `Graphina::Graph` instead
+  of `Hackmac::Graph`
+- Migrate `Hackmac::Graph::Formatters` to `Graphina::Graph::Formatters`
+- Pass `true_coloring` option directly to `Graphina::Graph.new`
+- Remove `ensure graph&.stop` block as `graphina` handles cleanup internally
+- Update `lib/hackmac.rb` to require `graphina` and remove `hackmac/graph.rb`
+  require
+- Delete old `hackmac/graph.rb`, `hackmac/graph/display.rb`,
+  `hackmac/graph/display/cell.rb`, and `hackmac/graph/formatters.rb` files
+- Remove default value for option `s` in `gfxmon` script
+- Remove obsolete default value for sleep duration
+- Update `CHANGES.md` with formatted bullet points
+
 ## 2025-10-26 v1.11.0
 
 - Reduced minimum sleep duration in gfxmon from **1** second to **0.01**
@@ -37,18 +61,25 @@
 ## 2025-10-25 v1.10.0
 
 - Added `-C` command line option to specify secondary color for terminal
-      graphs, accepting color values between **0** - **255**
+  graphs, accepting color values between **0** - **255**
     - Updated `Hackmac::Graph.new` call to include `color_secondary:` parameter
     - Modified `usage` method to document the new `-C` option
     - Maintained backward compatibility with existing `-c` color option
-- Added support for `color_secondary`, `adjust_brightness`, and `adjust_brightness_percentage` parameters in `Hackmac::Graph#initialize`
-- Introduced `pick_secondary_color` method to calculate secondary colors based on brightness adjustments
+- Added support for `color_secondary`, `adjust_brightness`, and
+  `adjust_brightness_percentage` parameters in `Hackmac::Graph#initialize`
+- Introduced `pick_secondary_color` method to calculate secondary colors based
+  on brightness adjustments
 - Updated `draw_graph` to use secondary colors for improved visual contrast
-- Modified `Hackmac::Graph::Display#initialize` to accept `color` and `on_color` parameters
-- Configured `@display` and `@old_display` with default color settings in `Hackmac::Graph#reset_display`
-- Default `adjust_brightness` to **:lighten** with **15%** brightness adjustment
+- Modified `Hackmac::Graph::Display#initialize` to accept `color` and
+  `on_color` parameters
+- Configured `@display` and `@old_display` with default color settings in
+  `Hackmac::Graph#reset_display`
+- Default `adjust_brightness` to **:lighten** with **15%** brightness
+  adjustment
 - Default `foreground_color` to **:white** and `background_color` to **:black**
-- Added conditional check `if @plist` before extending with `Hashie::Extensions::DeepFind` to prevent `NoMethodError` when `@plist` is nil or undefined
+- Added conditional check `if @plist` before extending with
+  `Hashie::Extensions::DeepFind` to prevent `NoMethodError` when `@plist` is
+  nil or undefined
 
 ## 2025-10-25 v1.9.1
 
@@ -74,13 +105,17 @@
 - Added fractional pixel blending for visual appeal
 - Used `color.to_rgb_triple.to_hsl_triple.lighten(15)` for background shading
 - Added fallback handling for color conversion errors with `rescue color`
-- Supported terminal graphics with 2px vertical resolution using Unicode characters
+- Supported terminal graphics with 2px vertical resolution using Unicode
+  characters
 - Updated `@display.at(iy, x)` calls with color styling for graph rendering
 - Removed duplicate `pick_color` method
-- Added YARD documentation for `Hackmac::Config::DEFAULT`, `Hackmac::GithubSource::GITHUB_API_URL`, and `Hackmac::Graph::Display::ANSI` constants
+- Added YARD documentation for `Hackmac::Config::DEFAULT`,
+  `Hackmac::GithubSource::GITHUB_API_URL`, and `Hackmac::Graph::Display::ANSI`
+  constants
 - Updated module documentation with project description and features
 - Refactored Graph formatters into separate `Hackmac::Graph::Formatters` module
-- Refactored `Hackmac::Graph::Display::Cell` class into separate file `lib/hackmac/graph/display/cell.rb`
+- Refactored `Hackmac::Graph::Display::Cell` class into separate file
+  `lib/hackmac/graph/display/cell.rb`
 
 ## 2025-10-15 v1.8.8
 
@@ -116,10 +151,13 @@
     - Refactor version comparison styling into reusable `styler` lambda
     - Extract version formatting logic into separate `formatter` lambda
     - Update `Tabulo::Table` configuration to use the new lambda functions
-    - Improve version display logic to handle **nil** version comparisons gracefully
-    - Replace inline rescue logic with explicit nil checks for better error handling
+    - Improve version display logic to handle **nil** version comparisons
+      gracefully
+    - Replace inline rescue logic with explicit nil checks for better error
+      handling
 - Updated `static.yml` workflow to use array syntax for branch specification
-- Added `github_workflows` configuration to `Rakefile` for `static.yml` workflow
+- Added `github_workflows` configuration to `Rakefile` for `static.yml`
+  workflow
 
 ## 2025-10-15 v1.8.7
 

data/Rakefile

@@ -24,6 +24,7 @@ GemHadar do
 
   dependency  'tins',           '~>1.14'
   dependency  'term-ansicolor', '~>1.10'
+  dependency  'graphina',       '~>0.3'
   dependency  'complex_config'
   dependency  'amatch'
   dependency  'plist'

data/VERSION

@@ -1 +1 @@
-1.11.0
+2.0.1

data/bin/gfxmon

@@ -20,11 +20,10 @@
 #   gfxmon -m "Temperature(C)" # Show specific metric
 
 require 'term/ansicolor'
-Term::ANSIColor.true_coloring = ENV['COLORTERM'] =~ /\A(truecolor|24bit)\z/
-include Term::ANSIColor
 class String
   include Term::ANSIColor
 end
+require 'graphina'
 require 'hackmac'
 include Hackmac
 include Tins::GO
@@ -33,7 +32,6 @@ require 'search_ui'
 include SearchUI
 
 $opts = go 'c:C:m:n:f:b:r:jlh', defaults: {
-  ?s => true,
   ?n => 5,
   ?r => :double,
   ?f => :white,
@@ -95,7 +93,7 @@ end
 # @param ps [ Hash ] a hash containing string keys and numeric or string values to be displayed
 def list(ps)
   max = ps.keys.max_by(&:size)&.size&.to_i
-  include Hackmac::Graph::Formatters
+  include Graphina::Graph::Formatters
   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
@@ -178,17 +176,18 @@ end
 #
 # @return [ void ] Returns nothing but initiates the graphical display loop for system metrics
 #
-# @see Hackmac::Graph
+# @see Graphina::Graph
 # @see choose_metric
 # @see derive_formatter
 def display_graph
   if metric = choose_metric(ps)
-    sleep_duration = [ 0.01, ($opts[?n] || 10).to_f ].max
+    sleep_duration = [ 0.01, $opts[?n].to_f ].max
     format_value = derive_formatter(metric)
-    graph = Hackmac::Graph.new(
+    graph = Graphina::Graph.new(
       title:            metric,
       sleep:            sleep_duration,
-      value:            -> _ { ps[metric] || 0 },
+      value:            -> _ { (metric =~ /MHz/ ? 1_000_000 : 1) * (ps[metric] || 0) },
+      true_coloring:    ENV['COLORTERM'] =~ /\A(truecolor|24bit)\z/,
       color:            $opts[?c],
       color_secondary:  $opts[?C],
       foreground_color: $opts[?f],
@@ -198,8 +197,6 @@ def display_graph
     )
     graph.start
   end
-ensure 
-  graph&.stop
 end
 
 case

data/hackmac.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.11.0 ruby lib
+# stub: hackmac 2.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.11.0".freeze
+  s.version = "2.0.1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   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/graph/display/cell.rb".freeze, "lib/hackmac/graph/formatters.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 = ["CHANGES.md".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/graph/display/cell.rb".freeze, "lib/hackmac/graph/formatters.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.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/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 = ["CHANGES.md".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/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.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "Hackmac - Some useful tools for working with a Hackintosh".freeze, "--main".freeze, "README.md".freeze]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.10".freeze])
+  s.add_runtime_dependency(%q<graphina>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<amatch>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<plist>.freeze, [">= 0".freeze])

data/lib/hackmac/version.rb

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

data/lib/hackmac.rb

@@ -14,6 +14,7 @@ end
 require 'json'
 require 'pathname'
 require 'tins/xt'
+require 'graphina'
 require 'hackmac/version'
 require 'hackmac/plist'
 require 'hackmac/disks'
@@ -28,4 +29,3 @@ require 'hackmac/oc_upgrader'
 require 'hackmac/oc_validator'
 require 'hackmac/config'
 require 'hackmac/utils'
-require 'hackmac/graph'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Florian Frank
@@ -65,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: graphina
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: complex_config
   requirement: !ruby/object:Gem::Requirement
@@ -163,10 +177,6 @@ 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/graph/display/cell.rb
-- lib/hackmac/graph/formatters.rb
 - lib/hackmac/ioreg.rb
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb
@@ -194,10 +204,6 @@ 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/graph/display/cell.rb
-- lib/hackmac/graph/formatters.rb
 - lib/hackmac/hackmac.yml
 - lib/hackmac/ioreg.rb
 - lib/hackmac/kext.rb

data/lib/hackmac/graph/display/cell.rb

@@ -1,48 +0,0 @@
-class Hackmac::Graph::Display
-  # A cell representation for terminal display with character, color,
-  # background color, and styling attributes
-  #
-  # The Cell class encapsulates the properties of a single character cell in
-  # a terminal display, including its visual characteristics such as the
-  # displayed character, text color, background color, and styling
-  # attributes. It provides methods to compare cells and convert them to
-  # their string representation with ANSI escape codes for terminal
-  # rendering.
-  class Cell < Struct.new(:char, :color, :on_color, :styles)
-    # The == method compares two Cell objects for equality by their internal
-    # array representation
-    #
-    # This method checks if the current Cell instance is equal to another
-    # Cell instance by comparing their underlying array representations
-    # returned by to_a
-    #
-    # @param other [ Hackmac::Graph::Display::Cell ] the other Cell object to
-    #   compare against
-    #
-    # @return [ Boolean ] true if both cells have identical char, color,
-    #   on_color, and styles values, false otherwise
-    def ==(other)
-      to_a == other.to_a
-    end
-
-    # The to_s method converts a Cell object into its string representation
-    # with ANSI styling
-    #
-    # This method constructs a formatted string that includes the cell's
-    # character along with its color, background color, and text style
-    # attributes using ANSI escape sequences. The resulting string is
-    # suitable for display in terminal environments that support ANSI colors.
-    #
-    # @return [ String ] a formatted string containing the cell's visual
-    #   representation with appropriate ANSI styling codes for terminal
-    #   rendering
-    def to_s
-      result = +''
-      result << ANSI.color(color)
-      result << ANSI.on_color(on_color)
-      styles.each { |s| result << ANSI.send(s) }
-      result << char
-      result << ANSI.reset
-    end
-  end
-end