macinbox 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4fd86ebc362ca110c77ef00be5cd36ecad02437
-  data.tar.gz: 43703a6f014a4a094207fae1acb5e48ef060991e
+  metadata.gz: 5e8ada3102753fe30348667d4fbfb2e5aa178f39
+  data.tar.gz: 6bef79877bad0fde8bc350966ce45247053ce461
 SHA512:
-  metadata.gz: a3724efdec38d195f6e8fac67df6039a5ebf88478d9f7db62f4aa9fee7db92c3baf60ba5de8955b815020e6fc3429a711cb1af24ecd6591cccc4de7ecca332c7
-  data.tar.gz: 6cbcd6f11e0d385c98b7e9ead7ab5f0fc559f72b5f9cd4b1538ef62f073c2d3bdc03840b1f341af336d69d304fdf3025c74e8c8d417ac1dd2825b61103cdad5e
+  metadata.gz: 3cde4d8b3f4a76d5dc57239f499a0421f833fcd72e64a3db10a00f5b9aaab99d00edf10d9b1fd860a193ff724974ae11e2f1677627e734aa44e4257219698835
+  data.tar.gz: 4e463fe8c9daff3163aa27527f80993fe247fed5124aa162670cae896753e889e948770a73bf02707fb466e75c9f46e9838dec59f4af50e0a1b19720b7fb3564

data/Gemfile.lock

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

data/README.md

@@ -14,37 +14,24 @@ Supports creating boxes in either the 'vmware_fusion' or 'parallels' formats.
 * macOS 10.13 High Sierra host operating system
 * At least 8 GB RAM (16 GB recommended)
 * At least 2 cores (4 recommended)
-* At least 30 GB of available disk space (60 GB recommended)
+* At least 100 GB of available disk space
 
 ## Dependencies
 
 The following software is required. Versions other than those mentioned may work, but these are the latest versions tested:
 
-* macOS 10.13.3 High Sierra installer application
-* Vagrant 2.0.3
+* [macOS 10.13.4 High Sierra installer application](http://appstore.com/mac/macoshighsierra)
+* [Vagrant 2.0.3](https://www.vagrantup.com/)
 
 To create and boot a box in the 'vmware_fusion' format you must also have:
 
-* VMware Fusion Pro 10.1.1
-* Vagrant VMware Fusion Provider 5.0.4
+* [VMware Fusion Pro 10.1.1](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:
 
-* VMware Fusion Pro 10.1.1
-* Parallels Desktop 13 for Mac Pro Edition 13.3.0
-* Vagrant Parallels Provider 1.7.8
-
-[Get macOS 10.13 High Sierra installer application](http://appstore.com/mac/macoshighsierra)
-//
-[Get Vagrant](https://www.vagrantup.com/)
-//
-[Get VMware Fusion](http://www.vmware.com/products/fusion.html)
-//
-[Get Vagrant VMware Fusion Provider](https://www.vagrantup.com/vmware/)
-//
-[Get Parallels Desktop](https://www.parallels.com/products/desktop/)
-//
-[Get Vagrant Parallels Provider](https://parallels.github.io/vagrant-parallels/)
+* [Parallels Desktop 13 for Mac Pro Edition 13.3.0](https://www.parallels.com/products/desktop/)
+* [Vagrant Parallels Provider 1.7.8](https://parallels.github.io/vagrant-parallels/)
 
 ## Installation
 
@@ -115,23 +102,21 @@ By default `macinbox` will configure the guest OS to have HiDPI resolutions enab
 
 By default `macinbox` will create a Vagrant box in the 'vmware_fusion' 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.
 
-**Note:** Creating a 'parallels' box requires **both** VMware Fusion and Parallels Desktop to be installed.
-
 ## Implementation Details
 
 This tool performs the following actions:
 
 1. Creates a new blank disk image
 1. Installs macOS
-1. Installs the VMware tools
-1. Updates the SystemPolicyConfiguration KextPolicy to allow the VMware tools kernel extension to load automatically
+1. Installs the VMware or Parallels tools
+1. (VMware only) Updates the SystemPolicyConfiguration KextPolicy to allow the VMware tools kernel extension to load automatically
 1. Adds an .InstallerConfiguration file to automate the Setup Assistant app and create a user account on first boot
 1. Enables password-less sudo
 1. Enables sshd
 1. Adds an rc.installer_cleanup script which waits for the user account to be created on first boot and then installs the default insecure Vagrant SSH key in the user's home directory
 1. Enables HiDPI resolutions
-1. Converts the image into a VMDK
-1. Creates a Vagrant box for the VMware provider using the VMDK
+1. Converts the image into a virtual hard disk
+1. Creates a Vagrant box using the virtual hard disk
 1. Adds the box to Vagrant
 
 

data/lib/macinbox/actions/create_hdd_from_image.rb

@@ -0,0 +1,114 @@
+require 'fileutils'
+require 'shellwords'
+
+require 'macinbox/error'
+require 'macinbox/logger'
+require 'macinbox/task'
+
+module Macinbox
+
+  module Actions
+
+    class CreateHDDFromImage
+
+      def initialize(opts)
+        @input_image       = opts[:image_path]     or raise ArgumentError.new(":image_path not specified")
+        @output_path       = opts[:hdd_path]       or raise ArgumentError.new(":hdd_path not specified")
+        @parallels_app     = opts[:parallels_path] or raise ArgumentError.new(":parallels_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
+        raise Macinbox::Error.new("Parallels Desktop not found") unless File.exist? @parallels_app
+      end
+
+      def run
+        @temp_dir = Task.backtick %W[ /usr/bin/mktemp -d -t create_hdd_from_image ]
+        @collector.add_temp_dir @temp_dir
+
+        Logger.info "Attaching the image..." do
+
+          @collector.on_cleanup do
+            %x( diskutil eject #{@device.shellescape} > /dev/null 2>&1 ) if @device
+          end
+
+          @device = %x(
+            hdiutil attach #{@input_image.shellescape} -nomount |
+            grep _partition_scheme |
+            cut -f1 |
+            tr -d [:space:]
+          )
+
+          raise Macinbox::Error.new("failed to attach the image") unless File.exist? @device
+        end
+
+        Logger.info "Converting the image to HDD format..." do
+
+          disk_info = Task.backtick %W[ fdisk #{@device} ]
+
+          geometry_re = /geometry: (\d+)\/(\d+)\/(\d+) \[(\d+) sectors\]/
+
+          match = geometry_re.match(disk_info)
+
+          raise Macinbox::Error.new("failed to determine disk geometry") if match.nil? || match.captures.length != 4
+
+          device_sectors = match.captures[3]
+
+          device_cylinders = match.captures[0]
+          device_heads_per_track = match.captures[1]
+          device_sectors_per_track = match.captures[2]
+
+          bios_cylinders = 1024
+          bios_heads_per_track = device_heads_per_track
+          bios_sectors_per_track = device_sectors_per_track
+
+          File.write "#{@temp_dir}/macinbox.vmdk", <<~EOF
+            # Disk DescriptorFile
+            version=1
+            encoding="UTF-8"
+            CID=fffffffe
+            parentCID=ffffffff
+            isNativeSnapshot="no"
+            createType="monolithicFlat"
+
+            # Extent description
+            RW #{device_sectors} FLAT "#{@device}" 0
+
+            # The Disk Data Base
+            #DDB
+
+            ddb.adapterType = "lsilogic"
+            ddb.deletable = "true"
+            ddb.geometry.biosCylinders = "#{bios_cylinders}"
+            ddb.geometry.biosHeads = "#{bios_heads_per_track}"
+            ddb.geometry.biosSectors = "#{bios_sectors_per_track}"
+            ddb.geometry.cylinders = "#{device_cylinders}"
+            ddb.geometry.heads = "#{device_heads_per_track}"
+            ddb.geometry.sectors = "#{device_sectors_per_track}"
+            ddb.longContentID = "9fa218b506cfe68615c39994fffffffe"
+            ddb.uuid = "60 00 C2 99 91 76 dd 77-6e 0d 84 8b b0 24 6e 00"
+            ddb.virtualHWVersion = "14"
+          EOF
+
+          prl_convert = "#{@parallels_app}/Contents/MacOS/prl_convert"
+          task_opts = @debug ? {} : { :out => File::NULL }
+          Task.run %W[ #{prl_convert} #{@temp_dir}/macinbox.vmdk --allow-no-os --dst=#{@temp_dir} ] + [task_opts]
+
+        end
+
+        Logger.info "Moving the HDD to the destination..." do
+          FileUtils.chown_R ENV["SUDO_USER"], nil, "#{@temp_dir}/macinbox.hdd"
+          FileUtils.mv "#{@temp_dir}/macinbox.hdd", @output_path
+        end
+
+        Task.run %W[ diskutil eject #{@device.shellescape} ]
+        @device = nil
+
+      end
+
+    end
+
+  end
+
+end

data/lib/macinbox/actions/create_vmdk_from_image.rb

@@ -27,7 +27,7 @@ module Macinbox
         @temp_dir = Task.backtick %W[ /usr/bin/mktemp -d -t create_vmdk_from_image ]
         @collector.add_temp_dir @temp_dir
 
-        Logger.info "Mounting the image..." do
+        Logger.info "Attaching the image..." do
 
           @collector.on_cleanup do
             %x( diskutil eject #{@device.shellescape} > /dev/null 2>&1 ) if @device
@@ -40,14 +40,14 @@ module Macinbox
             tr -d [:space:]
           )
 
-          raise Macinbox::Error.new("failed to mount the image") unless File.exist? @device
+          raise Macinbox::Error.new("failed to attach the image") unless File.exist? @device
         end
 
         Logger.info "Converting the image to VMDK format..." do
           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[ #{rawdiskCreator} create #{@device} fullDevice rawdisk lsilogic ]
             Task.run %W[ #{vdiskmanager} -t 0 -r rawdisk.vmdk macinbox.vmdk ]
           end
           Task.run %W[ diskutil eject #{@device.shellescape} ]

data/lib/macinbox/actions.rb

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

data/lib/macinbox/cli.rb

@@ -89,22 +89,22 @@ module Macinbox
           Actions::CreateImageFromInstaller.new(@options).run
         end
 
-        Logger.info "Creating VMDK from image..." do
-          Actions::CreateVMDKFromImage.new(@options).run
-        end
-
         case @options[:box_format]
 
         when "vmware_fusion"
 
+          Logger.info "Creating VMDK from image..." do
+            Actions::CreateVMDKFromImage.new(@options).run
+          end
+
           Logger.info "Creating box from VMDK..." do
             Actions::CreateBoxFromVMDK.new(@options).run
           end
 
         when "parallels"
 
-          Logger.info "Creating HDD from VMDK..." do
-            Actions::CreateHDDFromVMDK.new(@options).run
+          Logger.info "Creating HDD from image..." do
+            Actions::CreateHDDFromImage.new(@options).run
           end
 
           Logger.info "Creating box from HDD..." do

data/lib/macinbox/version.rb

@@ -1,3 +1,3 @@
 module Macinbox
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/macinbox.gemspec

@@ -27,6 +27,5 @@ Gem::Specification.new do |s|
   s.requirements << "macOS High Sierra"
   s.requirements << "macOS High Sierra installer app"
   s.requirements << "Vagrant"
-  s.requirements << "VMware Fusion"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macinbox
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - David Kramer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,7 @@ files:
 - lib/macinbox/actions.rb
 - lib/macinbox/actions/create_box_from_hdd.rb
 - lib/macinbox/actions/create_box_from_vmdk.rb
-- lib/macinbox/actions/create_hdd_from_vmdk.rb
+- lib/macinbox/actions/create_hdd_from_image.rb
 - lib/macinbox/actions/create_image_from_installer.rb
 - lib/macinbox/actions/create_vmdk_from_image.rb
 - lib/macinbox/actions/install_box.rb
@@ -95,7 +95,6 @@ requirements:
 - macOS High Sierra
 - macOS High Sierra installer app
 - Vagrant
-- VMware Fusion
 rubyforge_project: 
 rubygems_version: 2.5.2
 signing_key: 

data/lib/macinbox/actions/create_hdd_from_vmdk.rb

@@ -1,49 +0,0 @@
-require 'fileutils'
-require 'shellwords'
-
-require 'macinbox/error'
-require 'macinbox/logger'
-require 'macinbox/task'
-
-module Macinbox
-
-  module Actions
-
-    class CreateHDDFromVMDK
-
-      def initialize(opts)
-        @input_image       = opts[:vmdk_path]     or raise ArgumentError.new(":vmdk_path not specified")
-        @output_path       = opts[:hdd_path]       or raise ArgumentError.new(":hdd_path not specified")
-        @app_path          = opts[:parallels_path] or raise ArgumentError.new(":parallels_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
-        raise Macinbox::Error.new("Parallels not found") unless File.exist? @app_path
-      end
-
-      def run
-        @temp_dir = Task.backtick %W[ /usr/bin/mktemp -d -t create_hdd_from_vmdk ]
-        @collector.add_temp_dir @temp_dir
-
-        Logger.info "Converting the VMDK to HDD format..." do
-          prl_convert = "#{@app_path}/Contents/MacOS/prl_convert"
-          prl_disk_tool = "#{@app_path}/Contents/MacOS/prl_disk_tool"
-          task_opts = @debug ? {} : { :out => File::NULL }
-          Task.run %W[ #{prl_convert} #{@input_image} --allow-no-os --dst=#{@temp_dir} ] + [task_opts]
-        end
-
-        Logger.info "Moving the HDD to the destination..." do
-          hdd_name = "#{File.basename(@input_image, ".*")}.hdd"
-          FileUtils.chown_R ENV["SUDO_USER"], nil, "#{@temp_dir}/#{hdd_name}"
-          FileUtils.mv "#{@temp_dir}/#{hdd_name}", @output_path
-        end
-
-      end
-
-    end
-
-  end
-
-end