macinbox 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5472297e42bb8639ae2b3836c413ad3c17d829e
-  data.tar.gz: 45862365431afda4324062325adde12e34195736
+  metadata.gz: 4ee4d67b450ca74ecfba384c6402b6f2b74ff719
+  data.tar.gz: a84c7f8b3b00d42e6d344f1412af7002cbde2ddd
 SHA512:
-  metadata.gz: 6962181df97dead1de07465530ef7cb912690aa8dbd75e1eac7f439e8fb00a8b94665eec0a77e333db735e86b177166e5afadb63d34a36dec77e502278aae299
-  data.tar.gz: 6e905fd6a12e150821afb8eb80bc277b6f0e48cb6c2a121036919e1acf0c7aaabfe18f311b8ed8ae6265c73ad9c01af3d4d9c4307f674fc92b639ee7d7cb5821
+  metadata.gz: 9a31753aa8348fafbc0db1f49be3278e4f140a2eadf308ed31cae39ee9519714454db24e6771a06bc6c86e1ceaa44de22122b9f8930fb7b5484170e223cc2e71
+  data.tar.gz: 85ee7aabb5f3a9fa4cf6fd483a621da83c354be8486b67fe5b2c9b443e28d9d9612bac1672e41fa2d4144a7e9f50fbafabbaaa364f0cebff841a72ae386e965f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    macinbox (1.2.1)
+    macinbox (2.0.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,6 +1,6 @@
 # macinbox
 
-Puts macOS High Sierra in a Vagrant box.
+Puts macOS Mojave in a Vagrant box.
 
 <p align=center>
   <img src="https://raw.githubusercontent.com/bacongravy/macinbox/demo/demo.gif">
@@ -11,7 +11,7 @@ Supports creating boxes in either the 'vmware_fusion' or 'parallels' formats.
 
 ## System Requirements
 
-* macOS 10.13 High Sierra host operating system
+* macOS 10.14 Mojave host operating system
 * At least 8 GB RAM (16 GB recommended)
 * At least 2 cores (4 recommended)
 * At least 100 GB of available disk space
@@ -20,17 +20,17 @@ Supports creating boxes in either the 'vmware_fusion' or 'parallels' formats.
 
 The following software is required. Versions other than those mentioned may work, but these are the latest versions tested:
 
-* [macOS 10.13.5 High Sierra installer application](http://appstore.com/mac/macoshighsierra)
-* [Vagrant 2.1.1](https://www.vagrantup.com/)
+* [macOS 10.14 Mojave installer application](http://appstore.com/mac/macosmojave)
+* [Vagrant 2.1.5](https://www.vagrantup.com/)
 
 To create and boot a box in the 'vmware_fusion' format you must also have:
 
-* [VMware Fusion Pro 10.1.2](http://www.vmware.com/products/fusion.html)
+* [VMware Fusion Pro 10.1.3](http://www.vmware.com/products/fusion.html)
 * [Vagrant VMware Fusion Provider 5.0.4](https://www.vagrantup.com/vmware/)
 
 To create and boot a box in the 'parallels' format you must also have:
 
-* [Parallels Desktop 13 for Mac Pro Edition 13.3.0](https://www.parallels.com/products/desktop/)
+* [Parallels Desktop 13 for Mac Pro Edition 13.3.2](https://www.parallels.com/products/desktop/)
 * [Vagrant Parallels Provider 1.7.8](https://parallels.github.io/vagrant-parallels/)
 
 ## Installation
@@ -66,7 +66,7 @@ Usage: macinbox [options]
 
     -n, --name NAME                  Name of the box         (default: macinbox)
     -d, --disk SIZE                  Size (GB) of the disk   (default: 64)
-    -t, --fstype TYPE                Type for disk format    (default: HFS+J)
+    -t, --fstype TYPE                Type for disk format    (default: APFS)
     -m, --memory SIZE                Size (MB) of the memory (default: 2048)
     -c, --cpu COUNT                  Number of virtual cores (default: 2)
     -s, --short NAME                 Short name of the user  (default: vagrant)
@@ -107,6 +107,7 @@ By default `macinbox` will create a Vagrant box in the 'vmware_fusion' format wi
 
 This tool performs the following actions:
 
+1. Wraps the installer app in a disk image
 1. Creates a new blank disk image
 1. Installs macOS
 1. Installs the VMware or Parallels tools

data/lib/macinbox/actions/create_image_from_installer.rb

@@ -41,6 +41,7 @@ module Macinbox
       def run
         create_temp_dir
         check_macos_versions
+        create_wrapper_image
         create_scratch_image
         install_macos
         create_rc_vagrant
@@ -66,10 +67,10 @@ module Macinbox
 
       def check_macos_versions
         Logger.info "Checking macOS versions..." do
-          @install_info_plist = "#{@installer_app}/Contents/SharedSupport/InstallInfo.plist"
-          raise Macinbox::Error.new("InstallInfo.plist not found in installer app bundle") unless File.exist? @install_info_plist
+          install_info_plist = "#{@installer_app}/Contents/SharedSupport/InstallInfo.plist"
+          raise Macinbox::Error.new("InstallInfo.plist not found in installer app bundle") unless File.exist? install_info_plist
 
-          installer_os_version = Task.backtick %W[ /usr/libexec/PlistBuddy -c #{'Print :System\ Image\ Info:version'} #{@install_info_plist} ]
+          installer_os_version = Task.backtick %W[ /usr/libexec/PlistBuddy -c #{'Print :System\ Image\ Info:version'} #{install_info_plist} ]
           installer_os_version_components = installer_os_version.split(".") rescue [0, 0, 0]
           installer_os_version_major = installer_os_version_components[0]
           installer_os_version_minor = installer_os_version_components[1]
@@ -81,16 +82,25 @@ module Macinbox
           host_os_version_minor = host_os_version_components[1]
           Logger.info "Host macOS version detected: #{host_os_version}" if @debug
 
-          if installer_os_version_major != "10" || installer_os_version_minor != "13"
-            raise Macinbox::Error.new("installer OS version must be 10.13, not #{installer_os_version}")
-          end
-
           if installer_os_version_major != host_os_version_major || installer_os_version_minor != host_os_version_minor
             raise Macinbox::Error.new("host OS version (#{host_os_version}) and installer OS version (#{installer_os_version}) do not match")
           end
         end
       end
 
+      def create_wrapper_image
+        Logger.info "Creating and attaching wrapper disk image..." do
+          @collector.on_cleanup do
+            %x( hdiutil detach -quiet -force #{@wrapper_mountpoint.shellescape} > /dev/null 2>&1 ) if @wrapper_mountpoint
+          end
+          @wrapper_mountpoint = "/Volumes/#{File.basename @installer_app, ".app"}"
+          @wrapper_image = "#{@temp_dir}/wrapper.dmg"
+          quiet_flag = @debug ? [] : %W[ -quiet ]
+          Task.run %W[ hdiutil create -srcfolder #{@installer_app} #{@wrapper_image} ] + quiet_flag
+          Task.run %W[ hdiutil attach #{@wrapper_image} -nobrowse ] + quiet_flag
+        end
+      end
+
       def create_scratch_image
         Logger.info "Creating and attaching a new blank disk image..." do
           @collector.on_cleanup do
@@ -108,7 +118,9 @@ module Macinbox
       def install_macos
         Logger.info "Installing macOS..." do
           activity = Logger.prefix + "installer"
-          cmd = %W[ installer -verboseR -dumplog -pkg #{@install_info_plist} -target #{@scratch_mountpoint} ]
+          install_info_plist = "#{@wrapper_mountpoint}/#{File.basename @installer_app}/Contents/SharedSupport/InstallInfo.plist"
+          Task.run %W[ touch #{@scratch_mountpoint}/.macinbox ]
+          cmd = %W[ installer -verboseR -dumplog -pkg #{install_info_plist} -target #{@scratch_mountpoint} ]
           opts = @debug ? {} : { :err => [:child, :out] }
           Task.run_with_progress activity, cmd, opts do |line|
             /^installer:%(.*)$/.match(line)[1].to_f rescue nil
@@ -121,14 +133,14 @@ module Macinbox
         @scratch_rc_vagrant = "#{@scratch_mountpoint}/private/etc/rc.vagrant"
         File.write scratch_rc_installer_cleanup, <<~EOF
           #!/bin/sh
-          rm /etc/rc.installer_cleanup
+          rm -f /etc/rc.installer_cleanup
           /etc/rc.vagrant &
           exit 0
         EOF
         FileUtils.chmod 0755, scratch_rc_installer_cleanup
         File.write @scratch_rc_vagrant, <<~EOF
           #!/bin/sh
-          rm /etc/rc.vagrant
+          rm -f /etc/rc.vagrant
         EOF
         FileUtils.chmod 0755, @scratch_rc_vagrant
       end

data/lib/macinbox/cli/options.rb

@@ -10,11 +10,11 @@ module Macinbox
       :box_format      => "vmware_fusion",
       :box_name        => "macinbox",
       :disk_size       => 64,
-      :fstype          => "HFS+J",
+      :fstype          => "APFS",
       :memory_size     => 2048,
       :cpu_count       => 2,
       :short_name      => "vagrant",
-      :installer_path  => "/Applications/Install macOS High Sierra.app",
+      :installer_path  => "/Applications/Install macOS Mojave.app",
       :vmware_path     => "/Applications/VMware Fusion.app",
       :parallels_path  => "/Applications/Parallels Desktop.app",
       :vmware_tools    => true,
@@ -37,7 +37,7 @@ module Macinbox
         o.separator ''
         o.on('-n', '--name NAME',          'Name of the box         (default: macinbox)') { |v| @options[:box_name] = v }
         o.on('-d', '--disk SIZE',          'Size (GB) of the disk   (default: 64)')       { |v| @options[:disk_size] = v }
-        o.on('-t', '--fstype TYPE',        'Type of FS on the disk  (default: HFS+J)')    { |v| @options[:fstype] = v }
+        o.on('-t', '--fstype TYPE',        'Type of FS on the disk  (default: APFS)')     { |v| @options[:fstype] = v }
         o.on('-m', '--memory SIZE',        'Size (MB) of the memory (default: 2048)')     { |v| @options[:memory_size] = v }
         o.on('-c', '--cpu COUNT',          'Number of virtual cores (default: 2)')        { |v| @options[:cpu_count] = v }
         o.on('-s', '--short NAME',         'Short name of the user  (default: vagrant)')  { |v| @options[:short_name] = v }

data/lib/macinbox/version.rb

@@ -1,3 +1,3 @@
 module Macinbox
-  VERSION = "1.2.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macinbox
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - David Kramer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler