hackmac 0.8.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb9a09c4a8c36db0e881489bb115887d6f9d3141c16799b957417f507c4b70fa
-  data.tar.gz: 67df1404193ff6557bab90512f3b732a5ca7f90d10020e3a856ad492d17fcd15
+  metadata.gz: 923c3844c934086f3e46c41d695766a8198515d02f75894afa90912b87428b86
+  data.tar.gz: c022882b0fdfa41fba34d6a6e39031cfb6df6fe0107ae31232d3e0c91ae9eb33
 SHA512:
-  metadata.gz: 44a4fd40a4a3c5aeef28c438d6bb4fefb75e3f2368a8c7df9059ed4546eaa126db131be345b71e19d70df2a42aa1146e3d4d0ea8a0b7f799d0ee395568ce5e98
-  data.tar.gz: 8f9fba1a5922e5c199771165be59ece57d3872ed45e767ec9c61b638e41956c858a0627c8dc45f9b81a68c2eb5df7c8e7eb94c9cfd64b31df96c6dc7df794840
+  metadata.gz: 755e5d0e38d23b72951b2d17a44d320ae7423de56b2506dc85bef8409df8530000bd6f11d18a7005cd2da492cd3c6c7057c17ed746dfa1b035645a4a2e20c80c
+  data.tar.gz: 7346a101b0798408a94445dd7f1f72d28b904b1b677f4077f819966b28f77f9004bc3271eab6e27286a67ce51c9b681372d2aca4703952d841f093c5f00d1571

data/VERSION

@@ -1 +1 @@
-0.8.3
+1.0.0

data/bin/efi

@@ -18,18 +18,8 @@ def clone(from:, to:)
   x %{rsync -av --exclude ".*" --delete "/Volumes/#{from}/" "/Volumes/#{to}/"}
 end
 
-def boot_dev
-  unless @boot_dev
-    value = x(%{bdmesg}, verbose: false).lines.
-      find { |l| l =~ /SelfDevicePath=(.*)\r?\n/ 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
-  default_dev = boot_dev
+  default_dev = device_name('main')
 
   puts <<~end
 
@@ -72,6 +62,12 @@ def usage
         The EFI partion on DEVICE is used to find the clover kexts in
         subdirectory /Other.
 
+      oc          shows currently booted OpenCore version
+
+      oc_upgrade EFI partition
+
+                 Upgrade OpenCore on this partition to newest version
+
       diff        EFI partition
 
         argument DEVICE (defaults to #{default_dev})
@@ -86,8 +82,6 @@ def usage
         Commits changes with git, passes arguments to commit command
         after "--".
 
-      list        shows boot disk information (which EFI partition was used)
-
   end
 end
 
@@ -95,8 +89,6 @@ $config = Hackmac::Config.load
 
 def device_name(mdev)
   case mdev
-  when 'boot'
-    boot_dev
   when nil
     $config.devices.main.name
   else
@@ -187,40 +179,14 @@ when 'kext_upgrade'
   path = Pathname.new(path).expand_path.to_s
   force = ARGV.shift == 'force'
   Hackmac::KextUpgrader.new(path: path, config: $config, force: force).perform
-when 'list'
-  disks = Disks.new
-  efis = []
-  disks.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.FilesystemType == 'msdos' }
-  }
-  efis.each do |e|
-    e.Booted = e.DeviceIdentifier == boot_dev
-    e.Volumes =
-      ContainerDisk.new(disk: e.ParentWholeDisk, limiter: 'internal').VolumesFromDisks
-  end
-  aliases = $config.devices.to_h.each_with_object({}) do |(dk,dv),h|
-    h[dv[:name]] = dk
-  end
-  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(:Alias, header_styler: bold_head) { |e| aliases[e.VolumeName] }
-    t.add_column(:DeviceIdentifier, header_styler: bold_head)
-    t.add_column(:ParentWholeDisk, 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
+when 'oc'
+  x %{nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:opencore-version}
+when 'oc_remote'
+  puts OC.new(config: $config)
+when 'oc_upgrade'
+  mdev = device_name(ARGV.shift)
+  ocu = OCUpgrader.new(mdev: mdev, config: $config)
+  ocu.perform
 else
   fail "don't know how to #{command}"
 end

data/hackmac.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.8.3 ruby lib
+# stub: hackmac 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.8.3"
+  s.version = "1.0.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 = "2021-03-05"
+  s.date = "2022-05-25"
   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, "usb".freeze, "efi".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_download.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/plist.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/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_download.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".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/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/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.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.1.4".freeze
+  s.rubygems_version = "3.3.13".freeze
   s.summary = "Some useful tools for working with a Hackintosh".freeze
 
   if s.respond_to? :specification_version then
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
     s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<tabulo>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
     s.add_dependency(%q<byebug>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])

data/lib/hackmac/asset_tools.rb

@@ -0,0 +1,27 @@
+module Hackmac
+  module AssetTools
+    private
+
+    def isolate
+      Dir.mktmpdir do |dir|
+        cd dir do
+          yield dir
+        end
+      end
+    end
+
+    def decompress(name)
+      print "Decompressing #{name.inspect}…"
+      case name
+      when /\.zip\z/i
+        system "unzip #{name.inspect}" or fail "Could not unzip #{name.inspect}"
+      when /\.tar\.gz\z/i
+        system "tar xfz #{name.inspect}" or fail "Could not tar xfz #{name.inspect}"
+      else
+        fail "Cannot decompress #{name.inspect}"
+      end
+      puts "done!"
+    end
+
+  end
+end

data/lib/hackmac/config.rb

@@ -1,6 +1,7 @@
 require 'complex_config/shortcuts'
 require 'tins/xt/secure_write'
 require 'fileutils'
+require 'pathname'
 
 module Hackmac
   module Config
@@ -46,15 +47,15 @@ module Hackmac
             github: 'acidanthera/WhateverGreen'
     end
 
-    def self.load
-      path = File.expand_path('~/.config/hackmac')
-      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)
+    def self.load(path: ENV.fetch('CONFIG_PATH', '~/.config/hackmac/hackmac.yml'))
+      path = Pathname.new(path).expand_path
+      mkdir_p path.dirname
+      ComplexConfig::Provider.config_dir = path.dirname
+      unless path.exist?
+        File.secure_write(path, DEFAULT)
       end
-      complex_config.hackmac
+      puts "Loading config from #{path.to_s.inspect}."
+      ComplexConfig::Provider[path.basename.to_s.sub(/\..*?\z/, '')]
     end
   end
 end

data/lib/hackmac/{kext_source.rb → github_source.rb}

@@ -3,7 +3,7 @@ require 'json'
 require 'tins/string_version'
 
 module Hackmac
-  class KextSource
+  class GithubSource
     GITHUB_API_URL = 'https://api.github.com/repos/%s/releases'
 
     include Tins::StringVersion

data/lib/hackmac/kext.rb

@@ -51,9 +51,9 @@ module Hackmac
             when false      then 'RELEASE'
             when nil        then nil
             end
-          @remote_kext = Hackmac::KextSource.new(github, auth: auth, suffix: suffix)
+          @remote_kext = Hackmac::GithubSource.new(github, auth: auth, suffix: suffix)
         when download = source&.download
-          @remote_kext = Hackmac::KextDownload.new(download.name, download.version, download.url)
+          @remote_kext = Hackmac::URLDownload.new(download.name, download.version, download.url)
         end
       end
     end

data/lib/hackmac/kext_upgrader.rb

@@ -5,34 +5,12 @@ require 'pathname'
 module Hackmac
   class KextUpgrader
     include FileUtils
+    include Hackmac::AssetTools
 
     def initialize(path:, config:, force: false)
       @path, @config, @force = path, config, force
     end
 
-    private
-
-    def isolate
-      Dir.mktmpdir do |dir|
-        cd dir do
-          yield dir
-        end
-      end
-    end
-
-    def decompress(name)
-      print "Decompressing #{name.inspect}…"
-      case name
-      when /\.zip\z/i
-        system "unzip #{name.inspect}" or fail "Could not unzip #{name.inspect}"
-      when /\.tar\.gz\z/i
-        system "tar xfz #{name.inspect}" or fail "Could not tar xfz #{name.inspect}"
-      else
-        fail "Cannot decompress #{name.inspect}"
-      end
-      puts "done!"
-    end
-
     public
 
     def perform

data/lib/hackmac/oc.rb

@@ -0,0 +1,39 @@
+module Hackmac
+  class OC
+    def initialize(config:)
+      @config = config
+    end
+
+    def remote
+      @remote and return @remote
+      source = @config.oc.source
+      github = source.github
+      auth = [ @config.github.user, @config.github.access_token ].compact
+      auth.empty? and auth = nil
+      suffix =
+        case debug = source.debug?
+        when true       then 'DEBUG'
+        when false      then 'RELEASE'
+        when nil        then nil
+        end
+      @remote = Hackmac::GithubSource.new(github, auth: auth, suffix: suffix)
+    end
+
+    def name
+      remote.name
+    end
+
+    def version
+      remote.version
+    end
+
+    def inspect
+      "#<#{self.class}: #{to_s}>"
+    end
+
+    def to_s
+      "#{name} #{version}"
+    end
+  end
+end
+

data/lib/hackmac/oc_upgrader.rb

@@ -0,0 +1,35 @@
+require 'fileutils'
+
+module Hackmac
+  class OCUpgrader
+    include FileUtils::Verbose
+    include Hackmac::AssetTools
+
+    def initialize(mdev:, config:)
+      @config      = config
+      mount_path   = Pathname.new('/Volumes').join(mdev)
+      @install_dir = Pathname.new(mount_path).join(@config.oc.efi_path)
+    end
+
+    def perform
+      isolate do |dir|
+        oc = OC.new(config: @config)
+        name, data = oc.remote.download_asset
+        if name
+          File.secure_write(name, data)
+          decompress(name)
+          for f in @config.oc.files.map { |x| Pathname.new(x) }
+            sf = Pathname.new(dir).join(@config.oc.install_path).join(f)
+            cp sf, @install_dir.join(f.dirname)
+          end
+        else
+          fail "#{oc} could not be downloaded"
+        end
+      end
+    end
+
+    def to_s
+      'Installation into %s' % @install_dir
+    end
+  end
+end

data/lib/hackmac/plist.rb

@@ -11,6 +11,10 @@ module Hackmac
       @plist.dup
     end
 
+    def each(&block)
+      as_hash.each(&block)
+    end
+
     def to_json(*a)
       as_hash.to_json(*a)
     end

data/lib/hackmac/{kext_download.rb → url_download.rb}

@@ -2,7 +2,7 @@ require 'open-uri'
 require 'tins/string_version'
 
 module Hackmac
-  class KextDownload
+  class URLDownload
     include Tins::StringVersion
 
     def initialize(name, version, url)

data/lib/hackmac/version.rb

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

@@ -7,9 +7,12 @@ require 'tins/xt'
 require 'hackmac/version'
 require 'hackmac/plist'
 require 'hackmac/disks'
+require 'hackmac/asset_tools'
+require 'hackmac/github_source'
+require 'hackmac/url_download'
 require 'hackmac/kext'
-require 'hackmac/kext_source'
-require 'hackmac/kext_download'
 require 'hackmac/kext_upgrader'
+require 'hackmac/oc'
+require 'hackmac/oc_upgrader'
 require 'hackmac/config'
 require 'hackmac/utils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -139,20 +139,23 @@ dependencies:
 description: This ruby gem provides some useful tools for working with a Hackintosh.
 email: flori@ping.de
 executables:
+- efi
 - gfxmon
 - usb
-- efi
 extensions: []
 extra_rdoc_files:
 - README.md
 - lib/hackmac.rb
+- lib/hackmac/asset_tools.rb
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
+- lib/hackmac/github_source.rb
 - lib/hackmac/kext.rb
-- lib/hackmac/kext_download.rb
-- lib/hackmac/kext_source.rb
 - lib/hackmac/kext_upgrader.rb
+- lib/hackmac/oc.rb
+- lib/hackmac/oc_upgrader.rb
 - lib/hackmac/plist.rb
+- lib/hackmac/url_download.rb
 - lib/hackmac/utils.rb
 - lib/hackmac/version.rb
 files:
@@ -166,13 +169,16 @@ files:
 - bin/usb
 - hackmac.gemspec
 - lib/hackmac.rb
+- lib/hackmac/asset_tools.rb
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
+- lib/hackmac/github_source.rb
 - lib/hackmac/kext.rb
-- lib/hackmac/kext_download.rb
-- lib/hackmac/kext_source.rb
 - lib/hackmac/kext_upgrader.rb
+- lib/hackmac/oc.rb
+- lib/hackmac/oc_upgrader.rb
 - lib/hackmac/plist.rb
+- lib/hackmac/url_download.rb
 - lib/hackmac/utils.rb
 - lib/hackmac/version.rb
 homepage: http://github.com/flori/hackmac
@@ -197,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: Some useful tools for working with a Hackintosh