hackmac 0.6.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e60de0cfd1893bbebe2b12c6f178e119a22c11df20db0dd820246e6c0871aa85
-  data.tar.gz: 45b5a00acf8685a38335a57c9262aba1fb871f47eff040038db0e417447115ff
+  metadata.gz: 1c4e84816963538116a40d14930813dc43f284196de0909c9685ac26133c8c8a
+  data.tar.gz: 9cc12d81f2fb041279c7e50ee4787222ce2d51ed1461e086282278f9edd09f3c
 SHA512:
-  metadata.gz: 55d0fe323e378ca5d28fb7ff231e392c19776ff8688c4e493413d2f63813d88de979c93dcaf2b2c0307f31f49abdad905cf6e988bbe9fc3f3799ca3877d334ca
-  data.tar.gz: 6cea068e98c7fb0467ff90cf98bd10c563c838589a2b0d3157fc1b9dee2d0e48b015c8355410fc5846e320e71d5903e15a1d8d317c7ec66adfcf1a10de1c78ca
+  metadata.gz: 715e90bca64b6cf603e5c886e69367f2f05941b08d5f5e8010cb93b66fbf1aa011909058e08361bf347463191baae2c691aedef220fcc3de484bb1ce91353a77
+  data.tar.gz: 275adcacccf97fdca702fe4f77839373156371bc3de9445a13e06003fcecf2968738135bb0298260481e922b6b92cee03fb1de0be1cff217de0cfdb0e4530638

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.8.1

data/bin/efi

@@ -21,7 +21,7 @@ end
 def boot_dev
   unless @boot_dev
     value = x(%{bdmesg}, verbose: false).lines.
-      find { |l| l =~ /SelfDevicePath=(.*)\r/ and break $1 }
+      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
@@ -139,16 +139,18 @@ when /\Aun?mount\z/
   x %{sudo diskutil unmount "#{mdev}"}
   # TODO remove /Volumes/mdev if it is a symlink
 when /\Adiff\z/
-  mdev = git_args(default: %w[ --color --stat ])
+  mdev = git_args(default: %w[ --color --stat --cached ])
   x %{sudo diskutil mount "#{mdev}"}
   cd "/Volumes/#{mdev}" do
+    x %{git add -A}
     x %{git diff #{Shellwords.join(ARGV)}}
   end
 when /\Acommit\z/
   mdev = git_args(default: %w[ -v ])
   x %{sudo diskutil mount "#{mdev}"}
   cd "/Volumes/#{mdev}" do
-    system %{git commit -a #{Shellwords.join(ARGV)}} and
+    x %{git add -A}
+    system %{git commit #{Shellwords.join(ARGV)}} and
       x %{ git push }
   end
 when 'clone'
@@ -167,10 +169,13 @@ when 'kexts'
   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)
+    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
+    )
     t.add_column(:path, header_styler: bold_head)
   }.pack
 when 'kext'
@@ -194,13 +199,25 @@ when 'list'
     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(
+      :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)
+    t.add_column(
+      :MountPoint,
+      styler: -> v, _ { v.empty? ? v : v.green },
+      header_styler: bold_head
+    )
   }.pack
 else
   fail "don't know how to #{command}"

data/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.6.0 ruby lib
+# stub: hackmac 0.8.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.6.0"
+  s.version = "0.8.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 = "2020-05-05"
+  s.date = "2020-08-22"
   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_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_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.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.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

data/lib/hackmac.rb

@@ -8,6 +8,7 @@ require 'hackmac/plist'
 require 'hackmac/disks'
 require 'hackmac/kext'
 require 'hackmac/kext_source'
+require 'hackmac/kext_download'
 require 'hackmac/kext_upgrader'
 require 'hackmac/config'
 require 'hackmac/utils'

data/lib/hackmac/config.rb

@@ -15,14 +15,14 @@ module Hackmac
         os: '/Applications/Install macOS Mojave.app'
       devices:
         main:
-          name: EFI
-        #backup:
-        #  name: BACKUP_EFI
+          name: 'OSX_EFI'
+        backup:
+          name: 'BACKUP_EFI'
       github:
         user: null
         access_token: null
       kext:
-        efi_path: EFI/CLOVER/kexts/Other
+        efi_path: 'EFI/CLOVER/kexts/Other'
         sources:
           AppleALC:
             github: 'acidanthera/AppleALC'
@@ -30,19 +30,27 @@ module Hackmac
             github: 'acidanthera/IntelMausi'
           Lilu:
             github: 'acidanthera/Lilu'
-          USBInjectAll:
-            github: 'Sniki/OS-X-USB-Inject-All'
+          #USBInjectAll:
+          #  github: 'Sniki/OS-X-USB-Inject-All'
           VirtualSMC:
             github: 'acidanthera/VirtualSMC'
+            debug: false
             plugins:
               - SMCProcessor
               - SMCSuperIO
+          BrcmPatchRAM2:
+            download:
+              name:    'BrcmPatchRAM'
+              version: '2.2.10'
+              url:     'https://bitbucket.org/RehabMan/os-x-brcmpatchram/downloads/RehabMan-BrcmPatchRAM-2018-0505.zip'
+            plugins:
+              - BrcmFirmwareData
           WhateverGreen:
             github: 'acidanthera/WhateverGreen'
     end
 
     def self.load
-      path = File.expand_path('~/config')
+      path = File.expand_path('~/.config/hackmac')
       mkdir_p path
       ComplexConfig::Provider.config_dir = path
       config_path = File.join(path, 'hackmac.yml')

data/lib/hackmac/kext.rb

@@ -40,11 +40,20 @@ module Hackmac
     def remote_kext
       return @remote_kext if @remote_kext
       if @config
-        if source = @config.kext.sources[name] and github = source&.github
+        source = @config.kext.sources[name] or return
+        case
+        when github = source&.github?
           auth = [ @config.github.user, @config.github.access_token ].compact
           auth.empty? and auth = nil
-          suffix = source.debug? ? 'DEBUG' : 'RELEASE'
+          suffix =
+            case debug = source.debug?
+            when true       then 'DEBUG'
+            when false      then 'RELEASE'
+            when nil        then nil
+            end
           @remote_kext = Hackmac::KextSource.new(github, auth: auth, suffix: suffix)
+        when download = source&.download
+          @remote_kext = Hackmac::KextDownload.new(download.name, download.version, download.url)
         end
       end
     end

data/lib/hackmac/kext_download.rb

@@ -0,0 +1,39 @@
+require 'open-uri'
+require 'tins/string_version'
+
+module Hackmac
+  class KextDownload
+    include Tins::StringVersion
+
+    def initialize(name, version, url)
+      @name    = name
+      @url     = url
+      @version = Version.new(version)
+    end
+
+    attr_reader :name
+
+    attr_reader :version
+
+    def download_asset
+      data = URI.open(
+        @url,
+        'Accept' => 'application/octet-stream',
+        &:read
+      )
+      return File.basename(@url), data
+    end
+
+    def inspect
+      "#<#{self.class}: #{to_s}>"
+    end
+
+    def to_s
+      "#{name} #{version}"
+    end
+
+    def to_s
+      "#{name} #{version}"
+    end
+  end
+end

data/lib/hackmac/kext_source.rb

@@ -11,7 +11,7 @@ module Hackmac
     def initialize(github, auth: nil, suffix: nil)
       @github  = github
       @auth    = auth
-      @suffix  = Regexp.quote(suffix || 'RELEASE')
+      @suffix  = (Regexp.quote(suffix) if suffix)
       account, repo = github.split(?/)
       @name = repo
       releases = URI.open(
@@ -42,12 +42,13 @@ module Hackmac
 
     def download_asset
       @release or return
-      asset = @release.assets.find { |a| a.name =~ /#@suffix.*\.zip\z/i } or return
+      asset = @release.assets.find { |a| a.name =~ /#@suffix.*\.(zip|tar\.gz)\z/i } or return
       data = URI.open(
         (GITHUB_API_URL % github) + ("/assets/%s" % asset.id),
         'Accept' => 'application/octet-stream',
-        http_basic_authentication: auth
-      ) { |o| o.read }
+        http_basic_authentication: auth,
+        &:read
+      )
       return asset.name, data
     end
 

data/lib/hackmac/kext_upgrader.rb

@@ -20,6 +20,19 @@ module Hackmac
       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
@@ -32,7 +45,7 @@ module Hackmac
           name, data = kext.remote_kext.download_asset
           if name
             File.secure_write(name, data)
-            system "unzip #{name.inspect}" or fail "Could not unzip #{name.inspect}"
+            decompress(name)
             kext_pathes = []
             Find.find(dir) do |path|
               if File.directory?(path)

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '0.6.0'
+  VERSION         = '0.8.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: 0.6.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -149,6 +149,7 @@ extra_rdoc_files:
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/kext.rb
+- lib/hackmac/kext_download.rb
 - lib/hackmac/kext_source.rb
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/plist.rb
@@ -168,6 +169,7 @@ files:
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/kext.rb
+- lib/hackmac/kext_download.rb
 - lib/hackmac/kext_source.rb
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/plist.rb
@@ -176,7 +178,7 @@ files:
 homepage: http://github.com/flori/hackmac
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Hackmac - Some useful tools for working with a Hackintosh
@@ -196,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Some useful tools for working with a Hackintosh
 test_files: []