hackmac 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2851fee08cfaeb92db3644dbd04eecb12379c8410f10c75599601f9984d0333
-  data.tar.gz: 6678f56e13c11dd0914091afc54328dc10c06546e04019e37a787a37175b4ce4
+  metadata.gz: 7af767d33e759f56b3859b180902074c8dee41ede4dca8e1ce386d78f3876b07
+  data.tar.gz: '0940a4ff2b917c27084d84ffef63315471199e973c06fe72843f1ad45efd1f66'
 SHA512:
-  metadata.gz: 1cb71be5755a5d04960cfaf09f16f6584026a0df680e1884b16c597558769b684deb0e546deeaa51ec51d61e4860cc56357012771f1bc05bc9d3761c95e63f87
-  data.tar.gz: 3bc28aea413bdcbfcdf3eeb84dd31876c8d34d732a6ffa8be8daa81753214ec4b60c302bc92b6e1abb7b82be7db3bbc7ae59745798fa66313a45c4ecadbf5086
+  metadata.gz: d870311c137b9c23858c59577cdd08fc0711f3d7d74bbcdd8b4c63fe982625f2918a44f2698620b87e66e00f0d09d81d640c99b425b30bb690a421c81a5920b0
+  data.tar.gz: 7f47b532331beff3df16b6808e6365e514662098d8538101f1b43dcb8d782be0979ec61d9172e7178f6067c826b07d25fe0100d7c5e46a4b8cf18559febb45f7

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.8.0

data/bin/efi

@@ -63,6 +63,8 @@ def usage
 
         argument PATH to the kext
 
+        argument FORCE == 'force' => always upgrade
+
       kexts       list kexts versions by clover
 
         argument DEVICE (defaults to #{default_dev})
@@ -70,6 +72,20 @@ def usage
         The EFI partion on DEVICE is used to find the clover kexts in
         subdirectory /Other.
 
+      diff        EFI partition
+
+        argument DEVICE (defaults to #{default_dev})
+
+        Shows changes as a diff with git, passes arguments to diff command
+        after "--".
+
+      commit      EFI partition
+
+        argument DEVICE (defaults to #{default_dev})
+
+        Commits changes with git, passes arguments to commit command
+        after "--".
+
       list        shows boot disk information (which EFI partition was used)
 
   end
@@ -123,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'
@@ -151,18 +169,22 @@ 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'
   path = ARGV.shift or fail 'need kext dir'
   puts Kext.new(path: path)
 when 'kext_upgrade'
-  path = ARGV.shift or fail 'need kext dir'
-  Hackmac::KextUpgrader.new(path: path, config: $config).perform
+  path  = ARGV.shift or fail 'need kext dir'
+  force = ARGV.shift == 'force'
+  Hackmac::KextUpgrader.new(path: path, config: $config, force: force).perform
 when 'list'
   disks = Disks.new
   efis = []
@@ -177,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.5.0 ruby lib
+# stub: hackmac 0.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.5.0"
+  s.version = "0.8.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-03-05"
+  s.date = "2020-08-17"
   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,10 +40,20 @@ module Hackmac
     def remote_kext
       return @remote_kext if @remote_kext
       if @config
-        if github = @config.kext.sources[name]&.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
-          @remote_kext = Hackmac::KextSource.new(github, auth: auth)
+          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

@@ -8,9 +8,10 @@ module Hackmac
 
     include Tins::StringVersion
 
-    def initialize(github, auth: nil)
-      @github = github
-      @auth   = auth
+    def initialize(github, auth: nil, suffix: nil)
+      @github  = github
+      @auth    = auth
+      @suffix  = (Regexp.quote(suffix) if suffix)
       account, repo = github.split(?/)
       @name = repo
       releases = URI.open(
@@ -41,12 +42,13 @@ module Hackmac
 
     def download_asset
       @release or return
-      asset = @release.assets.find { |a| a.name =~ /RELEASE.*zip/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

@@ -6,8 +6,8 @@ module Hackmac
   class KextUpgrader
     include FileUtils
 
-    def initialize(path:, config:)
-      @path, @config = path, config
+    def initialize(path:, config:, force: false)
+      @path, @config, @force = path, config, force
     end
 
     private
@@ -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
@@ -28,11 +41,11 @@ module Hackmac
         case
         when kext.remote_version.nil?
           puts "No source defined for #{kext}"
-        when kext.remote_version > kext.version
+        when kext.remote_version > kext.version || @force
           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)
@@ -48,7 +61,6 @@ module Hackmac
                 end
               end
             end
-            p kext_pathes
             kext_pathes.each do |kext_path|
               old_path = (Pathname.new(@path).dirname + File.basename(kext_path)).to_s
               if ask("Really upgrade #{old_path.inspect} to version #{kext.remote_version}? (y/n) ")

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '0.5.0'
+  VERSION         = '0.8.0'
   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.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-08-17 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: []