hackmac 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c396260302ef16cc1fba70249b92825693f1c0fa6eb0c8210f87963259677e2
-  data.tar.gz: d1ff4adfde67c2b6f7ccf469f80ab3dc2e4b27385ef096deacdfc4e6df86a0bf
+  metadata.gz: acb3a1f1b56cf323c736b2f494eaebfe6d00e698aacbdcc1ece207c88e9ed67e
+  data.tar.gz: eb6b28e69e600eacf265f1d835f0e0e0119ede8157a0279379071e27a66abcaf
 SHA512:
-  metadata.gz: e8060d73816bcf5cd7de3083a96c90670f14b713e0085ec1764dcb0e97b9d07579d450463963a65354f752703f6658ce7fe672a97b1a76931c47a4ac9c382acf
-  data.tar.gz: 1926c67b91f9c13275aa63fd9784f71b70273862c14c4165b3d8fadc284d5c753c4bd80bc40acb75950ffb13bf5c196caf154cc8fa3165fbf89d2129d5ec2d57
+  metadata.gz: e1cec9eb4365cd488ba0e2c73c205f3b620ee52cfec96177b99c047ef5e7b5b3d74f0dd17e204845a3bf280db14e6d539e86369e0443e8d6c1285fbbda230a66
+  data.tar.gz: 0a12e7ff18c172fbe3e734496c5bac82c5edd11e45ef4b818db34a8fc6ef54e6d870c6cb7dc3c1cca4e4f81705e04bca7f15ee7728e32cff80379eb489a888e6

data/Rakefile

@@ -22,4 +22,5 @@ GemHadar do
   dependency  'amatch'
   dependency  'plist'
   dependency  'tabulo'
+  development_dependency 'byebug'
 end

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/bin/efi

@@ -133,34 +133,47 @@ 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
+  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}"
-          kext_name = "#{kext.name}.kext"
-          if File.directory?(kext_name)
+          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_name, path
+              cp_r kext_path, path
             end
           else
-            fail "#{kext_name} Could not be installed"
+            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
-  else
-    puts "#{kext} is already the latest version"
   end
 when 'list'
   disks = Disks.new

data/hackmac.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.3.2 ruby lib
+# stub: hackmac 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   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-30"
+  s.date = "2020-02-07"
   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]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :add_runtime_dependency then
     s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
     s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
@@ -33,6 +34,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<tabulo>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
     s.add_dependency(%q<complex_config>.freeze, [">= 0"])

data/lib/hackmac/kext.rb

@@ -35,6 +35,7 @@ module Hackmac
     end
 
     def remote_kext
+      return @remote_kext if @remote_kext
       if @config
         if github = @config.kext.sources[name]&.github
           auth = [ @config.github.user, @config.github.access_token ].compact

data/lib/hackmac/utils.rb

@@ -5,6 +5,7 @@ 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.3.2'
+  VERSION         = '0.3.3'
   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.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement