vagrant-parallels 1.3.10 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 027990a7239db35d408b8ff4134fe53cec713e17
-  data.tar.gz: cfb06407f62de7a465c8790f79817ea5681a6bbe
+  metadata.gz: 34465669a7296fe6bf908b039f849e9221202c8b
+  data.tar.gz: 77b42b45473b87cd97917cba693100b7c9be71c5
 SHA512:
-  metadata.gz: 7c8a1fcbed33ffd6b240c6a45ca1f3f5191fb32b777e84a934ff117071a602caa059138e240c87e86d268ee4258c228599eab0ee7dac121c73523fc7c5808e21
-  data.tar.gz: 47f40077291881538c8680a12d670e2afcfc9b386627c4a48c7bc2680825be45202f3b7588baa46e737769b3eed115a28d7228fe055bd9a7043f670c4ce36fb8
+  metadata.gz: 21acbf45f344cb8a1fbbff871f6285d6eff031ee7b1440a13e3fbc638e8d7f05ac41923669bf21df7d33c918b131af58719592b0c68fbdac92e9d659cf3d512c
+  data.tar.gz: 4dbd6eb8a9264d84e391b73569295017749fa38c7479ec7cf9589b7ef0d31af520b377946b3d30c128be74b348b3dcc13957c607f83072bd55919c6ee998e1fc

data/lib/vagrant-parallels/driver/base.rb

@@ -4,6 +4,7 @@ require 'vagrant/util/busy'
 require 'vagrant/util/network_ip'
 require 'vagrant/util/platform'
 require 'vagrant/util/subprocess'
+require 'vagrant/util/which'
 
 module VagrantPlugins
   module Parallels
@@ -23,8 +24,15 @@ module VagrantPlugins
           # This flag is used to keep track of interrupted state (SIGINT)
           @interrupted = false
 
-          @prlctl_path    = "prlctl"
-          @prlsrvctl_path = "prlsrvctl"
+          @prlctl_path    = util_path('prlctl')
+          @prlsrvctl_path = util_path('prlsrvctl')
+          @prldisktool_path = util_path('prl_disk_tool')
+
+          if !@prlctl_path
+            # This means that Parallels Desktop was not found, so we raise this
+            # error here.
+            raise VagrantPlugins::Parallels::Errors::ParallelsNotDetected
+          end
 
           @logger.info("prlctl path: #{@prlctl_path}")
           @logger.info("prlsrvctl path: #{@prlsrvctl_path}")
@@ -306,6 +314,19 @@ module VagrantPlugins
             Vagrant::Util::Subprocess.execute(*command, &block)
           end
         end
+
+        private
+
+        def util_path(bin)
+          path = Vagrant::Util::Which.which(bin)
+          return path if path
+
+          ['/usr/local/bin', '/usr/bin'].each do |folder|
+            path = File.join(folder, bin)
+            return path if File.file?(path)
+          end
+        end
+
       end
     end
   end

data/lib/vagrant-parallels/driver/meta.rb

@@ -30,13 +30,7 @@ module VagrantPlugins
 
           # Read and assign the version of Parallels Desktop we know which
           # specific driver to instantiate.
-          begin
-            @version = read_version || ""
-          rescue Vagrant::Errors::CommandUnavailable
-            # This means that Parallels Desktop was not found, so we raise this
-            # error here.
-            raise VagrantPlugins::Parallels::Errors::ParallelsNotDetected
-          end
+          @version = read_version || ''
 
           # Instantiate the proper version driver for Parallels Desktop
           @logger.debug("Finding driver for Parallels Desktop version: #{@version}")
@@ -82,7 +76,6 @@ module VagrantPlugins
                        :delete_unused_host_only_networks,
                        :disable_password_restrictions,
                        :enable_adapters,
-                       :execute_prlctl,
                        :export,
                        :forward_ports,
                        :halt,
@@ -134,11 +127,11 @@ module VagrantPlugins
           #
           # But we need exactly the first 3 numbers: "x.x.x"
 
-          if execute('prlctl', '--version') =~ /prlctl version (\d+\.\d+.\d+)/
+          if execute_prlctl('--version') =~ /prlctl version (\d+\.\d+.\d+)/
             return $1
-          else
-            return nil
           end
+
+          nil
         end
       end
     end

data/lib/vagrant-parallels/driver/pd_8.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
             name.start_with? 'hdd'
           end
           used_drives.each_value do |drive_params|
-            execute('prl_disk_tool', 'compact', '--hdd', drive_params['image']) do |type, data|
+            execute(@prldisktool_path, 'compact', '--hdd', drive_params['image']) do |type, data|
               lines = data.split("\r")
               # The progress of the compact will be in the last line. Do a greedy
               # regular expression to find what we're looking for.
@@ -168,9 +168,9 @@ module VagrantPlugins
         end
 
         def halt(force=false)
-          args = ['prlctl', 'stop', @uuid]
+          args = ['stop', @uuid]
           args << '--kill' if force
-          execute(*args)
+          execute_prlctl(*args)
         end
 
         def import(tpl_name)
@@ -447,7 +447,7 @@ module VagrantPlugins
         end
 
         def register(pvm_file)
-          args = ['prlctl', 'register', pvm_file]
+          args = [@prlctl_path, 'register', pvm_file]
 
           3.times do
             result = raw(*args)
@@ -465,7 +465,7 @@ module VagrantPlugins
           # If we reach this point, it means that we consistently got the
           # failure, do a standard execute now. This will raise an
           # exception if it fails again.
-          execute(*args)
+          execute_prlctl(*args)
         end
 
         def registered?(uuid)
@@ -516,7 +516,7 @@ module VagrantPlugins
         end
 
         def unregister(uuid)
-          args = ['prlctl', 'unregister', uuid]
+          args = [@prlctl_path, 'unregister', uuid]
           3.times do
             result = raw(*args)
             # Exit if everything is OK
@@ -534,7 +534,7 @@ module VagrantPlugins
           # If we reach this point, it means that we consistently got the
           # failure, do a standard execute now. This will raise an
           # exception if it fails again.
-          execute(*args)
+          execute_prlctl(*args)
         end
 
         def unshare_folders(names)
@@ -545,7 +545,7 @@ module VagrantPlugins
 
         def vm_exists?(uuid)
           5.times do |i|
-            result = raw('prlctl', 'list', uuid)
+            result = raw(@prlctl_path, 'list', uuid)
             return true if result.exit_code == 0
 
             # Sometimes this happens. In this case, retry. If

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.3.10'
+    VERSION = '1.3.12'
   end
 end

data/test/unit/support/shared/parallels_context.rb

@@ -31,6 +31,11 @@ shared_context 'parallels' do
   end
 
   before do
+    # Consider that 'prlctl' and 'prlsrvctl' binaries are available
+    allow(Vagrant::Util::Which).to receive(:which).with('prlctl').and_return('prlctl')
+    allow(Vagrant::Util::Which).to receive(:which).with('prlsrvctl').and_return('prlsrvctl')
+    allow(Vagrant::Util::Which).to receive(:which).with('prl_disk_tool').and_return('prl_disk_tool')
+
     # we don't want unit tests to ever run commands on the system; so we wire
     # in a double to ensure any unexpected messages raise exceptions
     stub_const('Vagrant::Util::Subprocess', subprocess)

data/website/docs/build/404.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+
+		<title>Vagrant Parallels Provider Documentation</title>
+
+		<!-- meta -->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+
+		<!-- lib styles -->
+		<link href="stylesheets/bootstrap-8082a218.css" media="screen" rel="stylesheet" type="text/css" />
+<link href="stylesheets/vagrant-parallels-a389b6ea.css" media="screen" rel="stylesheet" type="text/css" />
+
+		<!-- lib js -->
+		<script src="javascripts/jquery-15b079d7.js" type="text/javascript"></script>
+		<script src="javascripts/modernizr-d56a170f.js" type="text/javascript"></script>
+		<script src="javascripts/bootstrap.min-98cc7a22.js" type="text/javascript"></script>
+		<script src="javascripts/backstretch-f9c163c1.js" type="text/javascript"></script>
+		<script src="javascripts/vagrant-parallels-966ff22c.js" type="text/javascript"></script>
+
+		<!-- fonts -->
+		<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
+
+	</head>
+	<body>
+		<!-- wrap everything -->
+		<div class="wrapper">
+
+			<!-- nav -->
+
+			<nav class="docs">
+            <div class="container">
+                <!-- vagrant logo -->
+                <a class="vagrant-docs-logo" href="docs/">Vagrant Parallels Documentation</a>
+                <!-- nav -->
+                <ul class="pull-right">
+                    <li><a href="https://docs.vagrantup.com">Vagrant Docs</a></li>
+                    <li><a href="https://github.com/Parallels/vagrant-parallels">Github</a></li>
+                </ul>
+            </div> <!-- container -->
+			</nav>
+
+			<div class="page docs docs-home">
+				<div class="container">
+                    <div class="sidebar span4">
+                        <!-- get the sidebar nav -->
+                        <!-- side nav docs -->
+                        <aside class="sidebar-nav">
+
+                        <div class="toggle hidden-desktop">
+                            <div class="open-close open"></div>
+                            <a href="#">Contents</a>
+                        </div>
+
+                        <ul class="unstyled">
+                            <li><a href="docs/">Overview</a></li>
+
+                            <li><a href="docs/installation/">Installation</a></li>
+                            
+
+                            <li><a href="docs/usage.html">Usage</a></li>
+
+                            <li><a href="docs/getting-started.html">Getting Started</a></li>
+
+                            <li><a href="docs/share.html">Vagrant Share</a></li>
+
+                            <li><a href="docs/boxes/">Boxes</a></li>
+                            
+
+                            <li><a href="docs/configuration.html">Configuration</a></li>
+
+                            <li><a href="docs/networking/">Networking</a></li>
+                            
+
+                            <li><a href="docs/contacts.html">Contacts</a></li>
+
+                        </ul>
+                        </aside> <!-- /.sidebar -->
+                    </div> <!-- /.sidebar -->
+
+                    <div class="page-contents span9">
+                        <div class="page-background"></div>
+
+                        <!-- start page content -->
+                        <div class="row">
+                            <div class="span8 offset1">
+                                <h2>Page Not Found</h4>
+
+<p>
+Sorry, the page you tried to visit doesn't exist. This could be our fault,
+and if so we'll fix that up right away. Please go back, or go back
+<a href="/">home</a> to get back on track.
+</p>
+
+                            </div> <!-- /.span8 -->
+                        </div> <!-- /.row -->
+                    </div> <!-- /.page-contents -->
+				</div> <!-- /.container -->
+			</div> <!-- /.page -->
+
+			<!-- footer -->
+			<footer>
+			<div class="container">
+				<div class="row">
+                    <ul class="unstyled logos">
+                        <a href="http://www.vagrantup.com/downloads.html">
+                            <li class="vagrant-logo-monochrome">
+                                <p>Vagrant</p>
+                            </li>
+                        </a>
+                        <a href="http://www.parallels.com/downloads/desktop/">
+                            <li class="pd-logo-monochrome">
+                                <p>Parallels Desktop</p>
+                            </li>
+                        </a>
+                    </ul> <!-- /span -->
+
+				</div> <!-- /row -->
+
+				<div class="row">
+					<h6 class="legal">
+                        &copy; 2015 Parallels IP Holdings GmbH.
+					</h6>
+				</div> <!-- row -->
+			</div> <!-- container -->
+			</footer>
+
+			<!-- close .wrapper -->
+		</div>
+
+		<!-- load scripts -->
+	</body>
+</html>

data/website/docs/build/docs/boxes/base.html

@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+
+		<title> Creating a Base Box - Vagrant Parallels Provider Documentation</title>
+
+		<!-- meta -->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+
+		<!-- lib styles -->
+		<link href="../../stylesheets/bootstrap-8082a218.css" media="screen" rel="stylesheet" type="text/css" />
+<link href="../../stylesheets/vagrant-parallels-a389b6ea.css" media="screen" rel="stylesheet" type="text/css" />
+
+		<!-- lib js -->
+		<script src="../../javascripts/jquery-15b079d7.js" type="text/javascript"></script>
+		<script src="../../javascripts/modernizr-d56a170f.js" type="text/javascript"></script>
+		<script src="../../javascripts/bootstrap.min-98cc7a22.js" type="text/javascript"></script>
+		<script src="../../javascripts/backstretch-f9c163c1.js" type="text/javascript"></script>
+		<script src="../../javascripts/vagrant-parallels-966ff22c.js" type="text/javascript"></script>
+
+		<!-- fonts -->
+		<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
+
+	</head>
+	<body>
+		<!-- wrap everything -->
+		<div class="wrapper">
+
+			<!-- nav -->
+
+			<nav class="docs">
+            <div class="container">
+                <!-- vagrant logo -->
+                <a class="vagrant-docs-logo" href="../">Vagrant Parallels Documentation</a>
+                <!-- nav -->
+                <ul class="pull-right">
+                    <li><a href="https://docs.vagrantup.com">Vagrant Docs</a></li>
+                    <li><a href="https://github.com/Parallels/vagrant-parallels">Github</a></li>
+                </ul>
+            </div> <!-- container -->
+			</nav>
+
+			<div class="page docs docs-home">
+				<div class="container">
+                    <div class="sidebar span4">
+                        <!-- get the sidebar nav -->
+                        <!-- side nav docs -->
+                        <aside class="sidebar-nav">
+
+                        <div class="toggle hidden-desktop">
+                            <div class="open-close open"></div>
+                            <a href="#">Contents</a>
+                        </div>
+
+                        <ul class="unstyled">
+                            <li><a href="../">Overview</a></li>
+
+                            <li><a href="../installation/">Installation</a></li>
+                            
+
+                            <li><a href="../usage.html">Usage</a></li>
+
+                            <li><a href="../getting-started.html">Getting Started</a></li>
+
+                            <li><a href="../share.html">Vagrant Share</a></li>
+
+                            <li><a href="./">Boxes</a></li>
+                            
+                            <ul class="sub unstyled">
+                                <li class="current"><a href="base.html">Creating a Base Box</a></li>
+                                <li><a href="packer.html">Using Packer</a></li>
+                                <li><a href="veewee.html">Using Veewee</a></li>
+                            </ul>
+                            
+
+                            <li><a href="../configuration.html">Configuration</a></li>
+
+                            <li><a href="../networking/">Networking</a></li>
+                            
+
+                            <li><a href="../contacts.html">Contacts</a></li>
+
+                        </ul>
+                        </aside> <!-- /.sidebar -->
+                    </div> <!-- /.sidebar -->
+
+                    <div class="page-contents span9">
+                        <div class="page-background"></div>
+
+                        <!-- start page content -->
+                        <div class="row">
+                            <div class="span8 offset1">
+                                <h1>Creating a Base Box</h1>
+
+<div class="alert alert-warn">
+    <p>
+        <strong>Warning: Advanced Topic!</strong> Creating a base box can be a
+        time consuming and tedious process, and is not recommended for new
+        Vagrant users. If you're just getting started with Vagrant, we
+        recommend trying to find <a href="https://atlas.hashicorp.com/parallels">
+        existing base boxes</a> to use first.
+    </p>
+</div>
+
+<p>This page documents the box format so that you can create your own base boxes
+manually.</p>
+
+<p>Prior to reading this page, please check out the <a href="http://docs.vagrantup.com/v2/boxes/format.html">basics of the Vagrant
+box file format</a>.</p>
+
+<h2>Contents</h2>
+
+<p>A Parallels base box is a compressed archive of the necessary contents of
+a Parallels &quot;pvm&quot; file. Here is an example of what is contained in such a box:</p>
+
+<pre><code>$ tree
+.
+├── Vagrantfile
+├── box.pvm
+│   ├── NVRAM.dat
+│   ├── VmInfo.pvi
+│   ├── config.pvs
+│   └── harddisk.hdd
+│       └── ...
+└── metadata.json
+</code></pre>
+
+<p><code>config.pvs</code> and <code>.hdd</code> files are strictly required for a Parallels virtual
+machine.</p>
+
+<p>There is also the &quot;metadata.json&quot; file used by Vagrant itself. This file
+contains nothing but the defaults which are documented on the <a href="http://docs.vagrantup.com/v2/boxes/format.html">box format</a> page.</p>
+
+<h2>Installed Software</h2>
+
+<p>Base boxes for the Parallels provider should have the following software
+installed, as a bare minimum:</p>
+
+<ul>
+<li><p>SSH server with key-based authentication setup. If you want the box to work
+with default Vagrant settings, the SSH user must be set to accept the <a href="https://github.com/mitchellh/vagrant/blob/master/keys/vagrant.pub">insecure
+keypair</a>
+that ships with Vagrant.</p></li>
+<li><p><a href="http://download.parallels.com/desktop/v9/ga/docs/en_US/
+Parallels%20Desktop%20User&amp;#x27;s%20Guide/32791.htm">Parallels Tools</a> so that things such as shared
+folders can function. There are many other benefits to installing the tools,
+such as networking configuration and device mapping.</p></li>
+</ul>
+
+<h2>Optimizing the Box Size</h2>
+
+<p>Prior to packaging up a box, you should shrink the hard drives as much as
+possible. This can be done with <code>prl_disk_tool</code>:</p>
+
+<pre><code>$ prl_disk_tool compact /path/to/harddisk.hdd
+</code></pre>
+
+<h2>Packaging</h2>
+
+<p>Remove any extraneous files from the &quot;pvm&quot; folder and package it. Be sure to
+compress the tar with gzip (done below in a single command) since Parallels
+hard disks are not compressed by default.</p>
+
+<pre><code>$ cd /path/to/my/box.pvm/..
+$ tar cvzf custom.box ./box.pvm ./Vagrantfile ./metadata.json
+</code></pre>
+
+                            </div> <!-- /.span8 -->
+                        </div> <!-- /.row -->
+                    </div> <!-- /.page-contents -->
+				</div> <!-- /.container -->
+			</div> <!-- /.page -->
+
+			<!-- footer -->
+			<footer>
+			<div class="container">
+				<div class="row">
+                    <ul class="unstyled logos">
+                        <a href="http://www.vagrantup.com/downloads.html">
+                            <li class="vagrant-logo-monochrome">
+                                <p>Vagrant</p>
+                            </li>
+                        </a>
+                        <a href="http://www.parallels.com/downloads/desktop/">
+                            <li class="pd-logo-monochrome">
+                                <p>Parallels Desktop</p>
+                            </li>
+                        </a>
+                    </ul> <!-- /span -->
+
+				</div> <!-- /row -->
+
+				<div class="row">
+					<h6 class="legal">
+                        &copy; 2015 Parallels IP Holdings GmbH.
+					</h6>
+				</div> <!-- row -->
+			</div> <!-- container -->
+			</footer>
+
+			<!-- close .wrapper -->
+		</div>
+
+		<!-- load scripts -->
+	</body>
+</html>