vagrant-parallels 0.1.2 → 0.1.3

data/lib/vagrant-parallels/action/match_mac_address.rb

@@ -9,9 +9,16 @@ module VagrantPlugins
         def call(env)
           raise Vagrant::Errors::VMBaseMacNotSpecified if !env[:machine].config.vm.base_mac
 
-          # Create the proc which we want to use to modify the virtual machine
-          env[:ui].info I18n.t("vagrant.actions.vm.match_mac.matching")
-          env[:machine].provider.driver.set_mac_address(env[:machine].config.vm.base_mac)
+          env[:ui].info I18n.t("vagrant_parallels.actions.vm.match_mac.matching")
+
+          base_mac = env[:machine].config.vm.base_mac
+          # Generate new base mac if the specified address is already in use
+          if env[:machine].provider.driver.mac_in_use?(base_mac)
+            env[:ui].info I18n.t("vagrant_parallels.actions.vm.match_mac.generate")
+            env[:machine].provider.driver.set_mac_address('auto')
+          else
+            env[:machine].provider.driver.set_mac_address(base_mac)
+          end
 
           @app.call(env)
         end

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

@@ -40,6 +40,7 @@ module VagrantPlugins
 
         def compact(uuid=nil)
           uuid ||= @uuid
+          # TODO: VM can have more than one hdd!
           path_to_hdd = read_settings(uuid).fetch("Hardware", {}).fetch("hdd0", {}).fetch("image", nil)
           raw('prl_disk_tool', 'compact', '--hdd', path_to_hdd) do |type, data|
             lines = data.split("\r")
@@ -80,7 +81,9 @@ module VagrantPlugins
         end
 
         def clear_shared_folders
-          read_settings.fetch("Host Shared Folders", {}).keys.drop(1).each do |folder|
+          shf = read_settings.fetch("Host Shared Folders", {}).keys
+          shf.delete("enabled")
+          shf.each do |folder|
             execute("set", @uuid, "--shf-host-del", folder)
           end
         end
@@ -214,6 +217,18 @@ module VagrantPlugins
           end
         end
 
+
+        def mac_in_use?(mac)
+          all_macs_in_use = []
+          read_all_info.each do |vm|
+            all_macs_in_use << vm.fetch('Hardware', {}).fetch('net0',{}).fetch('mac', '')
+          end
+
+          valid_mac = mac.upcase.tr('^A-F0-9', '')
+
+          all_macs_in_use.include?(valid_mac)
+        end
+
         # Returns a hash of all UUIDs assigned to VMs and templates currently
         # known by Parallels. Keys are 'name' values
         #

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/locales/en.yml

@@ -890,7 +890,10 @@ en:
             The VM import failed! Try running `prlctl import` on the box file
             manually for more verbose error output.
         match_mac:
-          matching: Matching MAC address for NAT networking...
+          generate: |-
+            The specified base MAC is already in use. Generating a new unique MAC
+            address for Shared network...
+          matching: Matching MAC address for Shared network...
           no_base_mac: |-
             No base MAC address was specified. This is required for the NAT networking
             to work properly (and hence port forwarding, SSH, etc.). Specifying this

data/tasks/bundler.rake

@@ -0,0 +1,3 @@
+# This installs the tasks that help with gem creation and
+# publishing.
+Bundler::GemHelper.install_tasks

data/tasks/test.rake

@@ -0,0 +1,12 @@
+require 'rake/testtask'
+require 'rspec/core/rake_task'
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = "test/unit/**/*_test.rb"
+  end
+
+  RSpec::Core::RakeTask.new(:acceptance) do |t|
+    t.pattern = "test/acceptance/**/*_test.rb"
+  end
+end

data/test/support/isolated_environment.rb

@@ -0,0 +1,46 @@
+require "fileutils"
+require "pathname"
+
+require "log4r"
+
+require "support/tempdir"
+
+# This class manages an isolated environment for Vagrant to
+# run in. It creates a temporary directory to act as the
+# working directory as well as sets a custom home directory.
+#
+# This class also provides various helpers to create Vagrantfiles,
+# boxes, etc.
+class IsolatedEnvironment
+  attr_reader :homedir
+  attr_reader :workdir
+
+  # Initializes an isolated environment. You can pass in some
+  # options here to configure runing custom applications in place
+  # of others as well as specifying environmental variables.
+  #
+  # @param [Hash] apps A mapping of application name (such as "vagrant")
+  #   to an alternate full path to the binary to run.
+  # @param [Hash] env Additional environmental variables to inject
+  #   into the execution environments.
+  def initialize
+    @logger = Log4r::Logger.new("test::isolated_environment")
+
+    # Create a temporary directory for our work
+    @tempdir = Tempdir.new("vagrant")
+    @logger.info("Initialize isolated environment: #{@tempdir.path}")
+
+    # Setup the home and working directories
+    @homedir = Pathname.new(File.join(@tempdir.path, "home"))
+    @workdir = Pathname.new(File.join(@tempdir.path, "work"))
+
+    @homedir.mkdir
+    @workdir.mkdir
+  end
+
+  # This closes the environment by cleaning it up.
+  def close
+    @logger.info("Removing isolated environment: #{@tempdir.path}")
+    FileUtils.rm_rf(@tempdir.path)
+  end
+end

data/test/support/tempdir.rb

@@ -0,0 +1,43 @@
+require 'fileutils'
+require 'tempfile'
+
+# This class provides an easy way of creating a temporary
+# directory and having it removed when the application exits.
+class Tempdir
+  attr_reader :path
+
+  def initialize(basename="vagrant")
+    @path = nil
+
+    # Loop and attempt to create a temporary directory until
+    # it succeeds.
+    while @path.nil?
+      file = Tempfile.new(basename)
+      @path = file.path
+      file.unlink
+
+      begin
+        Dir.mkdir(@path)
+      rescue
+        @path = nil
+      end
+    end
+
+    # Setup a finalizer to delete the directory. This is the same way
+    # that Tempfile and friends do this...
+    @cleanup_proc = lambda do
+      FileUtils.rm_rf(@path) if File.directory?(@path)
+    end
+
+    ObjectSpace.define_finalizer(self, @cleanup_proc)
+  end
+
+  # This deletes the temporary directory.
+  def unlink
+    # Delete the directory
+    @cleanup_proc.call
+
+    # Undefine the finalizer since we're all cleaned up
+    ObjectSpace.undefine_finalizer(self)
+  end
+end

data/test/unit/base.rb

@@ -0,0 +1,27 @@
+require "rubygems"
+require "rspec/autorun"
+
+# Require Vagrant itself so we can reference the proper
+# classes to test.
+require "vagrant"
+require 'vagrant-parallels'
+
+# Add the test directory to the load path
+$:.unshift File.expand_path("../../", __FILE__)
+
+# Load in helpers
+require "support/tempdir"
+require "unit/support/shared/parallels_context"
+
+# Do not buffer output
+$stdout.sync = true
+$stderr.sync = true
+
+# Configure RSpec
+RSpec.configure do |c|
+  c.expect_with :rspec, :stdlib
+end
+
+# Configure VAGRANT_CWD so that the tests never find an actual
+# Vagrantfile anywhere, or at least this minimizes those chances.
+ENV["VAGRANT_CWD"] = Tempdir.new.path

data/test/unit/driver/prl_ctl_test.rb

@@ -0,0 +1,138 @@
+require_relative "../base"
+
+describe VagrantPlugins::Parallels::Driver::PrlCtl do
+  include_context "parallels"
+
+  subject { VagrantPlugins::Parallels::Driver::PrlCtl.new(uuid) }
+
+  describe "compact" do
+    it "compacts the VM disk images" do
+      pending "Should have possibility to compact more than one hdd"
+    end
+  end
+
+  describe "create_host_only_network" do
+    it "creates host-only NIC"
+  end
+
+  describe "export" do
+    tpl_name = "new_template_name"
+    tpl_uuid = "12345-hfgs-3456-hste"
+
+    it "exports VM to template" do
+      subject.stub(:read_settings).with(tpl_name).
+        and_return({"ID" => tpl_uuid})
+
+      subprocess.should_receive(:execute).
+        with("prlctl", "clone", uuid, "--name", an_instance_of(String), "--template", "--dst",
+             an_instance_of(String), an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "The VM has been successfully cloned"))
+      subject.export("/path/to/template", tpl_name).should == tpl_uuid
+    end
+  end
+
+  describe "clear_shared_folders" do
+    shf_hash = {"enabled" => true, "shf_name_1" => {}, "shf_name_2" => {}}
+    it "deletes every shared folder assigned to the VM" do
+      subject.stub(:read_settings).and_return({"Host Shared Folders" => shf_hash})
+
+      subprocess.should_receive(:execute).exactly(2).times.
+        with("prlctl", "set", uuid, "--shf-host-del", an_instance_of(String), an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "Shared folder deleted"))
+      subject.clear_shared_folders
+    end
+  end
+
+  describe "halt" do
+    it "stops the VM" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "stop", uuid, an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "VM has been halted gracefully"))
+      subject.halt
+    end
+
+    it "stops the VM force" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "stop", uuid, "--kill", an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "VM has been halted forcibly"))
+      subject.halt(force=true)
+    end
+  end
+
+  describe "mac_in_use?" do
+    vm_1 = {
+      'Hardware' => {
+        'net0' => {'mac' => '001C42BB5901'},
+        'net1' => {'mac' => '001C42BB5902'},
+      }
+    }
+    vm_2 = {
+      'Hardware' => {
+        'net0' => {'mac' => '001C42BB5903'},
+        'net1' => {'mac' => '001C42BB5904'},
+      }
+    }
+
+    it "checks the MAC address is already in use" do
+      subject.stub(:read_all_info).and_return([vm_1, vm_2])
+
+      subject.mac_in_use?('00:1c:42:bb:59:01').should be_true
+      subject.mac_in_use?('00:1c:42:bb:59:02').should be_false
+      subject.mac_in_use?('00:1c:42:bb:59:03').should be_true
+      subject.mac_in_use?('00:1c:42:bb:59:04').should be_false
+    end
+  end
+
+  describe "set_mac_address" do
+    it "sets base MAC address to the Shared network adapter" do
+      subprocess.should_receive(:execute).exactly(2).times.
+        with("prlctl", "set", uuid, '--device-set', 'net0', '--type', 'shared', '--mac',
+           an_instance_of(String), an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "Settings applied"))
+
+      subject.set_mac_address('001C42DD5902')
+      subject.set_mac_address('auto')
+    end
+  end
+
+  describe "start" do
+    it "starts the VM" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "start", uuid, an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "VM started"))
+      subject.start
+    end
+  end
+
+  describe "suspend" do
+    it "suspends the VM" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "suspend", uuid, an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "VM suspended"))
+      subject.suspend
+    end
+  end
+
+  describe "unregister" do
+    it "suspends the VM" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "unregister", an_instance_of(String), an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "Specified VM unregistered"))
+      subject.unregister("template_or_vm_uuid")
+    end
+  end
+
+  describe "version" do
+    it "parses the version from output" do
+      subject.version.should match(/(#{parallels_version}[\d\.]+)/)
+    end
+
+    it "rises ParallelsInstallIncomplete exception when output is invalid" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "--version", an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "Some incorrect value has been returned!"))
+      expect { subject.version }.
+        to raise_error(VagrantPlugins::Parallels::Errors::ParallelsInstallIncomplete)
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+shared_context "parallels" do
+  let(:parallels_context) { true                                }
+  let(:uuid)              { "9876-dcba-8765-hgfe"               }
+  let(:parallels_version) { "9"                                 }
+  let(:subprocess)        { double("Vagrant::Util::Subprocess") }
+
+  # this is a helper that returns a duck type suitable from a system command
+  # execution; allows setting exit_code, stdout, and stderr in stubs.
+  def subprocess_result(options={})
+    defaults = {exit_code: 0, stdout: "", stderr: ""}
+    double("subprocess_result", defaults.merge(options))
+  end
+
+  before do
+    # 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)
+
+    # drivers will blow up on instantiation if they cannot determine the
+    # Parallels Desktop version, so wire this stub in automatically
+    subprocess.stub(:execute).
+      with("prlctl", "--version", an_instance_of(Hash)).
+      and_return(subprocess_result(stdout: "prlctl version #{parallels_version}.23456.987654"))
+
+    # drivers also call vm_exists? during init;
+    subprocess.stub(:execute).
+      with("prlctl", "list", kind_of(String), "--info", "--json", kind_of(Hash)).
+      and_return(subprocess_result(exit_code: 0))
+  end
+end

data/vagrant-parallels.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-core", "~> 2.12.2"
-  spec.add_development_dependency "rspec-expectations", "~> 2.12.1"
-  spec.add_development_dependency "rspec-mocks", "~> 2.12.1"
+  spec.add_development_dependency "rspec", "~> 2.14.0"
 
   # The following block of code determines the files that should be included
   # in the gem. It does this by reading all the files in the directory where

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,39 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.2
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.0
 description: Enables Vagrant to manage Parallels machines.
 email:
 - yshahin@gmail.com
@@ -148,10 +116,15 @@ files:
 - locales/en.yml
 - Rakefile
 - README.md
-- spec/vagrant-parallels/setup_spec.rb
+- tasks/bundler.rake
+- tasks/test.rake
+- test/support/isolated_environment.rb
+- test/support/tempdir.rb
+- test/unit/base.rb
+- test/unit/driver/prl_ctl_test.rb
+- test/unit/support/shared/parallels_context.rb
 - vagrant-parallels.gemspec
 - .gitignore
-- .ruby-gemset
 - .travis.yml
 homepage: http://github.com/yshahin/vagrant-parallels
 licenses:
@@ -168,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -845057650540824242
+      hash: 1018017984449213160
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: