macinbox 3.4.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a4f3b181302a8a5d4efdf5e23d97add1b2f7424c1b981d0fa8467f4317a398
-  data.tar.gz: cbab11b8a79ee6eb57db5e164ac34867a3e892f97b166afe3176d1ed9f629657
+  metadata.gz: e40b892a4d63ec18488766757893eddf3898a0695a525580aabdc402f155be34
+  data.tar.gz: b35b4e53f984f36556ab5ad6b65f196e20e3dd34c88c69b6471d686b7e750638
 SHA512:
-  metadata.gz: 706f282c101a01f8077f3b5e826441610263aee40c19e7b3ffea6480be6c50252f0e38070c4160153abb094a898dddd5b4195fb5d75ae9ecd1c69f1002c54a6c
-  data.tar.gz: 65c34dc426dc8a155319a781d0225920208e02c5eeaf74d3c61791fe9cfa0c85a6e8fe79021f1713653c9bd17f14cba039472954182264b7e268b7f80992a687
+  metadata.gz: 0130a5bc6662282a236118d5cb81a45d49e17190338eb5a1bfffcc577b477911f66a73ab14738cc9617da97369b24ef802e04d0854383165d609c304f8772bc7
+  data.tar.gz: b91da886b38a12928bcb4e115351c8c07e79138af73aecd369c79485377770b665be160dcda5f4bafea37b2336ef566465f7c366db9a4596aa85d92a70a422e6

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.0.0 (November 12, 2019)
+
+FEATURES:
+
+- Prevent incompatible host and guest OS versions from being used together. [GH-24]
+
+BREAKING CHANGES:
+
+- Use the Catalina installer app by default.
+- Skip installation of VMware Tools on Catalina because it is not working properly.
+
 ## 3.4.0 (November 12, 2019)
 
 FEATURES:

data/Gemfile.lock

@@ -1,20 +1,17 @@
 PATH
   remote: .
   specs:
-    macinbox (3.4.0)
+    macinbox (4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (10.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
   macinbox!
-  rake (~> 10.0)
 
 BUNDLED WITH
    1.17.2

data/README.md

@@ -1,6 +1,6 @@
 # macinbox
 
-Puts macOS Mojave in a Vagrant box.
+Puts macOS Catalina 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', 'vmware_desktop', 'parall
 
 ## System Requirements
 
-* macOS 10.14 Mojave host operating system
+* macOS 10.15 Catalina 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
@@ -28,11 +28,17 @@ To boot a box created by `macinbox` you will need Vagrant:
 
 ### macOS Installer
 
-To create a box you will need a macOS installer application:
+To create a box you will need a macOS installer application. If you are using a Catalina host you must use a Catalina installer:
+
+* [macOS Catalina installer application](http://appstore.com/mac/macoscatalina) Tested with 10.15, 10.15.1
+
+Catalina hosts cannot use earlier (e.g. macOS 10.14 Mojave) installers, and Mojave hosts cannot use Catalina installers.
+
+If you are using a Mojave host you should use a Mojave installer:
 
 * [macOS Mojave installer application](http://appstore.com/mac/macosmojave) Tested with 10.14.3, 10.14.4, 10.14.5, 10.14.6
 
-Previous versions of the macOS installer (e.g. High Sierra) may also work.
+It is recommended that you use the same version for the host and the installer, but previous versions of the macOS installer (e.g. macOS 10.13 High Sierra) may also work with Mojave hosts, and vice-versa.
 
 **NOTE:** If you have questions about the permissibility of virtualizing macOS you may want to review the documentation for the virtualization software you are using and the [software license agreement](https://www.apple.com/legal/sla/) for macOS.
 
@@ -158,7 +164,7 @@ 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
+1. Installs the VMware or Parallels tools (Note: VMware Tools installation is skipped on Catalina because it is not working)
 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

data/lib/macinbox/actions/check_macos_versions.rb

@@ -25,6 +25,15 @@ module Macinbox
         host_os_version = Macinbox::OSVersion.new(Task.backtick %W[ /usr/bin/sw_vers -productVersion ])
         Logger.info "Host macOS version detected: #{host_os_version}" if $verbose
 
+        unless installer_os_version.is_sierra_or_later?
+          raise Macinbox::Error.new("Installer macOS version is not supported: #{installer_os_version}")
+        end
+
+        if (host_os_version.is_catalina_or_later? && installer_os_version.is_mojave_or_earlier?) ||
+           (host_os_version.is_mojave_or_earlier? && installer_os_version.is_catalina_or_later?)
+          raise Macinbox::Error.new("macOS #{host_os_version} cannot install macOS #{installer_os_version}")
+        end
+
         if installer_os_version.major != host_os_version.major || installer_os_version.minor != host_os_version.minor
           Logger.error "Warning: host OS version (#{host_os_version}) and installer OS version (#{installer_os_version}) do not match"
         end

data/lib/macinbox/actions/create_box_from_vmdk.rb

@@ -25,6 +25,8 @@ module Macinbox
         @fullscreen        = opts[:fullscreen]
         @hidpi             = opts[:hidpi]
 
+        @macos_version     = opts[:macos_version]   or raise ArgumentError.new(":macos_version not specified")
+
         @collector         = opts[:collector]       or raise ArgumentError.new(":collector not specified")
 
         raise Macinbox::Error.new("VMDK not found") unless File.exist? @input_vmdk
@@ -41,12 +43,19 @@ module Macinbox
 
           FileUtils.mkdir @box_dir
 
+          virtual_hw_version = 16
+          if @macos_version.is_mojave_or_earlier?
+            virtual_hw_version = 14
+          end
+
+          guest_os = "darwin#{@macos_version.darwin_major}-64"
+
           File.open "#{@box_dir}/macinbox.vmx", 'w' do |file|
 
             file.write <<~EOF
               .encoding = "UTF-8"
               config.version = "8"
-              virtualHW.version = "14"
+              virtualHW.version = "#{virtual_hw_version}"
               numvcpus = "#{@cpu_count}"
               memsize = "#{@memory_size}"
               sata0.present = "TRUE"
@@ -90,7 +99,7 @@ module Macinbox
               board-id.reflectHost = "TRUE"
               firmware = "efi"
               displayName = "#{@box_name}"
-              guestOS = "darwin17-64"
+              guestOS = "#{guest_os}"
               nvram = "macinbox.nvram"
               virtualHW.productCompatibility = "hosted"
               keyboardAndMouseProfile = "macProfile"

data/lib/macinbox/actions/create_vmdk_from_image.rb

@@ -15,12 +15,14 @@ module Macinbox
     class CreateVMDKFromImage
 
       def initialize(opts)
-        @input_image       = opts[:image_path]  or raise ArgumentError.new(":image_path not specified")
-        @output_path       = opts[:vmdk_path]   or raise ArgumentError.new(":vmdk_path not specified")
-        @vmware_fusion_app = opts[:vmware_path] or raise ArgumentError.new(":vmware_path not specified")
+        @input_image       = opts[:image_path]    or raise ArgumentError.new(":image_path not specified")
+        @output_path       = opts[:vmdk_path]     or raise ArgumentError.new(":vmdk_path not specified")
+        @vmware_fusion_app = opts[:vmware_path]   or raise ArgumentError.new(":vmware_path not specified")
         @use_qemu          = opts[:use_qemu]
 
-        @collector         = opts[:collector]   or raise ArgumentError.new(":collector not specified")
+        @macos_version     = opts[:macos_version] or raise ArgumentError.new(":macos_version not specified")
+
+        @collector         = opts[:collector]     or raise ArgumentError.new(":collector not specified")
 
         raise Macinbox::Error.new("input image not found")   unless File.exist? @input_image
         raise Macinbox::Error.new("VMware Fusion not found") unless File.exist? @vmware_fusion_app
@@ -34,8 +36,10 @@ module Macinbox
         create_temp_dir
         copy_input_image
         attach_image
-        install_vmware_tools
-        set_spc_kextpolicy
+        if @macos_version.is_mojave_or_earlier?
+          install_vmware_tools
+          set_spc_kextpolicy
+        end
         eject_image
         convert_image
         save_image

data/lib/macinbox/cli/options.rb

@@ -14,7 +14,7 @@ module Macinbox
       :memory_size     => 2048,
       :cpu_count       => 2,
       :short_name      => "vagrant",
-      :installer_path  => "/Applications/Install macOS Mojave.app",
+      :installer_path  => "/Applications/Install macOS Catalina.app",
       :vmware_path     => "/Applications/VMware Fusion.app",
       :parallels_path  => "/Applications/Parallels Desktop.app",
       :vmware_tools    => true,

data/lib/macinbox/version.rb

@@ -1,3 +1,3 @@
 module Macinbox
-  VERSION = "3.4.0"
+  VERSION = "4.0.0"
 end

data/macinbox.gemspec

@@ -18,14 +18,4 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  s.add_development_dependency "bundler", "~> 1.16"
-  s.add_development_dependency "rake", "~> 10.0"
-
-  s.required_ruby_version = '~> 2.3'
-
-  s.requirements << "macOS Mojave"
-  s.requirements << "macOS Mojave installer app"
-  s.requirements << "Vagrant"
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macinbox
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - David Kramer
@@ -9,35 +9,7 @@ autorequire:
 bindir: exe
 cert_chain: []
 date: 2019-11-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+dependencies: []
 description: 
 email:
 - bacongravy@icloud.com
@@ -91,18 +63,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- macOS Mojave
-- macOS Mojave installer app
-- Vagrant
+requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4