hackmac 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2851fee08cfaeb92db3644dbd04eecb12379c8410f10c75599601f9984d0333
-  data.tar.gz: 6678f56e13c11dd0914091afc54328dc10c06546e04019e37a787a37175b4ce4
+  metadata.gz: e60de0cfd1893bbebe2b12c6f178e119a22c11df20db0dd820246e6c0871aa85
+  data.tar.gz: 45b5a00acf8685a38335a57c9262aba1fb871f47eff040038db0e417447115ff
 SHA512:
-  metadata.gz: 1cb71be5755a5d04960cfaf09f16f6584026a0df680e1884b16c597558769b684deb0e546deeaa51ec51d61e4860cc56357012771f1bc05bc9d3761c95e63f87
-  data.tar.gz: 3bc28aea413bdcbfcdf3eeb84dd31876c8d34d732a6ffa8be8daa81753214ec4b60c302bc92b6e1abb7b82be7db3bbc7ae59745798fa66313a45c4ecadbf5086
+  metadata.gz: 55d0fe323e378ca5d28fb7ff231e392c19776ff8688c4e493413d2f63813d88de979c93dcaf2b2c0307f31f49abdad905cf6e988bbe9fc3f3799ca3877d334ca
+  data.tar.gz: 6cea068e98c7fb0467ff90cf98bd10c563c838589a2b0d3157fc1b9dee2d0e48b015c8355410fc5846e320e71d5903e15a1d8d317c7ec66adfcf1a10de1c78ca

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.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
@@ -161,8 +177,9 @@ 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 = []

data/hackmac.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.5.0 ruby lib
+# stub: hackmac 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.5.0"
+  s.version = "0.6.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-05-05"
   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]

data/lib/hackmac/kext.rb

@@ -40,10 +40,11 @@ module Hackmac
     def remote_kext
       return @remote_kext if @remote_kext
       if @config
-        if github = @config.kext.sources[name]&.github
+        if source = @config.kext.sources[name] and 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 = source.debug? ? 'DEBUG' : 'RELEASE'
+          @remote_kext = Hackmac::KextSource.new(github, auth: auth, suffix: suffix)
         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 || 'RELEASE')
       account, repo = github.split(?/)
       @name = repo
       releases = URI.open(
@@ -41,7 +42,7 @@ 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\z/i } or return
       data = URI.open(
         (GITHUB_API_URL % github) + ("/assets/%s" % asset.id),
         'Accept' => 'application/octet-stream',

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
@@ -28,7 +28,7 @@ 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)
@@ -48,7 +48,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.6.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.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar