vagrant-parallels 0.0.3.dev → 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGU5YWFiMzVmN2ZiNjQ4NmM1Y2Q2YzY3YTY2ODg4ZmFmZjMyYTYzMA==
+  data.tar.gz: !binary |-
+    ZDFmMjZjZTZhMzc3M2M5MDUyMDdkZDhmZDIwYmJkNGEzMDA0ZmY0OQ==
+SHA512:
+  metadata.gz: !binary |-
+    OGFhZGQ5NTE5NGVhNGYwOTk1OWFhYmMzNThlMTFkNmYxZGY3ZjRmNDMxNmJh
+    YzhhZTMwNWVlZjYxMWMwMjlkMmY0ZjdmYzAxY2UzNDgzNTIzZjliNTU1YWMw
+    NzcyOWIwNDY4NTM5ZWFmY2NlOGY5N2M3ZjQ5NjkwNzVhNzFhYTA=
+  data.tar.gz: !binary |-
+    NzdhMzdlOTEyMzU1ZThkZTJhMTdjMzMzMTk1YzMyNTY3MzNkZmFjZWI1ZTlm
+    N2I1ZGYwY2U3NjM3YjA5ZjRhYjlmOTIxZTI3MTgyNjMwNjBlYTM3YTA2ZGUy
+    ZmE1MTdmOTRkOWZmNzI5ODljYmFlOTAyZjAyZTY3ZTE5Njg0Njc=

data/README.md

@@ -1,19 +1,17 @@
 # Vagrant Parallels Provider
 
-This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [Parallels](http://www.parallels.com/products/desktop/)
-provider to Vagrant, allowing Vagrant to control and provision machines using Parallels insead of the default Virtualbox.
+This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [Parallels Desktop](http://www.parallels.com/products/desktop/)
+provider to Vagrant, allowing Vagrant to control and provision machines using Parallels Desktop insead of the default Virtualbox.
 
 ## Note
 
 This project is still in active development and not all vagrant features have been developed, please report any issues you might find.
-Almost all features are available except for exporting/packaging VM's this will be available soon isA (ان شاء الله)
+Almost all features are available except for exporting/packaging VM's this will be available soon.
 
 We look forward to hearing from you with any issues or features, Thank you
 
 ## Usage
-
-Install using standard Vagrant 1.1+ plugin installation methods. After
-installing, then do a `vagrant up` and specify the `parallels` provider. An example is shown below.
+Install using standard Vagrant 1.1+ plugin installation methods. After installing, then do a `vagrant up` and specify the `parallels` provider. An example is shown below.
 
 ```
 $ vagrant plugin install vagrant-parallels
@@ -79,3 +77,16 @@ Use bundler to execute Vagrant:
 ```
 $ bundle exec vagrant up --provider=parallels
 ```
+
+After testing you can also build a gem-package by yourself and then install it as a plugin:
+(if you have 'vagrant-parallels' plugin already installed, delete it first)
+
+```
+$ git clone https://github.com/yshahin/vagrant-parallels
+$ cd vagrant-parallels
+$ rake build 
+...
+$ vagrant plugin install ./pkg/vagrant-parallels-<version>.gem
+...
+```
+So, now you have your own plugin installed, check it by command `vagrant plugin list` 

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

@@ -15,16 +15,15 @@ module VagrantPlugins
           vm_name = prefix + "_#{Time.now.to_i}"
 
           # Verify the name is not taken
-          if env[:machine].provider.driver.registered? vm_name
+          if env[:machine].provider.driver.read_all_names.has_key?(vm_name)
             raise Vagrant::Errors::VMNameExists, :name => vm_name
           end
 
           # Import the virtual machine
-          template_name = Pathname.glob(
-              env[:machine].box.directory.join('*.pvm')
-            ).first.basename.to_s[0...-4]
+          template_path = File.realpath(Pathname.glob(env[:machine].box.directory.join('*.pvm')).first)
+          template_uuid = env[:machine].provider.driver.read_all_paths[template_path]
 
-          env[:machine].id = env[:machine].provider.driver.import(template_name, vm_name) do |progress|
+          env[:machine].id = env[:machine].provider.driver.import(template_uuid, vm_name) do |progress|
             env[:ui].clear_line
             env[:ui].report_progress(progress, 100, false)
           end

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

@@ -8,7 +8,7 @@ module VagrantPlugins
 
         def call(env)
           if env[:host]
-            vms = env[:machine].provider.driver.read_vms
+            vms = env[:machine].provider.driver.read_all_names
             env[:host].nfs_prune(vms.values)
           end
 

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

@@ -7,9 +7,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          pvm_file = Pathname.glob(env[:machine].box.directory.join('*.pvm')).first
+          pvm_glob = Pathname.glob(env[:machine].box.directory.join('*.pvm')).first
+          # TODO: Handle error cases better, throw a Vagrant error and not a stack trace etc.
+          pvm_file = File.realpath pvm_glob.to_s
 
-          unless env[:machine].provider.driver.registered?(pvm_file.basename.to_s[0...-4])
+          unless env[:machine].provider.driver.registered?(pvm_file)
             env[:machine].provider.driver.register(pvm_file.to_s)
           end
           # Call the next if we have one (but we shouldn't, since this

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

@@ -106,8 +106,17 @@ module VagrantPlugins
               @env[:ui].info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                     :guest_path => data[:guestpath]))
 
-              # Symlink to mounted folder to guest path
-              @env[:machine].provider.driver.symlink(id, data[:guestpath])
+              # Dup the data so we can pass it to the guest API
+              data = data.dup
+
+              # Calculate the owner and group
+              ssh_info = @env[:machine].ssh_info
+              data[:owner] ||= ssh_info[:username]
+              data[:group] ||= ssh_info[:username]
+
+              # Mount the actual folder
+              @env[:machine].guest.capability(
+                :mount_parallels_shared_folder, id, data[:guestpath], data)
             else
               # If no guest path is specified, then automounting is disabled
               @env[:ui].info(I18n.t("vagrant.actions.vm.share_folders.nomount_entry",

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

@@ -7,12 +7,14 @@ module VagrantPlugins
         end
 
         def call(env)
-          vm_name = Pathname.glob(
+          template_path = File.realpath(Pathname.glob(
             env[:machine].box.directory.join('*.pvm')
-            ).first.basename.to_s[0...-4]
+            ).first)
 
-          if env[:machine].provider.driver.registered?(vm_name)
-            env[:machine].provider.driver.unregister(vm_name)
+          template_uuid = env[:machine].provider.driver.read_all_paths[template_path]
+
+          if env[:machine].provider.driver.registered?(template_path)
+            env[:machine].provider.driver.unregister(template_uuid)
           end
           # Call the next if we have one (but we shouldn't, since this
           # middleware is built to run with the Call-type middlewares)

data/lib/vagrant-parallels/action.rb

@@ -76,8 +76,9 @@ module VagrantPlugins
               end
 
               b2.use Call, GracefulHalt, :stopped, :running do |env2, b3|
-                next if !env2[:result]
-                b3.use ForcedHalt
+                if !env2[:result]
+                  b3.use ForcedHalt
+                end
               end
             else
               b2.use MessageNotCreated
@@ -139,16 +140,14 @@ module VagrantPlugins
       # suspended machines.
       def self.action_resume
         Vagrant::Action::Builder.new.tap do |b|
-          Vagrant::Action::Builder.new.tap do |b|
-            b.use CheckParallels
-            b.use Call, Created do |env, b2|
-              if env[:result]
-                b2.use CheckAccessible
-                b2.use EnvSet, :port_collision_repair => false
-                b2.use Resume
-              else
-                b2.use MessageNotCreated
-              end
+          b.use CheckParallels
+          b.use Call, Created do |env, b2|
+            if env[:result]
+              b2.use CheckAccessible
+              b2.use EnvSet, :port_collision_repair => false
+              b2.use Resume
+            else
+              b2.use MessageNotCreated
             end
           end
         end

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

@@ -41,27 +41,27 @@ module VagrantPlugins
           read_settings(@uuid).fetch('State', 'inaccessible').to_sym
         end
 
-        # Returns a hash of all UUIDs of virtual machines currently
-        # known by Parallels. Hash keys is VM names
+        # Returns a hash of all UUIDs assigned to VMs and templates currently
+        # known by Parallels. Keys are 'name' values
         #
         # @return [Hash]
-        def read_vms
+        def read_all_names
           list = {}
-          json({}) { execute('list', '--all', '--json', retryable: true) }.each do |item|
-            list[item.fetch('name')] = item.fetch('uuid')
+          read_all_info.each do |item|
+            list[item.fetch('Name')] = item.fetch('ID')
           end
 
           list
         end
 
-        # Returns a hash of all UUIDs of VM templates currently
-        # known by Parallels. Hash keys is template names
+        # Returns a hash of all UUIDs assigned to VMs and templates currently
+        # known by Parallels. Keys are 'Home' directories
         #
         # @return [Hash]
-        def read_templates
+        def read_all_paths
           list = {}
-          json({}) { execute('list', '--template', '--json', retryable: true) }.each do |item|
-            list[item.fetch('name')] = item.fetch('uuid')
+          read_all_info.each do |item|
+            list[File.realpath item.fetch('Home')] = item.fetch('ID')
           end
 
           list
@@ -75,18 +75,24 @@ module VagrantPlugins
         #
         # This should raise a VagrantError if things are not ready.
         def verify!
+          # TODO: Use version method?
           execute('--version')
         end
 
+        def version
+          raw_version = execute('--version', retryable: true)
+          raw_version.gsub('/prlctl version /', '')
+        end
+
         def clear_shared_folders
           read_settings.fetch("Host Shared Folders", {}).keys.drop(1).each do |folder|
             execute("set", @uuid, "--shf-host-del", folder)
           end
         end
 
-        def import(template_name, vm_name)
+        def import(template_uuid, vm_name)
           last = 0
-          execute("clone", template_name, '--name', vm_name) do |type, data|
+          execute("clone", template_uuid, '--name', vm_name) do |type, data|
             lines = data.split("\r")
             # The progress of the import will be in the last line. Do a greedy
             # regular expression to find what we're looking for.
@@ -139,8 +145,10 @@ module VagrantPlugins
           execute("unregister", uuid)
         end
 
-        def registered?(name)
-          read_templates.has_key?(name) || read_vms.has_key?(name)
+        def registered?(path)
+          # TODO: Make this take UUID and have callers pass that instead
+          # Need a way to get the UUID from unregistered templates though (config.pvs XML parsing/regex?)
+          read_all_paths.has_key?(path)
         end
 
         def set_mac_address(mac)
@@ -162,10 +170,6 @@ module VagrantPlugins
           end
         end
 
-        def symlink(id, path)
-          guest_execute('ln', '-sf', "/media/psf/#{id}", path)
-        end
-
         def execute_command(command)
           raw(*command)
         end
@@ -186,6 +190,17 @@ module VagrantPlugins
 
         private
 
+        # Parse the JSON from *all* VMs and templates. Then return an array of objects (without duplicates)
+        def read_all_info
+          vms_arr = json({}) do
+            execute('list', '--info', '--json', retryable: true).gsub(/^(INFO)?/, '')
+          end
+          templates_arr = json({}) do
+            execute('list', '--info', '--json', '--template', retryable: true).gsub(/^(INFO)?/, '')
+          end
+          vms_arr | templates_arr
+        end
+
         def read_settings(uuid=nil)
           uuid ||= @uuid
           json({}) { execute('list', uuid, '--info', '--json', retryable: true).gsub(/^(INFO)?\[/, '').gsub(/\]$/, '') }

data/lib/vagrant-parallels/guest_cap/darwin/mount_parallels_shared_folder.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module Parallels
+    module GuestDarwinCap
+      class MountParallelsSharedFolder
+
+        def self.mount_parallels_shared_folder(machine, name, guestpath, options)
+          machine.communicate.tap do |comm|
+            # clear prior symlink
+            if comm.test("test -L \"#{guestpath}\"", :sudo => true)
+              comm.sudo("rm \"#{guestpath}\"")
+            end
+
+            # clear prior directory if exists
+            if comm.test("test -d \"#{guestpath}\"", :sudo => true)
+              comm.sudo("rm -Rf \"#{guestpath}\"")
+            end
+
+            # create intermediate directories if needed
+            intermediate_dir = File.dirname(guestpath)
+            if !comm.test("test -d \"#{intermediate_dir}\"", :sudo => true)
+              comm.sudo("mkdir -p \"#{intermediate_dir}\"")
+            end
+
+            # finally make the symlink
+            comm.sudo("ln -s \"/Volumes/SharedFolders/#{name}\" \"#{guestpath}\"")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/guest_cap/linux/mount_parallels_shared_folder.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module Parallels
+    module GuestLinuxCap
+      class MountParallelsSharedFolder
+
+        def self.mount_parallels_shared_folder(machine, name, guestpath, options)
+          machine.communicate.tap do |comm|
+            # clear prior symlink
+            if comm.test("test -L \"#{guestpath}\"", :sudo => true)
+              comm.sudo("rm \"#{guestpath}\"")
+            end
+
+            # clear prior directory if exists
+            if comm.test("test -d \"#{guestpath}\"", :sudo => true)
+              comm.sudo("rm -Rf \"#{guestpath}\"")
+            end
+
+            # create intermediate directories if needed
+            intermediate_dir = File.dirname(guestpath)
+            if !comm.test("test -d \"#{intermediate_dir}\"", :sudo => true)
+              comm.sudo("mkdir -p \"#{intermediate_dir}\"")
+            end
+
+            # finally make the symlink
+            comm.sudo("ln -s \"/media/psf/#{name}\" \"#{guestpath}\"")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/plugin.rb

@@ -1,5 +1,3 @@
-require "vagrant"
-
 begin
   require "vagrant"
 rescue LoadError
@@ -70,6 +68,17 @@ module VagrantPlugins
       #   require File.expand_path("../config", __FILE__)
       #   Config
       # end
+
+      guest_capability(:darwin, :mount_parallels_shared_folder) do
+        require_relative "guest_cap/darwin/mount_parallels_shared_folder"
+        GuestDarwinCap::MountParallelsSharedFolder
+      end
+
+      guest_capability(:linux, :mount_parallels_shared_folder) do
+        require_relative "guest_cap/linux/mount_parallels_shared_folder"
+        GuestLinuxCap::MountParallelsSharedFolder
+      end
+
     end
 
     module Driver

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "0.0.3.dev"
+    VERSION = "0.0.3"
   end
 end

data/vagrant-parallels.gemspec

@@ -55,5 +55,5 @@ Gem::Specification.new do |spec|
 
   spec.files = unignored_files
   spec.executables = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-  spec.require_path = ["lib"]
+  spec.require_path = "lib"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 0.0.3.dev
-  prerelease: 6
+  version: 0.0.3
 platform: ruby
 authors:
 - Youssef Shahin
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,6 +120,8 @@ files:
 - lib/vagrant-parallels/action.rb
 - lib/vagrant-parallels/driver/prl_ctl.rb
 - lib/vagrant-parallels/errors.rb
+- lib/vagrant-parallels/guest_cap/darwin/mount_parallels_shared_folder.rb
+- lib/vagrant-parallels/guest_cap/linux/mount_parallels_shared_folder.rb
 - lib/vagrant-parallels/plugin.rb
 - lib/vagrant-parallels/provider.rb
 - lib/vagrant-parallels/version.rb
@@ -146,26 +137,26 @@ files:
 homepage: http://github.com/yshahin/vagrant-parallels
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-parallels
-rubygems_version: 1.8.25
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to manage Parallels machines.
 test_files: []
+has_rdoc: