hackmac 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e7cfe2bc42ae2f7aee8ac43d49c52814629c99c119eb96ac20a5e932cd3831
-  data.tar.gz: 9f85ee573b12bca903db7bfa12e090d5fab5d5037a81f76fb29269ff908ca5a6
+  metadata.gz: 1a53577233e0ca106d3ed91b1e99712ae916ea5492666ddbbf121f55c2230ba1
+  data.tar.gz: 1faa995943f8d87aec4ba4e7cf3b99dce2c73ee0423d5434a65542930152e6bf
 SHA512:
-  metadata.gz: a3ff124867aec02b6b9270d80471773be1a7af032caf4262935e1241a1d7b49d6c1c6d2952902c70a690ed16a28fb56a75349ca54b10f518c396bde537e37e56
-  data.tar.gz: e133326410563546d46235ceca5d1519e05cd3fc983386679460b95fbda59b6dcdc802d06558e00812815b2d76b854c5890ca25c66fedef9977822fbf8158ac2
+  metadata.gz: 9f4f553b2a407c80b902aaf93501114da43ca2b97d21f981e2cb9b58578d74b6afda54c83b1180d40da2f37b14a618b6622bd331313587ca536cf7547941c53a
+  data.tar.gz: 4355565fe49fbb9a31c898b84401b73bc97c99346a3735a6926e0976ea18de4da586d8558dbcd5541b2118f06708c40e7af2840a9959b5bbea3696bbcce56a79

data/Rakefile

@@ -23,6 +23,7 @@ GemHadar do
   dependency  'plist'
   dependency  'tabulo'
   dependency  'search_ui'
+  dependency  'infobar',        '>=0.7.1'
   dependency  'hashie'
   development_dependency 'debug'
 end

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/bin/usb

@@ -21,9 +21,11 @@ unless File.exist?(cim)
 end
 ask("Really erase #{dev.inspect} and install #{$config.usb.os.inspect}? (y/n) ") or exit
 
-x %{diskutil partitionDisk #{dev.inspect} GPT JHFS+ "USB" 100%}
+x %{diskutil partitionDisk #{dev.inspect} GPT JHFS+ "USB" 100%},
+  busy: 'Partitioning disk'
 
-x %{sudo #{cim.inspect} --volume #{mountpoint.inspect} --nointeraction}
+x %{sudo #{cim.inspect} --volume #{mountpoint.inspect} --nointeraction},
+  busy: 'Creating Install Media'
 
 x %{sudo mkdir -p #{mountpoint_efi.inspect}}
 x %{sudo mount -t msdos #{('/dev/' + dev + 's1').inspect} #{mountpoint_efi.inspect}}

data/hackmac.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.6.0 ruby lib
+# stub: hackmac 1.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.6.0"
+  s.version = "1.7.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 = "2023-05-29"
+  s.date = "2023-10-09"
   s.description = "This ruby gem provides some useful tools for working with a Hackintosh.".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["efi".freeze, "gfxmon".freeze, "usb".freeze]
@@ -16,34 +16,20 @@ Gem::Specification.new do |s|
   s.files = [".gitignore".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "bin/usb".freeze, "hackmac.gemspec".freeze, "img/gfxmon.png".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/graph.rb".freeze, "lib/hackmac/graph/display.rb".freeze, "lib/hackmac/hackmac.yml".freeze, "lib/hackmac/ioreg.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/oc_validator.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.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.3.26".freeze
+  s.rubygems_version = "3.4.10".freeze
   s.summary = "Some useful tools for working with a Hackintosh".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-  end
+  s.specification_version = 4
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
-    s.add_development_dependency(%q<debug>.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"])
-    s.add_runtime_dependency(%q<amatch>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<plist>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<tabulo>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<hashie>.freeze, [">= 0"])
-  else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
-    s.add_dependency(%q<debug>.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"])
-    s.add_dependency(%q<amatch>.freeze, [">= 0"])
-    s.add_dependency(%q<plist>.freeze, [">= 0"])
-    s.add_dependency(%q<tabulo>.freeze, [">= 0"])
-    s.add_dependency(%q<search_ui>.freeze, [">= 0"])
-    s.add_dependency(%q<hashie>.freeze, [">= 0"])
-  end
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
+  s.add_development_dependency(%q<debug>.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"])
+  s.add_runtime_dependency(%q<amatch>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<plist>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<tabulo>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<infobar>.freeze, [">= 0.7.1"])
+  s.add_runtime_dependency(%q<hashie>.freeze, [">= 0"])
 end

data/lib/hackmac/graph.rb

@@ -33,7 +33,7 @@ class Hackmac::Graph
           lightness < 40
       }
       s = Digest::MD5.digest(string).unpack('Q*')
-      cs[ (s.first ^ s.last) % cs.size ]
+      cs[ s.first % cs.size ]
     end
 
     self

data/lib/hackmac/utils.rb

@@ -6,24 +6,35 @@ require 'tabulo'
 require 'fileutils'
 require 'tmpdir'
 require 'shellwords'
+require 'infobar'
 
 module Hackmac
   module Utils
     include FileUtils
 
-    def x(cmd, verbose: true)
+    def x(cmd, verbose: true, busy: nil)
       prompt = cmd =~ /\A\s*sudo/ ? ?# : ?$
-      print "#{prompt} #{cmd}".color(27)
-      puts verbose ? "" : " >/dev/null".yellow
-      output = `#{cmd} 2>&1`
-      if $?.success?
-        puts "✅ Command succeded!".green
+      cmd_output = "#{prompt} #{cmd}".color(27) + (verbose ? "" : " >/dev/null".yellow)
+      output, result = nil, nil
+      if busy
+        infobar.busy(label: busy) {
+          infobar.puts cmd_output
+          output = `#{cmd} 2>&1`
+          result = $?
+        }
       else
-        puts "⚠️  Command #{cmd.inspect} failed with exit status #{$?.exitstatus}".on_red.white
-        exit $?.exitstatus
+        infobar.puts cmd_output
+        output = `#{cmd} 2>&1`
+        result = $?
       end
       if verbose
-        puts output.italic
+        infobar.puts output.italic
+      end
+      if result.success?
+        infobar.puts "✅ Command succeded!".green
+      else
+        infobar.puts "⚠️  Command #{cmd.inspect} failed with exit status #{result.exitstatus}".on_red.white
+        exit result.exitstatus
       end
       output
     end

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '1.6.0'
+  VERSION         = '1.7.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: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: infobar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Some useful tools for working with a Hackintosh