hackmac 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7acc13fd5dee07de07b479330881c9c630179f8dc785400c2effaea44c3190c
-  data.tar.gz: 2bb42e69cd439b93d38e9abd06cfb4142e3e987b1f049135e13416b2f610d099
+  metadata.gz: e31666568c0306204cd0f47663bebb3f5356c21cfc2ae68502d1a71a1584b216
+  data.tar.gz: 73d5127bf3747e8f95a06c8b6213cedba403d279c76273bed2e7265b123c5e03
 SHA512:
-  metadata.gz: cd15589d99e9f8c25ed2ab45f44a584e7e02786c1b0bdcaaec0dea2becc74a7cdfe3f26170af2e16b440842169c10dbd0c06864b16fb045d9c2e0a28fd1f3934
-  data.tar.gz: a6a78acc6c898182d4614f6bab884de53d9a5540eadf84eae6bea708cdbc88dda3a3f72b41fea3cc0af458011a60ce93c75b8116c8c3d6c0c458216c1bdc3bc9
+  metadata.gz: d74298a7025caf5aff3bbd1d00e423865c6862ae0de724f6e1dd7d12dfac28b5771e86853601c58a9e659884dddb7f0fd2235cc5cfc563a1b524fd196125cfda
+  data.tar.gz: 74b5de0dadcd8e22ab554e1fa3040eef3a6c6039425c3377fa9f584d1a2d53be8cdb68231555f23f847b53b67300c9373386cbf20d06e47b8ef7c9c3fdbfeafd

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/bin/efi

@@ -134,48 +134,8 @@ when 'kext'
   path = ARGV.shift or fail 'need kext dir'
   puts Kext.new(path: path)
 when 'kext_upgrade'
-  Dir.mktmpdir do |dir|
-    cd dir do
-      path = ARGV.shift or fail 'need kext dir'
-      kext = Kext.new(path: path, config: $config)
-      case
-      when kext.remote_version.nil?
-        puts "No source defined for #{kext}"
-      when kext.remote_version > kext.version
-        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}"
-          kext_path = nil
-          Find.find(dir) do |path|
-            if FileTest.directory?(path)
-              case File.basename(path)
-              when /\A\./
-                Find.prune
-              when "#{kext.name}.kext"
-                kext_path = path
-                break
-              else
-                next
-              end
-            end
-          end
-          if kext_path
-            if ask("Really upgrade #{path.inspect} to version #{kext.remote_version}? (y/n) ")
-              rm_rf path
-              cp_r kext_path, path
-            end
-          else
-            fail "#{kext_path} Could not be installed"
-          end
-        else
-          fail "#{kext.remote_kext.name} could not be downloaded"
-        end
-      else
-        puts "#{kext} is already the latest version"
-      end
-    end
-  end
+  path = ARGV.shift or fail 'need kext dir'
+  Hackmac::KextUpgrader.new(path: path, config: $config).perform
 when 'list'
   disks = Disks.new
   efis = []

data/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.4.0 ruby lib
+# stub: hackmac 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.4.0"
+  s.version = "0.4.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-02-11"
+  s.date = "2020-02-12"
   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/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/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_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.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,5 +8,6 @@ require 'hackmac/plist'
 require 'hackmac/disks'
 require 'hackmac/kext'
 require 'hackmac/kext_source'
+require 'hackmac/kext_upgrader'
 require 'hackmac/config'
 require 'hackmac/utils'

data/lib/hackmac/config.rb

@@ -34,9 +34,11 @@ module Hackmac
             github: 'Sniki/OS-X-USB-Inject-All'
           VirtualSMC:
             github: 'acidanthera/VirtualSMC'
+            plugins:
+              - SMCProcessor
+              - SMCSuperIO
           WhateverGreen:
             github: 'acidanthera/WhateverGreen'
-
     end
 
     def self.load

data/lib/hackmac/kext_upgrader.rb

@@ -0,0 +1,68 @@
+require 'fileutils'
+require 'find'
+require 'pathname'
+
+module Hackmac
+  class KextUpgrader
+    include FileUtils
+
+    def initialize(path:, config:)
+      @path, @config = path, config
+    end
+
+    private
+
+    def isolate
+      Dir.mktmpdir do |dir|
+        cd dir do
+          yield dir
+        end
+      end
+    end
+
+    public
+
+    def perform
+      isolate do |dir|
+        kext = Kext.new(path: @path, config: @config)
+        case
+        when kext.remote_version.nil?
+          puts "No source defined for #{kext}"
+        when kext.remote_version > kext.version
+          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}"
+            kext_pathes = []
+            Find.find(dir) do |path|
+              if FileTest.directory?(path)
+                case File.basename(path)
+                when /\A\./
+                  Find.prune
+                when "#{kext.name}.kext"
+                  kext_pathes.unshift path
+                when
+                  *@config.kext.sources[kext.name]&.plugins&.map { |p| p + '.kext' }
+                then
+                  kext_pathes << path
+                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) ")
+                rm_rf old_path
+                cp_r kext_path, old_path
+              end
+            end
+          else
+            fail "#{kext.remote_kext.name} could not be downloaded"
+          end
+        else
+          puts "#{kext} is already the latest version"
+        end
+      end
+    end
+  end
+end

data/lib/hackmac/utils.rb

@@ -5,7 +5,6 @@ end
 require 'tabulo'
 require 'fileutils'
 require 'tmpdir'
-require 'find'
 
 module Hackmac
   module Utils

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '0.4.0'
+  VERSION         = '0.4.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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -150,6 +150,7 @@ extra_rdoc_files:
 - lib/hackmac/disks.rb
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_source.rb
+- lib/hackmac/kext_upgrader.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/utils.rb
 - lib/hackmac/version.rb
@@ -168,6 +169,7 @@ files:
 - lib/hackmac/disks.rb
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_source.rb
+- lib/hackmac/kext_upgrader.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/utils.rb
 - lib/hackmac/version.rb