vagrant-parallels 1.4.0.rc1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b4e446a9236fe27c45d9f8e79cbc7e5debda99d
-  data.tar.gz: c27a4ff8d5072c5ec13e77867b6b006aaf430be7
+  metadata.gz: 306ebd48d59715804e53acffe8374dce654da8d6
+  data.tar.gz: fec3081ce4be30623c2cbe6e9382748d54791369
 SHA512:
-  metadata.gz: da331c7f9b348afc57b8e4cd35ac95d9db2ef6691c77e30de2c54a7ebcbf842dc02e90fb842dfa1855e60a66a152714243189e3f6f55388d4ba2042bff6af014
-  data.tar.gz: a30ce5518be12603fc39e76e196f84ac48d664cabe89ca14f4d9f006ad6a89ffe497cd08ba014f53e5db378d592c03c993cd62fe25e19cd350363032277ae8b7
+  metadata.gz: 9d9850ddedfb13d1876f207bfe07d57e131a438a65638c02d003f1f447bf23378b9ef16ef901b80e478aee78c51fc3629f004458c017da57ca7e757049f8d6c3
+  data.tar.gz: 0a838571c3b37e78c99e129fd5d2bddfa6910ac2b07a90211f616995aaed665c9400aa723da566def421b82b26bf65f4a263b0ab8b10bab94a74407534517d88

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

@@ -261,14 +261,15 @@ module VagrantPlugins
         # Returns an IP of the virtual machine. It requires that Shared network
         # adapter is configured for this VM and it obtains an IP via DHCP.
         #
-        #
         # @return [String] IP address leased by DHCP server in "Shared" network
         def read_guest_ip
           mac_addr = read_mac_address.downcase
           leases_file = '/Library/Preferences/Parallels/parallels_dhcp_leases'
+          leases = {}
           begin
             File.open(leases_file).grep(/#{mac_addr}/) do |line|
-              return line[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
+              _, ip, exp, dur, _, _ = line.split /([\d.]*)="(\d*),(\d*),(\w*),(\w*)".*/
+              leases[ip] = exp.to_i - dur.to_i
             end
           rescue Errno::EACCES
             raise Errors::DhcpLeasesNotAccessible, :leases_file => leases_file.to_s
@@ -278,7 +279,10 @@ module VagrantPlugins
             return nil
           end
 
-          nil
+          return nil if leases.empty?
+
+          # Get the most resent lease and return an associated IP
+          leases.sort_by { |_ip, lease_time| lease_time }.last.first
         end
 
         # Returns path to the Parallels Tools ISO file.

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.4.0.rc1'
+    VERSION = '1.4.0'
   end
 end

data/test/unit/driver/pd_8_test.rb

@@ -7,24 +7,4 @@ describe VagrantPlugins::Parallels::Driver::PD_8 do
   subject { VagrantPlugins::Parallels::Driver::Meta.new(uuid) }
 
   it_behaves_like "parallels desktop driver"
-
-  describe "ssh_ip" do
-    let(:content) {'10.200.0.99="1394547632,1800,001c420000ff,01001c420000ff"'}
-
-    it "returns an IP address assigned to the specified MAC" do
-      driver.should_receive(:read_mac_address).and_return("001C420000FF")
-      File.should_receive(:open).with(an_instance_of(String)).
-        and_return(StringIO.new(content))
-
-      subject.ssh_ip.should == "10.200.0.99"
-    end
-
-    it "rises DhcpLeasesNotAccessible exception when file is not accessible" do
-      File.stub(:open).and_call_original
-      File.should_receive(:open).with(an_instance_of(String)).
-        and_raise(Errno::EACCES)
-      expect { subject.ssh_ip }.
-        to raise_error(VagrantPlugins::Parallels::Errors::DhcpLeasesNotAccessible)
-    end
-  end
 end

data/test/unit/driver/pd_9_test.rb

@@ -26,25 +26,4 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
       subject.set_power_consumption_mode(false)
     end
   end
-
-  describe "ssh_ip" do
-    let(:content) {'10.200.0.99="1394547632,1800,001c420000ff,01001c420000ff"'}
-
-    it "returns an IP address assigned to the specified MAC" do
-      driver.should_receive(:read_mac_address).and_return("001C420000FF")
-      File.should_receive(:open).with(an_instance_of(String)).
-        and_return(StringIO.new(content))
-
-      subject.ssh_ip.should == "10.200.0.99"
-    end
-
-    it "rises DhcpLeasesNotAccessible exception when file is not accessible" do
-      File.stub(:open).and_call_original
-      File.should_receive(:open).with(an_instance_of(String)).
-        and_raise(Errno::EACCES)
-      expect { subject.ssh_ip }.
-        to raise_error(VagrantPlugins::Parallels::Errors::DhcpLeasesNotAccessible)
-    end
-  end
-
 end

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

@@ -269,6 +269,27 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
+  describe "ssh_ip" do
+    let(:content) {'10.200.0.100="1394546410,1800,001c420000ff,01001c420000ff
+                    10.200.0.99="1394547632,1800,001c420000ff,01001c420000ff"'}
+
+    it "returns an IP address assigned to the specified MAC" do
+      driver.should_receive(:read_mac_address).and_return("001C420000FF")
+      File.should_receive(:open).with(an_instance_of(String)).
+        and_return(StringIO.new(content))
+
+      subject.ssh_ip.should == "10.200.0.99"
+    end
+
+    it "rises DhcpLeasesNotAccessible exception when file is not accessible" do
+      File.stub(:open).and_call_original
+      File.should_receive(:open).with(an_instance_of(String)).
+        and_raise(Errno::EACCES)
+      expect { subject.ssh_ip }.
+        to raise_error(VagrantPlugins::Parallels::Errors::DhcpLeasesNotAccessible)
+    end
+  end
+
   describe "start" do
     it "starts the VM" do
       subprocess.should_receive(:execute).

data/vagrant-parallels.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   root_path = File.dirname(__FILE__)
   all_files = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
   all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
+  all_files.reject! { |file| file.start_with?("website/") }
   gitignore_path = File.join(root_path, ".gitignore")
   gitignore = File.readlines(gitignore_path)
   gitignore.map! { |line| line.chomp.strip }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,42 +181,6 @@ files:
 - test/unit/synced_folder_test.rb
 - vagrant-parallels.gemspec
 - vagrant-spec.config.example.rb
-- website/docs/build/404.html
-- website/docs/build/docs/boxes/base.html
-- website/docs/build/docs/boxes/index.html
-- website/docs/build/docs/boxes/packer.html
-- website/docs/build/docs/boxes/veewee.html
-- website/docs/build/docs/configuration.html
-- website/docs/build/docs/contacts.html
-- website/docs/build/docs/getting-started.html
-- website/docs/build/docs/index.html
-- website/docs/build/docs/installation/index.html
-- website/docs/build/docs/installation/uninstallation.html
-- website/docs/build/docs/installation/updating.html
-- website/docs/build/docs/networking/forwarded_ports.html
-- website/docs/build/docs/networking/index.html
-- website/docs/build/docs/networking/private_network.html
-- website/docs/build/docs/networking/public_network.html
-- website/docs/build/docs/share.html
-- website/docs/build/docs/usage.html
-- website/docs/build/images/current_pointer-539d41b3.png
-- website/docs/build/images/footer_pd_logo-6ec6c3c6.png
-- website/docs/build/images/footer_vagrant_logo-8c7e7b39.png
-- website/docs/build/images/logo_docs-7e96bb5e.png
-- website/docs/build/images/logo_docs_small-c0512386.png
-- website/docs/build/images/nav_divider-0c73f644.png
-- website/docs/build/images/open_close-8d5572c4.png
-- website/docs/build/index.html
-- website/docs/build/javascripts/backstretch-f9c163c1.js
-- website/docs/build/javascripts/bootstrap.min-98cc7a22.js
-- website/docs/build/javascripts/fittext-b487af57.js
-- website/docs/build/javascripts/grid-overlay-19e89cad.js
-- website/docs/build/javascripts/jquery-15b079d7.js
-- website/docs/build/javascripts/less-1.3.0.min-0bbbfaf9.js
-- website/docs/build/javascripts/modernizr-d56a170f.js
-- website/docs/build/javascripts/vagrant-parallels-966ff22c.js
-- website/docs/build/stylesheets/bootstrap-8082a218.css
-- website/docs/build/stylesheets/vagrant-parallels-a389b6ea.css
 homepage: http://github.com/Parallels/vagrant-parallels
 licenses:
 - MIT

data/website/docs/build/404.html

@@ -1,134 +0,0 @@
-<!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

@@ -1,207 +0,0 @@
-<!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>