vagrant-parallels 0.0.6 → 0.0.7

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

@@ -35,7 +35,7 @@ module VagrantPlugins
           machine.provider.driver.read_network_interfaces.each do |adapter, opts|
             if opts[:type] == :hostonly
               machine.provider.driver.read_host_only_interfaces.each do |interface|
-                if interface[:name] == opts[:hostonly]
+                if interface[:bound_to] == opts[:hostonly]
                   return interface[:ip]
                 end
               end
@@ -50,13 +50,18 @@ module VagrantPlugins
         #
         # @return [String]
         def read_machine_ip(machine)
+          ips = []
           machine.config.vm.networks.each do |type, options|
             if type == :private_network && options[:ip].is_a?(String)
-              return options[:ip]
+              ips << options[:ip]
             end
           end
 
-          nil
+          if ips.empty?
+            return nil
+          end
+
+          ips
         end
       end
     end

data/lib/vagrant-parallels/action.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
           # b.use HandleForwardedPortCollisions
           b.use PruneNFSExports
           b.use NFS
-          #b.use PrepareNFSSettings
+          b.use PrepareNFSSettings
           b.use ClearSharedFolders
           b.use ShareFolders
           b.use Network
@@ -268,7 +268,6 @@ module VagrantPlugins
         end
       end
 
-      #autoload :PrepareNFSSettings, File.expand_path("../action/prepare_nfs_settings", __FILE__)
       autoload :Boot, File.expand_path("../action/boot", __FILE__)
       autoload :CheckAccessible, File.expand_path("../action/check_accessible", __FILE__)
       autoload :CheckCreated, File.expand_path("../action/check_created", __FILE__)
@@ -295,6 +294,7 @@ module VagrantPlugins
       autoload :Network, File.expand_path("../action/network", __FILE__)
       autoload :Package, File.expand_path("../action/package", __FILE__)
       autoload :PackageConfigFiles, File.expand_path("../action/package_config_files", __FILE__)
+      autoload :PrepareNFSSettings, File.expand_path("../action/prepare_nfs_settings", __FILE__)
       autoload :PruneNFSExports, File.expand_path("../action/prune_nfs_exports", __FILE__)
       autoload :RegisterTemplate, File.expand_path("../action/register_template", __FILE__)
       autoload :Resume, File.expand_path("../action/resume", __FILE__)

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

@@ -38,6 +38,19 @@ module VagrantPlugins
           @logger.info("CLI prlsrvctl path: #{@prlsrvctl_path}")
         end
 
+        def compact(uuid=nil)
+          uuid ||= @uuid
+          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")
+            # The progress of the import will be in the last line. Do a greedy
+            # regular expression to find what we're looking for.
+            if lines.last =~ /.+?(\d{,3}) ?%/
+              yield $1.to_i if block_given?
+            end
+          end
+        end
+
         def create_host_only_network(options)
           # Create the interface
           execute(:prlsrvctl, "net", "add", options[:name], "--type", "host-only")
@@ -66,6 +79,24 @@ module VagrantPlugins
           }
         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 delete
+          execute('delete', @uuid)
+        end
+
+        def delete_adapters
+          read_settings.fetch('Hardware', {}).each do |adapter, params|
+            if adapter.start_with?('net') and !params.fetch("enabled", true)
+              execute('set', @uuid, '--device-del', adapter)
+            end
+          end
+        end
+
         def delete_unused_host_only_networks
           networks = read_virtual_networks()
 
@@ -141,11 +172,45 @@ module VagrantPlugins
           end
         end
 
-        # Returns the current state of this VM.
-        #
-        # @return [Symbol]
-        def read_state
-          read_settings(@uuid).fetch('State', 'inaccessible').to_sym
+        def export(path, vm_name)
+          execute("clone", @uuid, "--name", vm_name, "--template", "--dst", path.to_s) 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.
+            if lines.last =~ /.+?(\d{,3}) ?%/
+              yield $1.to_i if block_given?
+            end
+          end
+
+          read_settings(vm_name).fetch('ID', vm_name)
+        end
+
+        def halt(force=false)
+          args = ['stop', @uuid]
+          args << '--kill' if force
+          execute(*args)
+        end
+
+        def import(template_uuid, vm_name)
+          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.
+            if lines.last =~ /.+?(\d{,3}) ?%/
+              yield $1.to_i if block_given?
+            end
+          end
+          @uuid = read_settings(vm_name).fetch('ID', vm_name)
+        end
+
+        def ip
+          mac_addr = read_mac_address.downcase
+          File.foreach("/Library/Preferences/Parallels/parallels_dhcp_leases") do |line|
+            if line.include? mac_addr
+              ip = line[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
+              return ip
+            end
+          end
         end
 
         # Returns a hash of all UUIDs assigned to VMs and templates currently
@@ -212,6 +277,10 @@ module VagrantPlugins
           bridged_ifaces
         end
 
+        def read_guest_tools_version
+          read_settings.fetch('GuestTools', {}).fetch('version', nil)
+        end
+
         def read_host_only_interfaces
           net_list = read_virtual_networks()
           net_list.keep_if { |net| net['Type'] == "host-only" }
@@ -247,121 +316,71 @@ module VagrantPlugins
           read_settings.fetch('Hardware', {}).fetch('net0', {}).fetch('mac', nil)
         end
 
-        def read_virtual_networks
-          json { execute(:prlsrvctl, 'net', 'list', '--json', retryable: true) }
-        end
-
-        # Verifies that the driver is ready to accept work.
-        #
-        # This should raise a VagrantError if things are not ready.
-        def verify!
-          # TODO: Use version method?
-          execute('--version')
-        end
+        def read_network_interfaces
+          nics = {}
 
-        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)
+          # Get enabled VM's network interfaces
+          ifaces = read_settings.fetch('Hardware', {}).keep_if do |dev, params|
+            dev.start_with?('net') and params.fetch("enabled", true)
           end
-        end
-
-        def import(template_uuid, vm_name)
-          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.
-            if lines.last =~ /.+?(\d{,3}) ?%/
-              yield $1.to_i if block_given?
-            end
-          end
-          @uuid = read_settings(vm_name).fetch('ID', vm_name)
-        end
-
-        def delete_adapters
-          read_settings.fetch('Hardware', {}).each do |adapter, params|
-            if adapter.start_with?('net') and !params.fetch("enabled", true)
-              execute('set', @uuid, '--device-del', adapter)
+          ifaces.each do |name, params|
+            adapter = name.match(/^net(\d+)$/)[1].to_i
+            nics[adapter] ||= {}
+
+            if params['type'] == "shared"
+              nics[adapter][:type] = :shared
+            elsif params['type'] == "host"
+              # It is PD internal host-only network and it is bounded to 'vnic1'
+              nics[adapter][:type] = :hostonly
+              nics[adapter][:hostonly] = "vnic1"
+            elsif params['type'] == "bridged" and params.fetch('iface','').start_with?('vnic')
+              # Bridged to the 'vnicXX'? Then it is a host-only, actually.
+              nics[adapter][:type] = :hostonly
+              nics[adapter][:hostonly] = params.fetch('iface','')
+            elsif params['type'] == "bridged"
+              nics[adapter][:type] = :bridged
+              nics[adapter][:bridge] = params.fetch('iface','')
             end
           end
+          nics
         end
 
-        def resume
-          execute('resume', @uuid)
-        end
-
-        def suspend
-          execute('suspend', @uuid)
-        end
-
-        def start
-          execute('start', @uuid)
-        end
-
-        def halt(force=false)
-          args = ['stop', @uuid]
-          args << '--kill' if force
-          execute(*args)
-        end
-
-        def delete
-          execute('delete', @uuid)
+        # Returns the current state of this VM.
+        #
+        # @return [Symbol]
+        def read_state
+          read_settings(@uuid).fetch('State', 'inaccessible').to_sym
         end
 
-        def export(path, vm_name)
-          execute("clone", @uuid, "--name", vm_name, "--template", "--dst", path.to_s) 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.
-            if lines.last =~ /.+?(\d{,3}) ?%/
-              yield $1.to_i if block_given?
-            end
-          end
-
-          read_settings(vm_name).fetch('ID', vm_name)
+        def read_virtual_networks
+          json { execute(:prlsrvctl, 'net', 'list', '--json', retryable: true) }
         end
 
-        def compact(uuid=nil)
-          uuid ||= @uuid
-          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")
-            # The progress of the import will be in the last line. Do a greedy
-            # regular expression to find what we're looking for.
-            if lines.last =~ /.+?(\d{,3}) ?%/
-              yield $1.to_i if block_given?
-            end
-          end
+        def ready?
+          !!guest_execute('uname') rescue false
         end
 
         def register(pvm_file)
           execute("register", pvm_file)
         end
 
-        def unregister(uuid)
-          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)
         end
 
-        def set_mac_address(mac)
-          execute('set', @uuid, '--device-set', 'net0', '--type', 'shared', '--mac', mac)
+        def resume
+          execute('resume', @uuid)
         end
 
-        def ssh_port(expected_port)
-          22
+        def set_mac_address(mac)
+          execute('set', @uuid, '--device-set', 'net0', '--type', 'shared', '--mac', mac)
         end
 
-        def read_guest_tools_version
-          read_settings.fetch('GuestTools', {}).fetch('version', nil)
+        # apply custom vm setting via set parameter
+        def set_vm_settings(command)
+          raw(@manager_path, *command)
         end
 
         def share_folders(folders)
@@ -371,27 +390,46 @@ module VagrantPlugins
           end
         end
 
-        def ready?
-          !!guest_execute('uname') rescue false
+        def ssh_port(expected_port)
+          22
         end
 
-        def ip
-          mac_addr = read_mac_address.downcase
-          File.foreach("/Library/Preferences/Parallels/parallels_dhcp_leases") do |line|
-            if line.include? mac_addr
-              ip = line[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
-              return ip
-            end
-          end
+        def start
+          execute('start', @uuid)
         end
 
-        # apply custom vm setting via set parameter
-        def set_vm_settings(command)
-          raw(@manager_path, *command)
+        def suspend
+          execute('suspend', @uuid)
+        end
+
+        def unregister(uuid)
+          execute("unregister", uuid)
+        end
+
+        # Verifies that the driver is ready to accept work.
+        #
+        # 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
 
         private
 
+        def guest_execute(*command)
+          execute('exec', @uuid, *command)
+        end
+
+        def json(default=nil)
+          data = yield
+          JSON.parse(data) rescue default
+        end
+
         # Parse the JSON from *all* VMs and templates. Then return an array of objects (without duplicates)
         def read_all_info
           vms_arr = json({}) do
@@ -408,15 +446,6 @@ module VagrantPlugins
           json({}) { execute('list', uuid, '--info', '--json', retryable: true).gsub(/^(INFO)?\[/, '').gsub(/\]$/, '') }
         end
 
-        def json(default=nil)
-          data = yield
-          JSON.parse(data) rescue default
-        end
-
-        def guest_execute(*command)
-          execute('exec', @uuid, *command)
-        end
-
         def error_detection(command_response)
           errored = false
           # If the command was a failure, then raise an exception that is

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,15 +147,6 @@ files:
 - locales/en.yml
 - Rakefile
 - README.md
-- sandi_meter/assets/chart.js
-- sandi_meter/assets/forkme.png
-- sandi_meter/assets/jquery.js
-- sandi_meter/assets/morris.css
-- sandi_meter/assets/normalize.css
-- sandi_meter/assets/script.js
-- sandi_meter/assets/style.css
-- sandi_meter/index.html
-- sandi_meter/sandi_meter.log
 - spec/vagrant-parallels/setup_spec.rb
 - vagrant-parallels.gemspec
 - .gitignore
@@ -173,6 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3847391390300994580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: