vagrant-parallels 0.0.3 → 0.0.4.dev

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGU5YWFiMzVmN2ZiNjQ4NmM1Y2Q2YzY3YTY2ODg4ZmFmZjMyYTYzMA==
+    NmE4NmE1N2UwMDYzMjM0ZDVlNDdjNTBkYmIwMGEwOWE2NWI1YTM1ZQ==
   data.tar.gz: !binary |-
-    ZDFmMjZjZTZhMzc3M2M5MDUyMDdkZDhmZDIwYmJkNGEzMDA0ZmY0OQ==
+    MjUzYWFlNjE5ZWY1MTBjZjQyNmMxZTNhNWZkOWI2NWQzYjUzZTM1OQ==
 SHA512:
   metadata.gz: !binary |-
-    OGFhZGQ5NTE5NGVhNGYwOTk1OWFhYmMzNThlMTFkNmYxZGY3ZjRmNDMxNmJh
-    YzhhZTMwNWVlZjYxMWMwMjlkMmY0ZjdmYzAxY2UzNDgzNTIzZjliNTU1YWMw
-    NzcyOWIwNDY4NTM5ZWFmY2NlOGY5N2M3ZjQ5NjkwNzVhNzFhYTA=
+    NWM3MGY4NWQyMzk3NTFmMDE0YWFhZDE0NWUzMmU1ZWVjMjkwMWJkNzc2ZjVj
+    NmU5MWJmYTdkN2IwNmMxMzIxYjkzZWFhMGYzM2NjMzVlNWZiNzAyYjQ5Nzlh
+    MmJjZGI0ZWFiNGY4NjU5MDU4MzYzNjJmNjAyMTA0YTBlNTgyZDY=
   data.tar.gz: !binary |-
-    NzdhMzdlOTEyMzU1ZThkZTJhMTdjMzMzMTk1YzMyNTY3MzNkZmFjZWI1ZTlm
-    N2I1ZGYwY2U3NjM3YjA5ZjRhYjlmOTIxZTI3MTgyNjMwNjBlYTM3YTA2ZGUy
-    ZmE1MTdmOTRkOWZmNzI5ODljYmFlOTAyZjAyZTY3ZTE5Njg0Njc=
+    YjNiYWYxNjdjNDdjMTAwNTAwNjA3NzFlMzBhZTE0NWEzNjk1Mjk1Mjg2NmFj
+    MDE0OTIzMTZjYmI0MWFiNjY5YjkwZjYwYTY0MjkyNWExODkzMWZjOTUwZjU2
+    MjAzMjAxYzEyMzNiMDc0ODgzYzQxMTI1YmE4ZWQzNGE1YjA1ZDg=

data/README.md

@@ -1,20 +1,22 @@
 # Vagrant Parallels Provider
 
-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.
+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.
 
 ## 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.
+Almost all features are available except for exporting/packaging VM's this will be available soon [isA](http://en.wikipedia.org/wiki/In_Shaa%27_Allah) (ان شاء الله)
 
 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
+$ vagrant plugin install vagrant-parallels --plugin-prerelease
 ...
 $ vagrant init
 $ vagrant up --provider=parallels
@@ -77,16 +79,3 @@ 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.rb

@@ -76,9 +76,8 @@ module VagrantPlugins
               end
 
               b2.use Call, GracefulHalt, :stopped, :running do |env2, b3|
-                if !env2[:result]
-                  b3.use ForcedHalt
-                end
+                next if !env2[:result]
+                b3.use ForcedHalt
               end
             else
               b2.use MessageNotCreated
@@ -140,14 +139,16 @@ module VagrantPlugins
       # suspended machines.
       def self.action_resume
         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
+          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
             end
           end
         end

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

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

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

@@ -7,11 +7,9 @@ module VagrantPlugins
         end
 
         def call(env)
-          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
+          pvm_file = Pathname.glob(env[:machine].box.directory.join('*.pvm')).first
 
-          unless env[:machine].provider.driver.registered?(pvm_file)
+          unless env[:machine].provider.driver.registered?(pvm_file.basename.to_s[0...-4])
             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,17 +106,8 @@ module VagrantPlugins
               @env[:ui].info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                     :guest_path => 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)
+              # Symlink to mounted folder to guest path
+              @env[:machine].provider.driver.symlink(id, data[:guestpath])
             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,14 +7,12 @@ module VagrantPlugins
         end
 
         def call(env)
-          template_path = File.realpath(Pathname.glob(
+          vm_name = Pathname.glob(
             env[:machine].box.directory.join('*.pvm')
-            ).first)
+            ).first.basename.to_s[0...-4]
 
-          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)
+          if env[:machine].provider.driver.registered?(vm_name)
+            env[:machine].provider.driver.unregister(vm_name)
           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/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 assigned to VMs and templates currently
-        # known by Parallels. Keys are 'name' values
+        # Returns a hash of all UUIDs of virtual machines currently
+        # known by Parallels. Hash keys is VM names
         #
         # @return [Hash]
-        def read_all_names
+        def read_vms
           list = {}
-          read_all_info.each do |item|
-            list[item.fetch('Name')] = item.fetch('ID')
+          json({}) { execute('list', '--all', '--json', retryable: true) }.each do |item|
+            list[item.fetch('name')] = item.fetch('uuid')
           end
 
           list
         end
 
-        # Returns a hash of all UUIDs assigned to VMs and templates currently
-        # known by Parallels. Keys are 'Home' directories
+        # Returns a hash of all UUIDs of VM templates currently
+        # known by Parallels. Hash keys is template names
         #
         # @return [Hash]
-        def read_all_paths
+        def read_templates
           list = {}
-          read_all_info.each do |item|
-            list[File.realpath item.fetch('Home')] = item.fetch('ID')
+          json({}) { execute('list', '--template', '--json', retryable: true) }.each do |item|
+            list[item.fetch('name')] = item.fetch('uuid')
           end
 
           list
@@ -75,24 +75,18 @@ 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_uuid, vm_name)
+        def import(template_name, vm_name)
           last = 0
-          execute("clone", template_uuid, '--name', vm_name) do |type, data|
+          execute("clone", template_name, '--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.
@@ -145,10 +139,8 @@ module VagrantPlugins
           execute("unregister", uuid)
         end
 
-        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)
+        def registered?(name)
+          read_templates.has_key?(name) || read_vms.has_key?(name)
         end
 
         def set_mac_address(mac)
@@ -170,6 +162,10 @@ module VagrantPlugins
           end
         end
 
+        def symlink(id, path)
+          guest_execute('ln', '-sf', "/media/psf/#{id}", path)
+        end
+
         def execute_command(command)
           raw(*command)
         end
@@ -190,17 +186,6 @@ 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/plugin.rb

@@ -1,3 +1,5 @@
+require "vagrant"
+
 begin
   require "vagrant"
 rescue LoadError
@@ -68,17 +70,6 @@ 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"
+    VERSION = "0.0.4.dev"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.dev
 platform: ruby
 authors:
 - Youssef Shahin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,8 +120,6 @@ 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
@@ -141,7 +139,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='

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

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

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