macinbox 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 474f8768420d2c194e78c4c92696cbeba1138c08
-  data.tar.gz: eb7adcd5810db338a8c81ea38287590ac6597dce
+  metadata.gz: 99b011adb0f62501e0bbbf6fe41b354c4c698f11
+  data.tar.gz: f91366d4caa707cfda00119d5fa32d85841fb0d4
 SHA512:
-  metadata.gz: 36080184de62a0730413d1ef1c464f9050db3edc969838468b77c073d1e6ac273091530fcaecd8cc152dc1a4effdd8fad128ac684bd2fa26fc1c7a9df8852348
-  data.tar.gz: 79a8b56feb78da81bd4a82cae61a81fea3ef18b4b97811e7ec9047277026986a7f44183314a7e0a8845829d080765c1863e5a57da79424682cfec159b6ab72eb
+  metadata.gz: 8f4756269191d2d7211ee52d946d8c97d4c42ae42fd6814d3e73f21d200aa18ce0a4d4f65e8629129520ac8b221a8ee4acfc6639c839ee558a0f096fe2d35ed9
+  data.tar.gz: 1ffe9d0be48525b0076603161bb017181263377dcf73ab3cbde19ff69f4b378b7b96baed595099d289a8e5d828d85222b7031fffed55d0a4f6e17d12ee43418d

data/Gemfile.lock

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

data/lib/macinbox/actions/create_box_from_vmdk.rb

@@ -121,6 +121,7 @@ module Macinbox
               config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", disabled: true
               config.vm.synced_folder ".", "/vagrant", disabled: true
               config.vm.provider "vmware_fusion" do |v|
+                v.vmx["ethernet0.virtualDev"] = "e1000e"
                 v.gui = #{@gui}
               end
             end

data/lib/macinbox/actions/create_image_from_installer.rb

@@ -114,9 +114,9 @@ module Macinbox
             bundle_short_version = Task.backtick %W[ defaults read #{"/Applications/VMware Fusion.app/Contents/Info.plist"} CFBundleShortVersionString ]
             darwin_iso_url = "http://softwareupdate.vmware.com/cds/vmw-desktop/fusion/#{bundle_short_version}/#{bundle_version}/packages/com.vmware.fusion.tools.darwin.zip.tar"
             Dir.chdir(@temp_dir) do
-              Task.run %W[ curl -O #{darwin_iso_url} ]
+              Task.run %W[ curl #{darwin_iso_url} -O ] + (@debug ? [] : %W[ -s -S ])
               Task.run %W[ tar -xf com.vmware.fusion.tools.darwin.zip.tar com.vmware.fusion.tools.darwin.zip ]
-              Task.run %W[ unzip com.vmware.fusion.tools.darwin.zip payload/darwin.iso ]
+              Task.run %W[ unzip ] + (@debug ? [] : %W[ -qq ]) + %W[ com.vmware.fusion.tools.darwin.zip payload/darwin.iso ]
             end
             tools_image = "#{@temp_dir}/payload/darwin.iso"
           end

data/lib/macinbox/actions/create_vmdk_from_image.rb

@@ -30,16 +30,11 @@ module Macinbox
         Logger.info "Mounting the image..." do
 
           @collector.on_cleanup do
-            %x( hdiutil detach -quiet -force #{@mountpoint.shellescape} > /dev/null 2>&1 ) if @mountpoint
             %x( diskutil eject #{@device.shellescape} > /dev/null 2>&1 ) if @device
           end
 
-          @mountpoint = "#{@temp_dir}/image_mountpoint"
-
-          FileUtils.mkdir @mountpoint
-
           @device = %x(
-          	hdiutil attach #{@input_image.shellescape} -mountpoint #{@mountpoint.shellescape} -nobrowse -owners on |
+          	hdiutil attach #{@input_image.shellescape} -nomount |
           	grep _partition_scheme |
           	cut -f1 |
           	tr -d [:space:]
@@ -55,7 +50,8 @@ module Macinbox
             Task.run %W[ #{rawdiskCreator} create  #{@device} fullDevice rawdisk lsilogic ]
             Task.run %W[ #{vdiskmanager} -t 0 -r rawdisk.vmdk macinbox.vmdk ]
           end
-          %x( diskutil eject #{@device.shellescape} > /dev/null 2>&1 )
+          Task.run %W[ diskutil eject #{@device.shellescape} ]
+          @device = nil
         end
 
         Logger.info "Moving the VMDK to the destination..." do

data/lib/macinbox/actions/install_box.rb

@@ -21,7 +21,7 @@ module Macinbox
           vagrant_boxes_dir = File.expand_path "~/.vagrant.d/boxes"
           raise Macinbox::Error.new("~/.vagrant.d/boxes not found") unless File.exist? vagrant_boxes_dir
           box_name = @box_name
-          box_version = Dir["#{vagrant_boxes_dir}/#{box_name}/*"].map { |o| File.basename(o).to_i }.sort.last.next rescue 0
+          box_version = Dir["#{vagrant_boxes_dir}/#{box_name}/*/*"].map { |o| o.split('/')[-2].to_i }.sort.last.next rescue 0
           box_provider = "vmware_fusion"
           target_box_dir = "#{vagrant_boxes_dir}/#{box_name}/#{box_version}/#{box_provider}"
           raise Macinbox::Error.new("box already exists") if File.exist? target_box_dir

data/lib/macinbox/version.rb

@@ -1,3 +1,3 @@
 module Macinbox
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macinbox
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - David Kramer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler