hackmac 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13c244074302c8a7655084798808c00a721e789eec6fb10b45d7c651ecdc871
-  data.tar.gz: 2f12fd32434020dfe86c060d84d611ff98c4ca3c9ef1998093fed8d03156295e
+  metadata.gz: 770a49155c7dd33375a43996b62f7e594b6d18f0e9fba87b8bfd6124bcc98d5f
+  data.tar.gz: 9c4d786f6df212bc390cfe64caae581da4833dfe161c48fcee0aeccf435ffd5f
 SHA512:
-  metadata.gz: b51cb0440e59972003f5c9ea05b7815cc84e87b1001cdfbb220ea0ed963ce74d59d99fc47f9371481cbec5778455747e09085be7d9f5c0e2b4530ebcdc661070
-  data.tar.gz: 0a326f6be72410039291e6cf679313a7a906211820a95d294efa22e7e02f1ff602f7c6c696dd89278dbd18cc20b2eb0488c502cce7fa44f24c89dfe07854e766
+  metadata.gz: 4e5ab0f0d08aa06c4854208a53961b11d7f8ef8d5478168da7799d4b682c3ec2a785816bd20744f5d0d6f3ef6f34071882dfea6a4ac521558c6d4f94db20c4c4
+  data.tar.gz: a62c1e3e3ebbd650a5904cbcd7d4f54d248de162415aedbe8fdc36ec66b874525f98b5af5b841638c0c0728176d27352496ee0e8f57f847c84e6ff40342f9782

data/Rakefile

@@ -18,6 +18,8 @@ GemHadar do
 
   dependency  'tins',           '~>1.14'
   dependency  'term-ansicolor', '~>1.3'
+  dependency  'complex_config'
   dependency  'amatch'
   dependency  'plist'
+  dependency  'tabulo'
 end

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/bin/efi

@@ -6,6 +6,7 @@ require 'term/ansicolor'
 class String
   include Term::ANSIColor
 end
+require 'tabulo'
 
 def x(cmd, verbose: true)
   prompt = cmd =~ /\A\s*sudo/ ? ?# : ?$
@@ -31,27 +32,25 @@ def clone(from:, to:)
   end
   x %{sudo mkdir -v "/Volumes/#{from}"}
   x %{sudo mkdir -v "/Volumes/#{to}"}
-  begin
-    x %{sudo diskutil mount -mountPoint "/Volumes/#{from}" "#{from}"}
-    x %{sudo diskutil mount -mountPoint "/Volumes/#{to}" "#{to}"}
-    x %{rsync -nav --exclude ".*" --delete "/Volumes/#{from}/" "/Volumes/#{to}/"}
-    print "This will be copied/deleted. Really do it? (y/n) ".bold.yellow
-    if gets !~ /\Ay/i
-      puts " *** Interrupted.".bold.yellow
-      exit 1
-    end
-    x %{rsync -av --exclude ".*" --delete "/Volumes/#{from}/" "/Volumes/#{to}/"}
-  ensure
-    x %{sudo diskutil unmount "#{from}"}
-    x %{sudo diskutil unmount "#{to}"}
+  x %{sudo diskutil mount -mountPoint "/Volumes/#{from}" "#{from}"}
+  x %{sudo diskutil mount -mountPoint "/Volumes/#{to}" "#{to}"}
+  x %{rsync -nav --exclude ".*" --delete "/Volumes/#{from}/" "/Volumes/#{to}/"}
+  print "This will be copied/deleted. Really do it? (y/n) ".bold.yellow
+  if gets !~ /\Ay/i
+    puts " *** Interrupted.".bold.yellow
+    exit 1
   end
+  x %{rsync -av --exclude ".*" --delete "/Volumes/#{from}/" "/Volumes/#{to}/"}
 end
 
-def dev
-  value = x(%{bdmesg}, verbose: false).lines.
-    find { |l| l =~ /SelfDevicePath=(.*)\r/ and break $1 }
-  uuid  = value.split('\\').last[/(?:<?GPT,)([\h-]+)/, 1] or exit 1
-  x(%{partutil --search-uuid #{uuid}}).chomp
+def boot_dev
+  unless @boot_dev
+    value = x(%{bdmesg}, verbose: false).lines.
+      find { |l| l =~ /SelfDevicePath=(.*)\r/ and break $1 }
+    uuid  = value.split('\\').last[/(?:<?GPT,)([\h-]+)/, 1] or exit 1
+    @boot_dev = x(%{partutil --search-uuid #{uuid}}).chomp
+  end
+  @boot_dev
 end
 
 def usage
@@ -85,18 +84,37 @@ def usage
 
         argument PATH to the kext
 
-      kexts       list kexts in L/E and compare versions with clover kexts
+      kexts       list kexts versions by clover
 
         argument DEVICE (defaults to #{default_dev})
 
         The EFI partion on DEVICE is used to find the clover kexts in
         subdirectory /Other.
 
-      boot        shows boot disk information (which EFI partition was used)
+      list        shows boot disk information (which EFI partition was used)
+
+  end
+end
+
+$config = Hackmac::Config.load
 
+def device_name(mdev)
+  case mdev
+  when 'boot'
+    boot_dev
+  when nil
+    $config.devices.main.name
+  else
+    if n = $config.devices[mdev]&.name
+      n
+    else
+      mdev
+    end
   end
 end
 
+bold_head = -> h { h.sub(/\A[a-z]/) { $&.upcase }.bold }
+
 case command = ARGV.shift
 when 'help', nil
   usage
@@ -104,75 +122,60 @@ when 'mount'
   #if File.exist?('/Volumes/EFI')
   #  raise "/Volumes/EFI already exists => Sort this out first."
   #end
-  mdev = ARGV.shift || dev
+  mdev = device_name(ARGV.shift)
   x %{sudo diskutil mount "#{mdev}"}
   # TODO symlink to /Volumes/mdev, mdev should be foo['MountPoint'] from efi boot
 when /\Aun?mount\z/
-  mdev = ARGV.shift || dev
+  mdev = device_name(ARGV.shift)
   x %{sudo diskutil unmount "#{mdev}"}
   # TODO remove /Volumes/mdev if it is a symlink
 when 'clone'
   from = ARGV.shift or fail "need from argument"
-  from == 'boot' and from = dev
-  to   = ARGV.shift or fail "need to argument"
-  to == 'boot' and to = dev
+  from = device_name(from)
+  to = ARGV.shift or fail "need to argument"
+  to = device_name(to)
   from != to or fail "cloning only allowed from one partition to another"
   clone from: from, to: to
 when 'kexts'
-  begin
-    mdev = ARGV.shift || 'EFI'
-    x %{sudo diskutil mount "#{mdev}"}
-    on_efi = Dir["/Volumes/#{mdev}/EFI/CLOVER/kexts/Other/*.kext"].map { |path|
-      Kext.new(path: path)
-    }.sort_by(&:name)
-    on_le = Dir['/Library/Extensions/*.kext'].map { |path|
-      Kext.new(path: path)
-    }.sort_by(&:name)
-    puts 'EFI'.yellow.bold + " (#{mdev})".bold
-    on_efi.each do |kext|
-      puts kext.compare_to(on_le)
-    end
-    puts 'L/E'.yellow.bold
-    on_le.each do |kext|
-      puts kext.compare_to(on_efi)
-    end
-  ensure
-    x %{sudo diskutil umount "#{mdev}"}
-  end
+  mdev = device_name(ARGV.shift)
+  x %{sudo diskutil mount "#{mdev}"}
+  on_efi = Dir["/Volumes/#{mdev}/#{$config.kext.efi_path}/*.kext"].map { |path|
+    Kext.new(path: path, config: $config)
+  }.sort_by(&:name)
+  puts 'EFI'.yellow.bold + " (#{mdev})".bold
+  puts Tabulo::Table.new(on_efi, align_header: :left, border: :modern) { |t|
+    t.add_column(:name, header_styler: bold_head)
+    t.add_column(:itself, header: 'Version/Remote',
+                 styler: -> v, s { v.version < v.remote_version ? s.red : s.green rescue s.yellow },
+                 formatter: -> e { "%s %s %s" % [ e.version, ({ 0 => ?=, -1 => ?<, 1 => ?> }[e.version <=> e.remote_version] rescue nil), e.remote_version ] },
+                 header_styler: bold_head)
+  }.pack
 when 'kext'
   path = ARGV.shift or fail 'need kext dir'
   puts Kext.new(path: path)
-when 'boot'
+when 'list'
   disks = Disks.new
   efis = []
   disks.as_hash['AllDisksAndPartitions'].each_with_object([]) { |d, ps|
     uuids = Array(d['Partitions']&.map { |p| p['DiskUUID'] }&.compact)
     efis.concat uuids.
       map { |uuid| DiskInfo.new(disk: uuid) }.
-      select { |di| di.as_hash['FilesystemType'] == 'msdos' }
+      select { |di| di.FilesystemType == 'msdos' }
   }
-  efis.map!(&:as_hash)
   efis.each do |e|
-    e['Booted'] = e['DeviceIdentifier'] == dev
-    e['Volumes'] =
-      ContainerDisk.new(disk: e['ParentWholeDisk'], limiter: 'internal').
-      as_hash['VolumesFromDisks']
+    e.Booted = e.DeviceIdentifier == boot_dev
+    e.Volumes =
+      ContainerDisk.new(disk: e.ParentWholeDisk, limiter: 'internal').VolumesFromDisks
   end
-  efis.map!(&:sort).map!(&:to_h)
-  puts "Bootdisk information".bold.yellow, JSON.pretty_generate(
-    efis.map { |e| e.subhash(
-        'Bootable',
-        'Booted',
-        'DeviceIdentifier',
-        'DiskUUID',
-        'IORegistryEntryName',
-        'MountPoint',
-        'ParentWholeDisk',
-        'VolumeName',
-        'Volumes',
-      )
-    }
-  ).bold
+  puts Tabulo::Table.new(efis, align_header: :left, border: :modern) { |t|
+    t.add_column(:Booted, styler: -> v, _ { v == ?☑ ? v.green : v.red }, header_styler: bold_head) { |e| e.Booted ? ?☑ : ?☐ }
+    t.add_column(:VolumeName, header_styler: bold_head)
+    t.add_column(:DeviceIdentifier, header_styler: bold_head)
+    t.add_column(:ParentWholeDisk, header_styler: bold_head)
+    t.add_column(:DiskUUID, header_styler: bold_head)
+    t.add_column(:Volumes, header_styler: bold_head) { |e| e.Volumes * ?, }
+    t.add_column(:MountPoint, styler: -> v, _ { v.empty? ? v : v.green }, header_styler: bold_head)
+  }.pack
 else
   fail "don't know how to #{command}"
 end

data/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.0.4 ruby lib
+# stub: hackmac 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.0.4"
+  s.version = "0.1.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 = "2020-01-15"
+  s.date = "2020-01-28"
   s.description = "This ruby gem provides Some useful tools for working with a Hackintosh.".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["gfxmon".freeze, "efi".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.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, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.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, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.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.1.2".freeze
@@ -27,13 +27,17 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
     s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
+    s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<amatch>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<plist>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<tabulo>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<complex_config>.freeze, [">= 0"])
     s.add_dependency(%q<amatch>.freeze, [">= 0"])
     s.add_dependency(%q<plist>.freeze, [">= 0"])
+    s.add_dependency(%q<tabulo>.freeze, [">= 0"])
   end
 end

data/lib/hackmac/config.rb

@@ -0,0 +1,49 @@
+require 'complex_config/shortcuts'
+require 'tins/xt/secure_write'
+require 'fileutils'
+
+module Hackmac
+  module Config
+    extend FileUtils
+    extend ComplexConfig::Provider::Shortcuts
+
+    DEFAULT = <<~end
+      ---
+      devices:
+        boot:
+          name: EFI
+        #backup:
+        #  name: BACKUP_EFI
+      github:
+        user: null
+        access_token: null
+      kext:
+        efi_path: EFI/CLOVER/kexts/Other
+        sources:
+          AppleALC:
+            github: 'acidanthera/AppleALC'
+          IntelMausi:
+            github: 'acidanthera/IntelMausi'
+          Lilu:
+            github: 'acidanthera/Lilu'
+          USBInjectAll:
+            github: 'Sniki/OS-X-USB-Inject-All'
+          VirtualSMC:
+            github: 'acidanthera/VirtualSMC'
+          WhateverGreen:
+            github: 'acidanthera/WhateverGreen'
+
+    end
+
+    def self.load
+      path = File.expand_path('~/config')
+      mkdir_p path
+      ComplexConfig::Provider.config_dir = path
+      config_path = File.join(path, 'hackmac.yml')
+      unless File.exist?(config_path)
+        File.secure_write(config_path, DEFAULT)
+      end
+      complex_config.hackmac
+    end
+  end
+end

data/lib/hackmac/kext.rb

@@ -1,13 +1,16 @@
 require 'hackmac/plist'
 require 'pathname'
+require 'tins/string_version'
 
 module Hackmac
   class Kext
     include Hackmac::Plist
+    include Tins::StringVersion
 
-    def initialize(path:)
-      @path = Pathname.new(path) + 'Contents/Info.plist'
-      @plist = File.open(@path, encoding: 'UTF-8') { |f| ::Plist.parse_xml(f) }
+    def initialize(path:, config: nil)
+      @path   = Pathname.new(path) + 'Contents/Info.plist'
+      @plist  = File.open(@path, encoding: 'UTF-8') { |f| ::Plist.parse_xml(f) }
+      @config = config
     end
 
     def identifier
@@ -19,31 +22,38 @@ module Hackmac
     end
 
     def version
-      as_hash['CFBundleShortVersionString']
+      unless @version
+        if version = as_hash['CFBundleShortVersionString']
+          begin
+            @version = Version.new(version)
+          rescue ArgumentError
+            @version = version
+          end
+        end
+      end
+      @version
     end
 
-    def inspect
-      "#<#{self.class}: #{to_s}>"
+    def remote_kext
+      if @config
+        if github = @config.kext.sources[name]&.github
+          auth = [ @config.github.user, @config.github.access_token ].compact
+          auth.empty? and auth = nil
+          @remote_kext = Hackmac::KextSource.new(github, auth: auth)
+        end
+      end
     end
 
-    def to_s
-      "#{name} #{version}"
+    def remote_version
+      remote_kext&.version
     end
 
-    def find_matches(others)
-      candidates = others.select { |o| o.name == name }
-      candidates.group_by { |c| c.version == version }
+    def inspect
+      "#<#{self.class}: #{to_s}>"
     end
 
-    def compare_to(others)
-      matches = find_matches others
-      if other = matches[false]&.first
-        "#{to_s.red} ⚡#{other.to_s.red}"
-      elsif other = matches[true]&.first
-        "#{to_s.green} = #{other.to_s.green}"
-      else
-        "#{to_s.yellow}"
-      end
+    def to_s
+      "#{name} #{version}"
     end
   end
 end

data/lib/hackmac/kext_source.rb

@@ -0,0 +1,48 @@
+require 'open-uri'
+require 'json'
+require 'tins/string_version'
+
+module Hackmac
+  class KextSource
+    GITHUB_API_URL = 'https://api.github.com/repos/%s/releases'
+
+    include Tins::StringVersion
+
+    def initialize(github, auth: nil)
+      account, repo = github.split(?/)
+      @name = repo
+      releases = URI.open(
+        GITHUB_API_URL % github,
+        http_basic_authentication: auth) { |o|
+        JSON.parse(o.read, object_class: JSON::GenericObject)
+      }
+      if version = releases.map { |r|
+          next unless r.tag_name.include?(?.)
+          version = r.tag_name.delete '^.0-9'
+          begin
+            Version.new(version)
+          rescue ArgumentError
+          end
+        }.compact.max
+      then
+        @version = version
+      end
+    end
+
+    attr_reader :name
+
+    attr_reader :version
+
+    def inspect
+      "#<#{self.class}: #{to_s}>"
+    end
+
+    def to_s
+      "#{name} #{version}"
+    end
+
+    def to_s
+      "#{name} #{version}"
+    end
+  end
+end

data/lib/hackmac/plist.rb

@@ -14,5 +14,14 @@ module Hackmac
     def to_json(*a)
       as_hash.to_json(*a)
     end
+
+    def method_missing(name, *a)
+      n = name.to_s
+      if n =~ /(.+)=\z/
+        @plist[$1] = a.first
+      elsif @plist.key?(n)
+        @plist[n]
+      end
+    end
   end
 end

data/lib/hackmac/version.rb

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

@@ -8,3 +8,5 @@ require 'hackmac/plist'
 require 'hackmac/search_ui'
 require 'hackmac/disks'
 require 'hackmac/kext'
+require 'hackmac/kext_source'
+require 'hackmac/config'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: complex_config
+  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'
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tabulo
+  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:
@@ -89,8 +117,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - lib/hackmac.rb
+- lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/kext.rb
+- lib/hackmac/kext_source.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/search_ui.rb
 - lib/hackmac/version.rb
@@ -104,8 +134,10 @@ files:
 - bin/gfxmon
 - hackmac.gemspec
 - lib/hackmac.rb
+- lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/kext.rb
+- lib/hackmac/kext_source.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/search_ui.rb
 - lib/hackmac/version.rb