hackmac 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a53577233e0ca106d3ed91b1e99712ae916ea5492666ddbbf121f55c2230ba1
-  data.tar.gz: 1faa995943f8d87aec4ba4e7cf3b99dce2c73ee0423d5434a65542930152e6bf
+  metadata.gz: fc4f90ec709aee8915812f1213db46368264192db4ed3509351068767af2e625
+  data.tar.gz: 1d8b03ba5a8e3373e98eebfda4313d2bf4bdd0d79cb4e20b1f8b83db6cb76420
 SHA512:
-  metadata.gz: 9f4f553b2a407c80b902aaf93501114da43ca2b97d21f981e2cb9b58578d74b6afda54c83b1180d40da2f37b14a618b6622bd331313587ca536cf7547941c53a
-  data.tar.gz: 4355565fe49fbb9a31c898b84401b73bc97c99346a3735a6926e0976ea18de4da586d8558dbcd5541b2118f06708c40e7af2840a9959b5bbea3696bbcce56a79
+  metadata.gz: a2774e2c2226b71e7454f196908be07a3cf103c6e0d573cbfc4129c34da2dd8cc67eb02bda980138bdd56b0f514f4c583ac9e075a055d8c2675dc3b14436fe9a
+  data.tar.gz: 5a73b4639db62121d6b1650598e006e55b5ec309a13517d8d9208103516a29bc331256748d1c8ab2a072eadf376073b0427b22cfd76a069987460a65de4d48bc

data/Rakefile

@@ -17,13 +17,12 @@ GemHadar do
   readme      'README.md'
 
   dependency  'tins',           '~>1.14'
-  dependency  'term-ansicolor', '~>1.3'
+  dependency  'term-ansicolor', '~>1.10'
   dependency  'complex_config'
   dependency  'amatch'
   dependency  'plist'
   dependency  'tabulo'
   dependency  'search_ui'
-  dependency  'infobar',        '>=0.7.1'
   dependency  'hashie'
   development_dependency 'debug'
 end

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.0

data/bin/gfxmon

@@ -3,6 +3,7 @@
 require 'tins'
 include Tins::GO
 require 'term/ansicolor'
+Term::ANSIColor.true_coloring = ENV['COLORTERM'] =~ /\A(truecolor|24bit)\z/
 include Term::ANSIColor
 class String
   include Term::ANSIColor

data/bin/usb

@@ -21,11 +21,9 @@ 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%},
-  busy: 'Partitioning disk'
+x %{diskutil partitionDisk #{dev.inspect} GPT JHFS+ "USB" 100%}
 
-x %{sudo #{cim.inspect} --volume #{mountpoint.inspect} --nointeraction},
-  busy: 'Creating Install Media'
+x %{sudo #{cim.inspect} --volume #{mountpoint.inspect} --nointeraction}
 
 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.7.0 ruby lib
+# stub: hackmac 1.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.7.0"
+  s.version = "1.8.0".freeze
 
   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-10-09"
+  s.date = "2024-07-23"
   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,20 +16,19 @@ 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.4.10".freeze
+  s.rubygems_version = "3.5.16".freeze
   s.summary = "Some useful tools for working with a Hackintosh".freeze
 
   s.specification_version = 4
 
-  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"])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.16.0".freeze])
+  s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14".freeze])
+  s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.10".freeze])
+  s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<amatch>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<plist>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<tabulo>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<hashie>.freeze, [">= 0".freeze])
 end

data/lib/hackmac/utils.rb

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

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '1.7.0'
+  VERSION         = '1.8.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.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: complex_config
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ 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
@@ -242,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Some useful tools for working with a Hackintosh