hackmac 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c27333ade19bd71ed33b0d32f055a33134110fe706eed808a1c23cf258715a0
-  data.tar.gz: 38033fbd4300eb771baba67cd2547f4dafdefcc35487b1fd59c0643aae497f29
+  metadata.gz: f50c5754f9dc5de0cc94c265030fd4c01518c9dabeff2f8bbd3eabc89d522e3a
+  data.tar.gz: 20f51cb4f16dd19584daace4fc245d7fe2e306b3644882d75c310c8de645bd5e
 SHA512:
-  metadata.gz: 0457cc962741f0f32c6a9d4e75282b4d327ef2273a0837b5036a8dd135f5d00e8e73c063ba607dfaa02afa8f8dc04384f8fbe1621868ac7cf29746970598cc99
-  data.tar.gz: 807ae7014ead4891da0b83eacf90777f5acd809b1b5cee33a3a1bb51ef62481fa1243327b284535e535a8c31e514d1ce102b7acdd564ec1affebfc65ba029240
+  metadata.gz: aca8ea6cd1f02de083a7a7b5ee8d748e957da0f26ec3b2e446c12e18ada65e5aa1feb81e85f0c018db479a6d092d6ad4c9baebddd51509c5882808b1028af338
+  data.tar.gz: fdefad73f682353fe331df3c898047a90fa82dcdc81f60c64203cbe21e1dfae08566a74d8c22185e1e2e6d83c29f772630aa9d43a96b443bc7b9d17fadab796b

data/Rakefile

@@ -8,7 +8,7 @@ GemHadar do
   email       'flori@ping.de'
   homepage    "http://github.com/flori/#{name}"
   summary     'Some useful tools for working with a Hackintosh'
-  description 'This ruby gem provides Some useful tools for working with a Hackintosh.'
+  description 'This ruby gem provides some useful tools for working with a Hackintosh.'
   bindir      'bin'
   executables Dir['bin/*'].map(&File.method(:basename))
   test_dir    'tests'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/bin/efi

@@ -2,36 +2,7 @@
 
 require 'hackmac'
 include Hackmac
-require 'term/ansicolor'
-class String
-  include Term::ANSIColor
-end
-require 'tabulo'
-require 'fileutils'
-include FileUtils
-require 'tmpdir'
-
-def x(cmd, verbose: true)
-  prompt = cmd =~ /\A\s*sudo/ ? ?# : ?$
-  output = `#{cmd}`
-  if $?.success?
-    print "#{prompt} #{cmd}".green
-    puts verbose ? "" : " >/dev/null".yellow
-  else
-    print "#{prompt} #{cmd}".red
-    puts verbose ? "" : " >/dev/null".yellow
-    STDERR.puts "command #{cmd.inspect} failed with exit status #{$?.exitstatus}".on_red.white
-  end
-  if verbose
-    print output.italic
-  end
-  output
-end
-
-def ask(prompt)
-  print prompt.bold.yellow
-  gets =~ /\Ay/i
-end
+include Utils
 
 def clone(from:, to:)
   ask("Cloning from #{from} to #{to} now? (y/n) ") or return

data/bin/usb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'hackmac'
+include Hackmac
+include Utils
+
+$config = Hackmac::Config.load
+
+dev = ARGV.shift or fail "need usb device"
+
+mountpoint = '/Volumes/USB'
+mountpoint_efi = '/Volumes/USB_EFI'
+
+if File.directory?(mountpoint)
+  puts " *** #{mountpoint} already mounted!".red
+  exit 1
+end
+
+if File.directory?(mountpoint_efi)
+  puts " *** #{mountpoint_efi} already mounted!".red
+  exit 1
+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 %{sudo mkdir -p #{mountpoint_efi.inspect}}
+x %{sudo mount -t msdos #{(dev + "s1").inspect} #{mountpoint_efi.inspect}}
+cd mountpoint_efi do
+  x %{git init}
+  x %{git remote add origin #{$config.efi.source.inspect}}
+  x %{git pull origin master}
+end
+
+x %{sudo "#{$config.usb.os}/Contents/Resources/createinstallmedia" --volume #{mountpoint.inspect} --nointeraction}

data/hackmac.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 0.2.1 ruby lib
+# stub: hackmac 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "0.2.1"
+  s.version = "0.3.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-29"
-  s.description = "This ruby gem provides Some useful tools for working with a Hackintosh.".freeze
+  s.date = "2020-01-30"
+  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]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.rb".freeze, "lib/hackmac/version.rb".freeze]
-  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.executables = ["gfxmon".freeze, "usb".freeze, "efi".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "bin/usb".freeze, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_source.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/search_ui.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.1.2".freeze

data/lib/hackmac/config.rb

@@ -9,6 +9,10 @@ module Hackmac
 
     DEFAULT = <<~end
       ---
+      efi:
+        source: 'https://github.com/flori/EFI-some.git'
+      usb:
+        os: '/Applications/Install macOS Mojave.app'
       devices:
         boot:
           name: EFI

data/lib/hackmac/utils.rb

@@ -0,0 +1,35 @@
+require 'term/ansicolor'
+class String
+  include Term::ANSIColor
+end
+require 'tabulo'
+require 'fileutils'
+require 'tmpdir'
+
+module Hackmac
+  module Utils
+    include FileUtils
+
+    def x(cmd, verbose: true)
+      prompt = cmd =~ /\A\s*sudo/ ? ?# : ?$
+      output = `#{cmd}`
+      if $?.success?
+        print "#{prompt} #{cmd}".green
+        puts verbose ? "" : " >/dev/null".yellow
+      else
+        print "#{prompt} #{cmd}".red
+        puts verbose ? "" : " >/dev/null".yellow
+        STDERR.puts "command #{cmd.inspect} failed with exit status #{$?.exitstatus}".on_red.white
+      end
+      if verbose
+        print output.italic
+      end
+      output
+    end
+
+    def ask(prompt)
+      print prompt.bold.yellow
+      gets =~ /\Ay/i
+    end
+  end
+end

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '0.2.1'
+  VERSION         = '0.3.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/hackmac.rb

@@ -10,3 +10,4 @@ require 'hackmac/disks'
 require 'hackmac/kext'
 require 'hackmac/kext_source'
 require 'hackmac/config'
+require 'hackmac/utils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -108,10 +108,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This ruby gem provides Some useful tools for working with a Hackintosh.
+description: This ruby gem provides some useful tools for working with a Hackintosh.
 email: flori@ping.de
 executables:
 - gfxmon
+- usb
 - efi
 extensions: []
 extra_rdoc_files:
@@ -123,6 +124,7 @@ extra_rdoc_files:
 - lib/hackmac/kext_source.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/search_ui.rb
+- lib/hackmac/utils.rb
 - lib/hackmac/version.rb
 files:
 - ".gitignore"
@@ -132,6 +134,7 @@ files:
 - VERSION
 - bin/efi
 - bin/gfxmon
+- bin/usb
 - hackmac.gemspec
 - lib/hackmac.rb
 - lib/hackmac/config.rb
@@ -140,6 +143,7 @@ files:
 - lib/hackmac/kext_source.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/search_ui.rb
+- lib/hackmac/utils.rb
 - lib/hackmac/version.rb
 homepage: http://github.com/flori/hackmac
 licenses: []