macinbox 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2a594235efaa64200b529ebc1c4ab30ff909c6
-  data.tar.gz: 68437f1cbc1a769f04999a164a6c32119c0199ed
+  metadata.gz: 56a162b7814012ac1d148abdbec556b1ad44c947
+  data.tar.gz: 0f6bb9b0154454670a525045fc40627462d84e21
 SHA512:
-  metadata.gz: ee1c7791bcb9095c3187f13c4f80317dae432db3c459651a22ed91b5688805019160d15fa3d5fe2d852f36a952a581ef95e5d6953b55ef69245cbce400ec1e98
-  data.tar.gz: 8c3fc0a38c08dadaa6eac5e93ae07f433a4ede8661b2cb364bacc1d2883984af5e9ec95c80421842f55d655de6ff82f848261f44fa3f0e11dc574d402905c5c2
+  metadata.gz: aa4a303bfdf7567dad85868082c79ed8e3305f6a72245f043995c0d4d2ae08fd1c07a95f197dcae949b1801e202a84e47fbe9e7aa7b40d6fe4c0478fa9ffb1ba
+  data.tar.gz: 3a3f827be1a640ec9394344bc0a5e5695a9f6304587203d9ddeb1ebbc5c050db8ffe43f15ac73e35952da1c86316ecf528c663037d46548f587653b06f3df2c9

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.1.0 (January 21, 2019)
+
+FEATURES:
+
+- Add support for virtualbox box format. [GH-18]
+
+BUG FIXES:
+
+- Make vagrant ssh key installation more reliable.
+- Update gemspec requirements for Mojave. [GH-17]
+
 ## 3.0.0 (December 14, 2018)
 
 FEATURES:

data/Gemfile.lock

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

data/README.md

@@ -7,7 +7,7 @@ Puts macOS Mojave in a Vagrant box.
   <i>Some sequences shortened. Original run time 14.5 minutes.</i>
 </p>
 
-Supports creating boxes in either the 'vmware_fusion', 'vmware_desktop' or 'parallels' formats.
+Supports creating boxes in either the 'vmware_fusion', 'vmware_desktop', 'parallels', or 'virtualbox' formats.
 
 ## System Requirements
 
@@ -20,8 +20,8 @@ Supports creating boxes in either the 'vmware_fusion', 'vmware_desktop' or 'para
 
 The following software is required. Versions other than those mentioned may work, but these are the latest versions tested:
 
-* [macOS 10.14.1 Mojave installer application](http://appstore.com/mac/macosmojave)
-* [Vagrant 2.2.2](https://www.vagrantup.com/)
+* [macOS 10.14.2 Mojave installer application](http://appstore.com/mac/macosmojave)
+* [Vagrant 2.2.3](https://www.vagrantup.com/)
 
 To create and boot a box in the 'vmware_fusion' or 'vmware_desktop' formats you must also have:
 
@@ -32,9 +32,13 @@ To create and boot a box in the 'vmware_fusion' or 'vmware_desktop' formats you
 
 To create and boot a box in the 'parallels' format you must also have:
 
-* [Parallels Desktop 14 for Mac Pro Edition 14.0.1](https://www.parallels.com/products/desktop/)
+* [Parallels Desktop 14 for Mac Pro Edition 14.1.0](https://www.parallels.com/products/desktop/)
 * [Vagrant Parallels Provider 1.7.8](https://parallels.github.io/vagrant-parallels/)
 
+To create and boot a box in the 'virtualbox' format you must also have:
+
+* [VirtualBox 6.0.2 with the extension pack](https://www.virtualbox.org)
+
 ## Installation
 
 Install the gem:
@@ -107,7 +111,11 @@ By default `macinbox` will configure the guest OS to have HiDPI resolutions enab
 
 ## Box Format Support
 
-By default `macinbox` will create a Vagrant box in the 'vmware_desktop' format with the VMware Tools pre-installed. When the box format is set to 'parallels' using the `--box-format` option then the Parallels Tools are pre-installed instead.
+By default `macinbox` will create a Vagrant box in the 'vmware_desktop' format with the VMware Tools pre-installed.
+
+When the box format is set to 'parallels' using the `--box-format` option then the Parallels Tools are pre-installed instead.
+
+When the box format is set to 'virtualbox' no guest extensions are installed. Note that some features behave differently with VirtualBox. The screen resolution is set to 1280x800 and HiDPI resolutions are not supported. The GUI scale factor is set to 2.0 (so that the VM displays properly on a host with a retina display) unless the `--no-hidpi` option is used. Lastly, ssh port-forwarding is enabled by default so that the host can connect to the guest.
 
 ## Implementation Details
 
@@ -131,7 +139,7 @@ This tool performs the following actions:
 The box created by this tool includes a built-in Vagrantfile which disables the following default Vagrant behaviors:
 
 1. Checking Vagrant Cloud for new versions of the box
-1. Forwarding from port 2222 on the host to port 22 (ssh) on the guest
+1. Forwarding from port 2222 on the host to port 22 (ssh) on the guest (VMware Fusion and Parallels Desktop only)
 1. Sharing the root folder of the Vagrant environment as '/vagrant' on the guest
 
 To re-enable the default ssh port forwarding you can add the following line to your environment's Vagrantfile:
@@ -157,6 +165,7 @@ This project was inspired by the great work of others:
 * https://github.com/boxcutter/macos
 * https://github.com/chilcote/vfuse
 * http://www.modtitan.com/2017/10/lazy-vm-building-hacks-with-autodmg-and.html
+* https://github.com/AlexanderWillner/runMacOSinVirtualBox
 
 ## Why?
 
@@ -181,18 +190,16 @@ opts = Macinbox::CLI::DEFAULT_OPTION_VALUES
 opts[:collector] = Macinbox::Collector.new
 opts[:full_name] = "Vagrant"
 opts[:password] = "vagrant"
-opts[:box_format] = "parallels"
+opts[:box_format] = "virtualbox"
 opts[:image_path] = "macinbox.dmg"
-opts[:vmdk_path] = "macinbox.vmdk"
-opts[:hdd_path] = "macinbox.hdd"
+opts[:vdi_path] = "macinbox.vdi"
 opts[:box_path] = "macinbox.box"
 opts[:boxes_dir] = File.expand_path "~/.vagrant.d"
 opts[:debug] = true
 include Macinbox::Actions
 CreateImageFromInstaller.new(opts).run
-CreateVMDKFromImage.new(opts).run
-CreateHDDFromVMDK.new(opts).run
-CreateBoxFromHDD.new(opts).run
+CreateVDIFromImage.new(opts).run
+CreateBoxFromVDI.new(opts).run
 ```
 
 To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/lib/macinbox/actions/create_box_from_vdi.rb

@@ -0,0 +1,86 @@
+require 'fileutils'
+require 'rubygems/package'
+
+require 'macinbox/error'
+require 'macinbox/logger'
+require 'macinbox/task'
+
+module Macinbox
+
+  module Actions
+
+    class CreateBoxFromVDI
+
+      def initialize(opts)
+        @input_vdi         = opts[:vdi_path]        or raise ArgumentError.new(":vdi_path not specified")
+        @output_path       = opts[:box_path]        or raise ArgumentError.new(":box_path not specified")
+
+        @box_name          = opts[:box_name]        or raise ArgumentError.new(":box_name not specified")
+        @cpu_count         = opts[:cpu_count]       or raise ArgumentError.new(":cpu_count not specified")
+        @memory_size       = opts[:memory_size]     or raise ArgumentError.new(":memory_size not specified")
+
+        @gui               = opts[:gui]
+        @fullscreen        = opts[:fullscreen]
+        @hidpi             = opts[:hidpi]
+
+        @collector         = opts[:collector]       or raise ArgumentError.new(":collector not specified")
+        @debug             = opts[:debug]
+
+        raise Macinbox::Error.new("VDI not found") unless File.exist? @input_vdi
+      end
+
+      def run
+        @temp_dir = Task.backtick %W[ /usr/bin/mktemp -d -t create_box_from_vdi ]
+        @collector.add_temp_dir @temp_dir
+
+        Logger.info "Assembling the box contents..." do
+
+          @box_dir = "#{@temp_dir}/#{@box_name}.box"
+
+          FileUtils.mkdir @box_dir
+
+          File.write "#{@box_dir}/metadata.json", <<~EOF
+            {"provider": "virtualbox"}
+          EOF
+
+          File.write "#{@box_dir}/Vagrantfile", <<~EOF
+            Vagrant.configure(2) do |config|
+              config.vm.box_check_update = false
+              config.vm.synced_folder ".", "/vagrant", disabled: true
+              config.vm.provider "virtualbox" do |v|
+                v.gui = #{@gui}
+              end
+            end
+          EOF
+
+          task_opts = @debug ? {} : { :out => File::NULL }
+
+          Task.run %W[ VBoxManage createvm --register --name macinbox --ostype MacOS1013_64 ] + [task_opts]
+
+          @collector.on_cleanup do
+            Task.run %W[ VBoxManage unregistervm macinbox --delete ] + [task_opts]
+          end
+
+          Task.run %W[ VBoxManage modifyvm macinbox --usbxhci on --memory #{@memory_size} --vram 128 --cpus #{@cpu_count} --firmware efi --chipset ich9 --mouse usbtablet --keyboard usb ] + [task_opts]
+          Task.run %W[ VBoxManage setextradata macinbox CustomVideoMode1 1280x800x32 ] + [task_opts]
+          Task.run %W[ VBoxManage setextradata macinbox VBoxInternal2/EfiGraphicsResolution 1280x800 ] + [task_opts]
+          Task.run %W[ VBoxManage setextradata macinbox GUI/ScaleFactor 2.0 ] + [task_opts] if @hidpi
+          Task.run %W[ VBoxManage storagectl macinbox --name #{"SATA Controller"} --add sata --controller IntelAHCI --hostiocache on ] + [task_opts]
+          Task.run %W[ VBoxManage storageattach macinbox --storagectl #{"SATA Controller"} --port 0 --device 0 --type hdd --nonrotational on --medium #{@input_vdi} ] + [task_opts]
+          Task.run %W[ VBoxManage modifyvm macinbox --boot1 disk ] + [task_opts]
+          Task.run %W[ VBoxManage export macinbox -o #{@box_dir}/box.ovf ] + [task_opts]
+
+        end
+
+        Logger.info "Moving the box to the destination..." do
+          FileUtils.chown_R ENV["SUDO_USER"], nil, @box_dir
+          FileUtils.mv @box_dir, @output_path
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/macinbox/actions/create_hdd_from_image.rb

@@ -102,7 +102,8 @@ module Macinbox
           FileUtils.mv "#{@temp_dir}/macinbox.hdd", @output_path
         end
 
-        Task.run %W[ /usr/sbin/diskutil eject #{@device.shellescape} ]
+        task_opts = @debug ? {} : { :out => File::NULL }
+        Task.run %W[ /usr/sbin/diskutil eject #{@device.shellescape} ] + [task_opts]
         @device = nil
 
       end

data/lib/macinbox/actions/create_image_from_installer.rb

@@ -43,6 +43,10 @@ module Macinbox
         check_macos_versions
         create_wrapper_image
         create_scratch_image
+        case @box_format
+        when /^virtualbox$/
+          setup_efi_partition
+        end
         install_macos
         create_rc_vagrant
         case @box_format
@@ -112,7 +116,36 @@ module Macinbox
           FileUtils.mkdir @scratch_mountpoint
           quiet_flag = @debug ? [] : %W[ -quiet ]
           Task.run %W[ /usr/bin/hdiutil create -size #{@disk_size}g -type SPARSE -fs #{@fstype} -volname #{"Macintosh HD"} -uid 0 -gid 80 -mode 1775 #{@scratch_image} ] + quiet_flag
-          Task.run %W[ /usr/bin/hdiutil attach #{@scratch_image} -mountpoint #{@scratch_mountpoint} -nobrowse -owners on ] + quiet_flag
+          devices = Task.backtick %W[ /usr/bin/hdiutil attach #{@scratch_image} -mountpoint #{@scratch_mountpoint} -nobrowse -owners on ]
+          puts devices if @debug
+          @efi_device = devices[/([^ \n]*)([ \t])+EFI/, 1]
+        end
+      end
+
+      def setup_efi_partition
+        Logger.info "Setting up EFI partition..." do
+          @efi_mountpoint = "#{@temp_dir}/efi_mountpoint"
+          FileUtils.mkdir @efi_mountpoint
+          opts = @debug ? {} : { :out => File::NULL }
+          Task.run %W[ /usr/sbin/diskutil mount -mountPoint #{@efi_mountpoint} #{@efi_device} ] + [opts]
+          Task.run %W[ /bin/mkdir -p #{@efi_mountpoint}/EFI/drivers ]
+          Task.run %W[ /bin/cp /usr/standalone/i386/apfs.efi #{@efi_mountpoint}/EFI/drivers/ ]
+          File.write "#{@efi_mountpoint}/startup.nsh", <<~'EOF'
+            @echo -off
+            echo "Loading APFS driver..."
+            load "fs0:\EFI\drivers\apfs.efi"
+            echo "Refreshing media mappings..."
+            map -r
+            echo "Searching for bootloader..."
+            for %d in fs1 fs2 fs3 fs4 fs5 fs6
+              if exist "%d:\System\Library\CoreServices\boot.efi" then
+                echo "Found %d:\System\Library\CoreServices\boot.efi, launching..."
+                "%d:\System\Library\CoreServices\boot.efi"
+              endif
+            endfor
+            echo "Failed."
+          EOF
+          Task.run %W[ /usr/sbin/diskutil unmount #{@efi_device} ] + [opts]
         end
       end
 
@@ -300,11 +333,12 @@ module Macinbox
         if @short_name == "vagrant"
           Logger.info "Installing the default insecure vagrant ssh key..." do
             contents = <<~EOF
-              #!/bin/sh
-              rm /etc/rc.vagrant
               while [ ! -e /Users/vagrant ]; do
                 sleep 1
               done
+              while [ `stat -f %u /Users/vagrant` == 0 ]; do
+                sleep 1
+              done
               if [ ! -e /Users/vagrant/.ssh ]; then
                 mkdir /Users/vagrant/.ssh
                 chmod 0700 /Users/vagrant/.ssh

data/lib/macinbox/actions/create_vdi_from_image.rb

@@ -0,0 +1,62 @@
+require 'fileutils'
+require 'shellwords'
+
+require 'macinbox/error'
+require 'macinbox/logger'
+require 'macinbox/task'
+
+module Macinbox
+
+  module Actions
+
+    class CreateVDIFromImage
+
+      def initialize(opts)
+        @input_image       = opts[:image_path]  or raise ArgumentError.new(":image_path not specified")
+        @output_path       = opts[:vdi_path]    or raise ArgumentError.new(":vdi_path not specified")
+
+        @collector         = opts[:collector]   or raise ArgumentError.new(":collector not specified")
+        @debug             = opts[:debug]
+
+        raise Macinbox::Error.new("input image not found")   unless File.exist? @input_image
+      end
+
+      def run
+        @temp_dir = Task.backtick %W[ /usr/bin/mktemp -d -t create_vdi_from_image ]
+        @collector.add_temp_dir @temp_dir
+
+        Logger.info "Attaching the image..." do
+
+          @collector.on_cleanup do
+            %x( /usr/sbin/diskutil eject #{@device.shellescape} > /dev/null 2>&1 ) if @device
+          end
+
+          @device = %x(
+            /usr/bin/hdiutil attach #{@input_image.shellescape} -nomount |
+            /usr/bin/grep _partition_scheme |
+            /usr/bin/cut -f1 |
+            /usr/bin/tr -d [:space:]
+          )
+
+          raise Macinbox::Error.new("failed to attach the image") unless File.exist? @device
+        end
+
+        Logger.info "Converting the image to VDI format..." do
+          task_opts = @debug ? {} : { :out => File::NULL }
+          Task.run %W[ VBoxManage convertfromraw #{@device} #{@temp_dir}/macinbox.vdi --format VDI ] + [task_opts]
+          Task.run %W[ /usr/sbin/diskutil eject #{@device} ] + [task_opts]
+          @device = nil
+        end
+
+        Logger.info "Moving the VDI to the destination..." do
+          FileUtils.chown ENV["SUDO_USER"], nil, "#{@temp_dir}/macinbox.vdi"
+          FileUtils.mv "#{@temp_dir}/macinbox.vdi", @output_path
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/macinbox/actions/create_vmdk_from_image.rb

@@ -44,13 +44,14 @@ module Macinbox
         end
 
         Logger.info "Converting the image to VMDK format..." do
+          task_opts = @debug ? {} : { :out => File::NULL }
           rawdiskCreator = "#{@vmware_fusion_app}/Contents/Library/vmware-rawdiskCreator"
           vdiskmanager = "#{@vmware_fusion_app}/Contents/Library/vmware-vdiskmanager"
           Dir.chdir(@temp_dir) do
-            Task.run %W[ #{rawdiskCreator} create #{@device} fullDevice rawdisk lsilogic ]
-            Task.run %W[ #{vdiskmanager} -t 0 -r rawdisk.vmdk macinbox.vmdk ]
+            Task.run %W[ #{rawdiskCreator} create #{@device} fullDevice rawdisk lsilogic ] + [task_opts]
+            Task.run %W[ #{vdiskmanager} -t 0 -r rawdisk.vmdk macinbox.vmdk ] + [task_opts]
           end
-          Task.run %W[ /usr/sbin/diskutil eject #{@device.shellescape} ]
+          Task.run %W[ /usr/sbin/diskutil eject #{@device.shellescape} ] + [task_opts]
           @device = nil
         end
 

data/lib/macinbox/actions.rb

@@ -1,6 +1,8 @@
 require "macinbox/actions/create_box_from_hdd"
+require "macinbox/actions/create_box_from_vdi"
 require "macinbox/actions/create_box_from_vmdk"
 require "macinbox/actions/create_hdd_from_image"
 require "macinbox/actions/create_image_from_installer"
+require "macinbox/actions/create_vdi_from_image"
 require "macinbox/actions/create_vmdk_from_image"
 require "macinbox/actions/install_box"

data/lib/macinbox/cli.rb

@@ -33,7 +33,7 @@ module Macinbox
         raise Macinbox::Error.new("Installer app not found: #{@options[:installer_path]}")
       end
 
-      if not ["vmware_fusion", "vmware_desktop", "parallels"].include? @options[:box_format]
+      if not ["vmware_fusion", "vmware_desktop", "parallels", "virtualbox"].include? @options[:box_format]
         raise Macinbox::Error.new("Box format not supported: #{@options[:box_format]}")
       end
 
@@ -45,6 +45,10 @@ module Macinbox
         raise Macinbox::Error.new("Parallels Desktop app not found: #{@options[:parallels_path]}")
       end
 
+      if /^virtualbox$/ === @options[:box_format] && !File.exists?('/usr/local/bin/VBoxManage')
+        raise Macinbox::Error.new("VBoxManage not found: /usr/local/bin/VBoxManage")
+      end
+
       vagrant_home = ENV["VAGRANT_HOME"]
 
       if vagrant_home.nil? or vagrant_home.empty?
@@ -100,6 +104,7 @@ module Macinbox
       @options[:image_path] = "macinbox.dmg"
       @options[:vmdk_path] = "macinbox.vmdk"
       @options[:hdd_path] = "macinbox.hdd"
+      @options[:vdi_path] = "macinbox.vdi"
       @options[:box_path] = "macinbox.box"
       @options[:boxes_dir] = vagrant_boxes_dir
       @options[:collector] = collector
@@ -132,6 +137,16 @@ module Macinbox
             Actions::CreateBoxFromHDD.new(@options).run
           end
 
+        when /^virtualbox$/
+
+          Logger.info "Creating VDI from image..." do
+            Actions::CreateVDIFromImage.new(@options).run
+          end
+
+          Logger.info "Creating box from VDI..." do
+            Actions::CreateBoxFromVDI.new(@options).run
+          end
+
         end
 
         Logger.info "Installing box..." do

data/lib/macinbox/version.rb

@@ -1,3 +1,3 @@
 module Macinbox
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/macinbox.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 2.3'
 
-  s.requirements << "macOS High Sierra"
-  s.requirements << "macOS High Sierra installer app"
+  s.requirements << "macOS Mojave"
+  s.requirements << "macOS Mojave installer app"
   s.requirements << "Vagrant"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macinbox
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - David Kramer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,9 +60,11 @@ files:
 - lib/macinbox.rb
 - lib/macinbox/actions.rb
 - lib/macinbox/actions/create_box_from_hdd.rb
+- lib/macinbox/actions/create_box_from_vdi.rb
 - lib/macinbox/actions/create_box_from_vmdk.rb
 - lib/macinbox/actions/create_hdd_from_image.rb
 - lib/macinbox/actions/create_image_from_installer.rb
+- lib/macinbox/actions/create_vdi_from_image.rb
 - lib/macinbox/actions/create_vmdk_from_image.rb
 - lib/macinbox/actions/install_box.rb
 - lib/macinbox/cli.rb
@@ -93,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- macOS High Sierra
-- macOS High Sierra installer app
+- macOS Mojave
+- macOS Mojave installer app
 - Vagrant
 rubyforge_project: 
 rubygems_version: 2.5.2.3