macinbox 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e49666706dec8dad1c141d5753afe62f2c3a228
-  data.tar.gz: 6999cf488fa3110249b0e2e03ce00dc8fd92fa4e
+  metadata.gz: 474f8768420d2c194e78c4c92696cbeba1138c08
+  data.tar.gz: eb7adcd5810db338a8c81ea38287590ac6597dce
 SHA512:
-  metadata.gz: 9897e34975452ab3811e5c7d56b697e33cf8c6d7aa1e6d2d57c924911d948d5d5a897f49dbf92eeb37906ac7046b8c336a68a2379618a44468c52a630ebe3f09
-  data.tar.gz: cfe86479f9863fa453807345b8f900bee06ebb0a3f6413ee4dd1b4ae05efc4dcc0518355f735d232271643e18aa2e1bf2dcabb4d08da8ff81afc31037c2d87df
+  metadata.gz: 36080184de62a0730413d1ef1c464f9050db3edc969838468b77c073d1e6ac273091530fcaecd8cc152dc1a4effdd8fad128ac684bd2fa26fc1c7a9df8852348
+  data.tar.gz: 79a8b56feb78da81bd4a82cae61a81fea3ef18b4b97811e7ec9047277026986a7f44183314a7e0a8845829d080765c1863e5a57da79424682cfec159b6ab72eb

data/Gemfile.lock

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

data/lib/macinbox/actions/create_image_from_installer.rb

@@ -102,16 +102,30 @@ module Macinbox
       end
 
       def install_vmware_tools
-        Logger.info "Installing the VMware Tools..." do
+        @collector.on_cleanup do
+          %x( hdiutil detach -quiet -force #{@tools_mountpoint.shellescape} > /dev/null 2>&1 ) if @tools_mountpoint
+        end
 
-          @collector.on_cleanup do
-            %x( hdiutil detach -quiet -force #{@tools_mountpoint.shellescape} > /dev/null 2>&1 ) if @tools_mountpoint
+        tools_image = "#{@vmware_fusion_app}/Contents/Library/isoimages/darwin.iso"
+
+        unless File.exist? tools_image
+          Logger.info "Downloading the VMware Tools..." do
+            bundle_version = Task.backtick %W[ defaults read #{"/Applications/VMware Fusion.app/Contents/Info.plist"} CFBundleVersion ]
+            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[ 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 ]
+            end
+            tools_image = "#{@temp_dir}/payload/darwin.iso"
           end
+        end
 
+        Logger.info "Installing the VMware Tools..." do
           @tools_mountpoint = "#{@temp_dir}/tools_mountpoint"
           FileUtils.mkdir @tools_mountpoint
 
-          tools_image = "#{@vmware_fusion_app}/Contents/Library/isoimages/darwin.iso"
           tools_package = "#{@tools_mountpoint}/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg"
           tools_package_dir = "#{@temp_dir}/tools_package"
 

data/lib/macinbox/actions/create_vmdk_from_image.rb

@@ -55,6 +55,7 @@ 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 )
         end
 
         Logger.info "Moving the VMDK to the destination..." do

data/lib/macinbox/cli.rb

@@ -53,7 +53,8 @@ module Macinbox
         else
           collector.remove_temp_dirs
         end
-        STDERR.print TTY::CURSOR_NORMAL
+        STDERR.print TTY::Color::RESET
+        STDERR.print TTY::Cursor::NORMAL
       end
 
       ["TERM", "INT", "EXIT"].each do |signal|

data/lib/macinbox/logger.rb

@@ -2,7 +2,6 @@ require 'macinbox/tty'
 
 module Macinbox
   class Logger
-    include TTY
     PREFIXES = ["• ", "  + ", "    - "]
     @@depth = 0
     def self.prefix
@@ -12,7 +11,7 @@ module Macinbox
       @@depth = 0
     end
     def self.info(msg)
-      STDERR.puts GREEN + prefix + msg + BLACK
+      STDERR.puts TTY::Color::GREEN + prefix + msg + TTY::Color::RESET
       if block_given?
         @@depth += 1
         yield
@@ -20,7 +19,7 @@ module Macinbox
       end
     end
     def self.error(msg)
-      STDERR.puts RED + prefix + msg + BLACK
+      STDERR.puts TTY::Color::RED + prefix + msg + TTY::Color::RESET
     end
   end
 end

data/lib/macinbox/task.rb

@@ -6,8 +6,6 @@ module Macinbox
 
   class Task
 
-    include TTY
-
     def self.run(cmd)
       system(*cmd) or raise Macinbox::Error.new("#{cmd.slice(0)} failed with non-zero exit code: #{$?.to_i}")
     end
@@ -33,15 +31,15 @@ module Macinbox
     end
 
     def self.run_with_progress(activity, cmd, opts={})
-      STDERR.print CURSOR_INVISIBLE
-      STDERR.print CLEAR_LINE + GREEN + progress_bar(activity, 0.0) + BLACK
+      STDERR.print TTY::Cursor::INVISIBLE
+      STDERR.print TTY::Line::CLEAR + TTY::Color::GREEN + progress_bar(activity, 0.0) + TTY::Color::RESET
       IO.popen cmd, opts do |pipe|
         pipe.each_line do |line|
           percent = yield line
-          STDERR.print CLEAR_LINE + GREEN + progress_bar(activity, percent) + BLACK if percent
+          STDERR.print TTY::Line::CLEAR + TTY::Color::GREEN + progress_bar(activity, percent) + TTY::Color::RESET if percent
         end
       end
-      STDERR.puts CURSOR_NORMAL
+      STDERR.puts TTY::Cursor::NORMAL
     end
 
     def self.write_file_to_io_with_progress(source, destination)
@@ -50,21 +48,21 @@ module Macinbox
       bytes_written = 0
       total_size = File.size(source)
       last_percent_done = -1
-      STDERR.print CURSOR_INVISIBLE
-      STDERR.print CLEAR_LINE + GREEN + progress_bar(activity, 0.0) + BLACK
+      STDERR.print TTY::Cursor::INVISIBLE
+      STDERR.print TTY::Line::CLEAR + TTY::Color::GREEN + progress_bar(activity, 0.0) + TTY::Color::RESET
       File.open(source) do |file|
         until eof
           begin
             bytes_written += destination.write(file.readpartial(1024*1024))
             percent_done = ((bytes_written.to_f / total_size.to_f) * 100).round(1)
             last_percent_done = percent_done
-            STDERR.print CLEAR_LINE + GREEN + progress_bar(activity, percent_done) + BLACK
+            STDERR.print TTY::Line::CLEAR + TTY::Color::GREEN + progress_bar(activity, percent_done) + TTY::Color::RESET
           rescue EOFError
             eof = true
           end
         end
       end
-      STDERR.puts CURSOR_NORMAL
+      STDERR.puts TTY::Cursor::NORMAL
     end
 
     def self.backtick(cmd)

data/lib/macinbox/tty.rb

@@ -1,10 +1,16 @@
 module Macinbox
   module TTY
-    BLACK = %x(tput setaf 0)
-    RED = %x(tput setaf 1)
-    GREEN = %x(tput setaf 2)
-    CLEAR_LINE = "\r" + %x( tput el )
-    CURSOR_INVISIBLE = %x( tput civis )
-    CURSOR_NORMAL = %x( tput cnorm )
+    module Color
+      RED = STDERR.isatty ? %x(tput setaf 1) : ""
+      GREEN = STDERR.isatty ? %x(tput setaf 2) : ""
+      RESET = STDERR.isatty ? %x(tput sgr0) : ""
+    end
+    module Line
+      CLEAR = STDERR.isatty ? "\r" + %x( tput el ) : ""
+    end
+    module Cursor
+      INVISIBLE = %x( tput civis )
+      NORMAL = %x( tput cnorm )
+    end
   end
 end

data/lib/macinbox/version.rb

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

metadata

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