hackmac 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7376b8be3d88282d601b6bf2a1680d6147866948faba9eaadd2eb2002a5738
-  data.tar.gz: dead5492fc2cb69bcaf477460d4bbb4f11353d2b43c018898169a15a4edba2f1
+  metadata.gz: 15cd2512b3c0b4cb1c9c3f1d586681a51adaceacc3d661b63e75b013dbc7204b
+  data.tar.gz: 64c08eaab561ba49ced63891e89bd30316d2fd1fbd31d7fa9e5b0499e91ce54c
 SHA512:
-  metadata.gz: acad4d744c1ddb1a5e36916a47d837f3f425e708211626beef9492657b56a4898efb4a32e2129363b571cbc87a2a6020ac3df1ca028c10961de123e48e31b803
-  data.tar.gz: 129f684ca08c553f3d115b9d88b46e00f68b8e822dadfd8f4e9700493a311cfd90356e9f08b4988b4610f731add13cabf5762d405cf0d1761df98ac534aac4df
+  metadata.gz: 43c74281e04acc699ff22180790871440d3bcefd6ebeb04eaf71332d797c4c339c3286e10ea326845f9fdb4f0dbb56ef69068ba8216267803e7d3eb10aa1204b
+  data.tar.gz: da44c84501b20c6d7b43089d3cc90dc4013555213b39b012532dcf95acb755d347288dfb0caae48d5877fa51d137a69425b9703e3fbcdaf3718155365cc57581

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/efi

@@ -7,6 +7,9 @@ class String
   include Term::ANSIColor
 end
 require 'tabulo'
+require 'fileutils'
+include FileUtils
+require 'tmpdir'
 
 def x(cmd, verbose: true)
   prompt = cmd =~ /\A\s*sudo/ ? ?# : ?$
@@ -25,18 +28,19 @@ def x(cmd, verbose: true)
   output
 end
 
+def ask(prompt)
+  print prompt.bold.yellow
+  gets =~ /\Ay/i
+end
+
 def clone(from:, to:)
-  print "Cloning from #{from} to #{to} now? (y/n) ".bold.yellow
-  if gets !~ /\Ay/i
-    return
-  end
+  ask("Cloning from #{from} to #{to} now? (y/n) ") or return
   x %{sudo mkdir -v "/Volumes/#{from}"}
   x %{sudo mkdir -v "/Volumes/#{to}"}
   x %{sudo diskutil mount -mountPoint "/Volumes/#{from}" "#{from}"}
   x %{sudo diskutil mount -mountPoint "/Volumes/#{to}" "#{to}"}
   x %{rsync -nav --exclude ".*" --delete "/Volumes/#{from}/" "/Volumes/#{to}/"}
-  print "This will be copied/deleted. Really do it? (y/n) ".bold.yellow
-  if gets !~ /\Ay/i
+  unless ask("This will be copied/deleted. Really do it? (y/n) ")
     puts " *** Interrupted.".bold.yellow
     exit 1
   end
@@ -84,6 +88,10 @@ def usage
 
         argument PATH to the kext
 
+      kext_upgrade
+
+        argument PATH to the kext
+
       kexts       list kexts versions by clover
 
         argument DEVICE (defaults to #{default_dev})
@@ -153,6 +161,32 @@ when 'kexts'
 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'
+  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
+    Dir.mktmpdir do |dir|
+      cd dir do
+        name, data = kext.remote_kext.download_asset
+        File.secure_write(name, data)
+        system "unzip #{name.inspect}"
+        kext_name = "#{kext.name}.kext"
+        if File.directory?(kext_name)
+          if ask("Really upgrade #{path.inspect} to version #{kext.remote_version}? (y/n) ")
+            rm_rf path
+            cp_r kext_name, path
+          end
+        else
+          fail "#{kext_name} could not be downloaded"
+        end
+      end
+    end
+  else
+    puts "#{kext} is already the latest version"
+  end
 when 'list'
   disks = Disks.new
   efis = []

data/hackmac.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.1.1 ruby lib
+# stub: hackmac 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.1.1"
+  s.version = "0.2.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-01-28"
+  s.date = "2020-01-29"
   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, "efi".freeze]

data/lib/hackmac/kext_source.rb

@@ -9,6 +9,8 @@ module Hackmac
     include Tins::StringVersion
 
     def initialize(github, auth: nil)
+      @github = github
+      @auth   = auth
       account, repo = github.split(?/)
       @name = repo
       releases = URI.open(
@@ -16,16 +18,16 @@ module Hackmac
         http_basic_authentication: auth) { |o|
         JSON.parse(o.read, object_class: JSON::GenericObject)
       }
-      if version = releases.map { |r|
+      if max_version = releases.map { |r|
           next unless r.tag_name.include?(?.)
-          version = r.tag_name.delete '^.0-9'
+          tag = r.tag_name.delete '^.0-9'
           begin
-            Version.new(version)
+            [ Version.new(tag), r ]
           rescue ArgumentError
           end
-        }.compact.max
+        }.compact.max_by(&:first)
       then
-        @version = version
+        @version, @release = max_version
       end
     end
 
@@ -33,6 +35,21 @@ module Hackmac
 
     attr_reader :version
 
+    attr_reader :github
+
+    attr_reader :auth
+
+    def download_asset
+      @release or return
+      asset = @release.assets.find { |a| a.name =~ /RELEASE.*zip/ } or return
+      data = URI.open(
+        (GITHUB_API_URL % github) + ("/assets/%s" % asset.id),
+        'Accept' => 'application/octet-stream',
+        http_basic_authentication: auth
+      ) { |o| o.read }
+      return asset.name, data
+    end
+
     def inspect
       "#<#{self.class}: #{to_s}>"
     end

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '0.1.1'
+  VERSION         = '0.2.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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar