hackmac 1.4.2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6edb17b3e73dbb6bc5112bfd85a8bb50c32c9be7e860cc97d11f98bb6a2e9d04
-  data.tar.gz: 120072142fb649a5d2cd933e27c0f9b0aeaa6c0d68721ed392e1b39478ae66dd
+  metadata.gz: 7d2e09f61b472bf19fbb85142a92aa175348fb0aedce25c79a9cbe0654f66aa7
+  data.tar.gz: 3e20f96c16ffb79f894d12059d9fd1dcbf59e7793064f7401e5b706cb17f88b1
 SHA512:
-  metadata.gz: 5e78be62b57bdfe29961dd9ce3d334cfa7d6e1abdad8b30be9ecc9c2cd265d5543f992e0eaaf234b490e681e63c5b3f93252cd3c924c43ca3df1beb21df7d814
-  data.tar.gz: 219d7eaa6be7ad7776bc13417d5b6314f4b7cfaa99df876b84c33b2960cc60a331577abed1e6d7825feb4209e549de5eacf64c40fbe8b9535da40019f08a8d28
+  metadata.gz: ae473329bba9f586367c9cb47ec3edda9a1487d75c15083342aa12885d8d271f3b7d08431143c926af39f6458ea743a3598022b3df62eee406020fa97e5ea8d7
+  data.tar.gz: 65964bdb942e2f9da625e1914a98d172ba152678c2618845fd664a179554c5874f0d166ad04e4605e659bcab7717ed04727671b7f675d21a764f8c6cdacfbf9d

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.4.2
+1.5.1

data/bin/gfxmon

@@ -33,16 +33,7 @@ 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)

data/hackmac.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.4.2 ruby lib
+# stub: hackmac 1.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.4.2"
+  s.version = "1.5.1"
 
   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/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, "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/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/display.rb

@@ -8,13 +8,12 @@ class Hackmac::Graph
       end
 
       def to_s
-        ANSI.color(color) {
-          ANSI.on_color(on_color) {
-            styles.inject(char) { |c, s|
-              ANSI.send(s) { c }
-            }
-          }
-        }
+        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
 

data/lib/hackmac/graph.rb

@@ -64,13 +64,14 @@ class Hackmac::Graph
     full_reset
     color       = pick_color
     color_light = color.to_rgb_triple.to_hsl_triple.lighten(15) rescue color
-    i           = 0
+    @counter    = -1
     @continue = true
     while @continue
+      @start = Time.now
       @full_reset and full_reset
       perform hide_cursor
 
-      @data << @value.(i)
+      @data << @value.(@counter += 1)
       @data = data.last(columns)
 
       y_width = (data.max - data.min).to_f
@@ -103,6 +104,7 @@ class Hackmac::Graph
       perform_display_diff
       sleep_now
     end
+  rescue Interrupt
   ensure
     stop
   end
@@ -154,7 +156,12 @@ class Hackmac::Graph
   end
 
   def sleep_now
-    sleep @sleep
+    duration = if @start
+                 [ @sleep - (Time.now - @start).to_f, 0 ].max
+               else
+                 @sleep
+               end
+    sleep duration
   end
 
   def perform_display_diff
@@ -162,7 +169,16 @@ class Hackmac::Graph
       unless @old_display && @old_display.dimensions == @display.dimensions
         @old_display = @display.dup.clear
       end
-      perform @display - @old_display
+      diff = @display - @old_display
+      if ENV['DEBUG_BYTESIZE']
+        unless @last
+          STDERR.puts %w[ size duration ] * ?\t
+        else
+          STDERR.puts [ diff.size, (Time.now - @last).to_f ] * ?\t
+        end
+        @last = Time.now
+      end
+      perform diff
       @display, @old_display = @old_display.clear, @display
       perform move_to(lines, columns)
     end

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.4.2'
+  VERSION         = '1.5.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

@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.1
 platform: ruby
 authors:
 - Florian Frank
@@ -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
@@ -179,6 +194,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