macinbox 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e8ada3102753fe30348667d4fbfb2e5aa178f39
-  data.tar.gz: 6bef79877bad0fde8bc350966ce45247053ce461
+  metadata.gz: 3f7eedd95d1b6f920f6cd85bfa88b3956ec05ac8
+  data.tar.gz: 023520243d7e43ef22b124cb5f83f3d983f586cc
 SHA512:
-  metadata.gz: 3cde4d8b3f4a76d5dc57239f499a0421f833fcd72e64a3db10a00f5b9aaab99d00edf10d9b1fd860a193ff724974ae11e2f1677627e734aa44e4257219698835
-  data.tar.gz: 4e463fe8c9daff3163aa27527f80993fe247fed5124aa162670cae896753e889e948770a73bf02707fb466e75c9f46e9838dec59f4af50e0a1b19720b7fb3564
+  metadata.gz: 3f93f92954238ea9a1a4944c9ceebbb73dc3dcf51bd016346cf4dc1a36f6df92afe628c27d19afc9f4f6aada44f00d6e9840626ab34d937b9259aa593cccad3b
+  data.tar.gz: 7757b07da2ddbf71e088e7fdad810b01fe05de659b823a8a389b9cf6b3458e55364101a8aaeda238c78a0195420d07456087a2f0f54165c9d0a202bb041eebc9

data/Gemfile.lock

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

data/README.md

@@ -20,12 +20,12 @@ 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.4 High Sierra installer application](http://appstore.com/mac/macoshighsierra)
-* [Vagrant 2.0.3](https://www.vagrantup.com/)
+* [macOS 10.13.5 High Sierra installer application](http://appstore.com/mac/macoshighsierra)
+* [Vagrant 2.1.1](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](http://www.vmware.com/products/fusion.html)
+* [VMware Fusion Pro 10.1.2](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:
@@ -66,6 +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)
     -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)

data/lib/macinbox/actions/create_image_from_installer.rb

@@ -19,6 +19,7 @@ module Macinbox
         @parallels_app     = opts[:parallels_path]
 
         @disk_size         = opts[:disk_size]       or raise ArgumentError.new(":disk_size not specified")
+        @fstype            = opts[:fstype]          or raise ArgumentError.new(":fstype not specified")
         @short_name        = opts[:short_name]      or raise ArgumentError.new(":short_name not specified")
         @full_name         = opts[:full_name]       or raise ArgumentError.new(":full_name not specified")
         @password          = opts[:password]        or raise ArgumentError.new(":password not specified")
@@ -95,7 +96,7 @@ module Macinbox
           @scratch_image = "#{@temp_dir}/scratch.sparseimage"
           FileUtils.mkdir @scratch_mountpoint
           quiet_flag = @debug ? [] : %W[ -quiet ]
-          Task.run %W[ hdiutil create -size #{@disk_size}g -type SPARSE -fs HFS+J -volname #{"Macintosh HD"} -uid 0 -gid 80 -mode 1775 #{@scratch_image} ] + quiet_flag
+          Task.run %W[ 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[ hdiutil attach #{@scratch_image} -mountpoint #{@scratch_mountpoint} -nobrowse -owners on ] + quiet_flag
         end
       end
@@ -340,7 +341,21 @@ module Macinbox
 
       def save_image
         Logger.info "Saving the image..." do
-          Task.run %W[ hdiutil detach -quiet #{@scratch_mountpoint} ]
+          # detaching sometimes fails at first so we pause to let the disk
+          # quiesce and then retry again a few times before giving up
+          max_attempts = 5
+          for attempt in 1..max_attempts
+            begin
+              Logger.info "Detaching the image..." if @debug
+              quiet_flag = @debug ? [] : %W[ -quiet ]
+              Task.run %W[ hdiutil detach #{@scratch_mountpoint} ] + quiet_flag
+              break
+            rescue Macinbox::Error => error
+              raise if attempt == max_attempts
+              Logger.info "#{error.message}. Sleeping and retrying..." if @debug
+              sleep 15
+            end
+          end
           FileUtils.mv @scratch_image, "#{@temp_dir}/macinbox.dmg"
           FileUtils.chown ENV["SUDO_USER"], nil, "#{@temp_dir}/macinbox.dmg"
           FileUtils.mv "#{@temp_dir}/macinbox.dmg", @output_path

data/lib/macinbox/cli/options.rb

@@ -10,6 +10,7 @@ module Macinbox
       :box_format      => "vmware_fusion",
       :box_name        => "macinbox",
       :disk_size       => 64,
+      :fstype          => "HFS+J",
       :memory_size     => 2048,
       :cpu_count       => 2,
       :short_name      => "vagrant",
@@ -36,6 +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('-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/task.rb

@@ -7,7 +7,7 @@ module Macinbox
   class Task
 
     def self.run(cmd)
-      system(*cmd) or raise Macinbox::Error.new("#{cmd.slice(0)} failed with non-zero exit code: #{$?.to_i}")
+      system(*cmd) or raise Macinbox::Error.new("#{cmd.slice(0)} failed with non-zero exit code: #{$? >> 8}")
     end
 
     def self.run_as_sudo_user(cmd)

data/lib/macinbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macinbox
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - David Kramer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler