vagrant-parallels 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59cc5882980f59c4a61187d797eeec20196a07db
-  data.tar.gz: 01e32966ec0b3e3479cb899e3d4de0c0e6e28a6f
+  metadata.gz: 79ec0b63ce9c8f248c00b5603f5ed393816f45f4
+  data.tar.gz: 1055f46d3991c28283c3ba94ab00710f9968047b
 SHA512:
-  metadata.gz: 4c90fccd4bc5393b1c5fff1e6811e5f0797ef0473bf696c93c4a8799db456120627fc69989b9d4d6feb42808c03a3bbe838bc68425bad7d009f2a587141b4c56
-  data.tar.gz: a8f5be1fe10c4c93bcfd386e7a958a17d988fcec3e5f087530e2f99879e79f9f53a508848152f25599fdd20f8249f65f901f2025a1cd3a7a4e11ca8fdc5fb18a
+  metadata.gz: 79764a185c87dbd793405ade66a90a87c51ea6003d8f738236a1dc2e8f3cb986e4272f3163afff1f1f6f5b3f958668cda510a0dd56e693a336866c3c7db20678
+  data.tar.gz: 6b143b31501c8e52b388d588d2ca60eac78b715992cb48c590d3abc0dde2a42922ce81d0a18dd31af5655bd3378ad6c9e9dd64a64acfb0b737124ae2bd400a8b

data/.gitignore

@@ -4,7 +4,7 @@
 # Vagrant stuff
 acceptance_config.yml
 boxes/*
-Vagrantfile
+/Vagrantfile
 .vagrant
 vagrant-spec.config.rb
 
@@ -15,6 +15,7 @@ pkg/*
 tags
 Gemfile.lock
 test/tmp/
+/vendor
 
 # Python
 *.pyc

data/CONTRIBUTING.md

@@ -59,3 +59,22 @@ remote my-fork <fork_url>`)
 4. Push the branch to your fork (`git push fork my-new-feature`)
 5. Create a pull request from your `my-new-feature` branch into `master` of
 `vagrant-parallels` repo
+
+### Acceptance Tests
+
+Vagrant also comes with an acceptance test suite that does black-box
+tests of various Vagrant components. Note that these tests are **extremely
+slow** because actual VMs are spun up and down. The full test suite can
+take hours.
+
+To run the acceptance test suite, first copy `vagrant-spec.config.example.rb`
+to `vagrant-spec.config.rb` and modify it to valid values. The places you
+should fill in are clearly marked. Highly recommend to download a box and
+specify a local path to it.
+
+Run acceptance tests:
+
+```
+$ rake acceptance:run
+...
+```

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.1'
+  gem 'vagrant-spec', git: 'git://github.com/mitchellh/vagrant-spec.git'
 end

data/Vagrantfile

@@ -0,0 +1,87 @@
+Vagrant.configure('2') do |config|
+  # Configure base box parameters
+  config.vm.define 'ubuntu' do |u|
+    u.vm.hostname = 'my-super-vm.do.sw.ru'
+
+#    u.vm.network :forwarded_port, guest: 53, host: 53100, protocol: 'tcp'
+#    u.vm.network :forwarded_port, guest: 53, host: 53000, protocol: 'udp'
+
+ #    u.vm.provider 'parallels' do |prl|
+ #       prl.regen_box_uuid = false
+ #       prl.customize("pre-boot" , ["set", :id, "--device-add", "serial", "--output", "/path/to/serial_out.txt"])
+ #    end
+
+ #   u.vm.network 'private_network', ip: '192.168.255.3', netmask: '255.255.255.0'
+    # u.vm.network 'private_network', ip: '172.16.0.200', netmask: '255.255.0.0'
+#    u.vm.synced_folder '.', "/opt/ololo", disabled: true
+
+    u.vm.provider 'parallels' do |v|
+      #v.update_guest_tools = true
+    end
+
+    u.vm.box = 'parallels/ubuntu-14.04'
+
+  end
+
+  config.vm.define 'ubuntu_2' do |u|
+    u.vm.box = 'parallels/ubuntu-14.04'
+    u.vm.network 'private_network', ip: '172.16.0.210', netmask: '255.255.0.0'
+    u.vm.network 'public_network' #, bridge: 'en0'
+  end
+
+  config.vm.define 'centos' do |c|
+    c.vm.provider 'parallels' do |v|
+      #v.check_guest_tools = false
+      #v.optimize_power_consumption = false
+      #v.update_guest_tools = true
+      # v.memory = "512"
+      # v.cpus = 1
+      #v.name = 'OLOLONAME'
+      v.regen_box_uuid = false
+    end
+
+c.vm.provider "parallels" do |v|
+      v.customize ["set", :id, "--smart-mount", "off"]
+      v.customize ["set", :id, "--shared-profile", "off"]
+      v.customize ["set", :id, "--shared-cloud", "off"] 
+
+end
+
+c.vm.provider "parallels" do |v|
+  v.customize("post-import", ["set", :id, "--device-add", "serial", "--output", "/Users/legal/serial_out.txt"])
+  v.customize ["set", :id, "--device-set", "serial0", "--output", "/Users/legal/serial_out.txt"]
+end
+
+#    c.vm.network 'private_network', ip: '192.168.60.4'
+#    c.vm.network 'private_network', ip: '10.2.0.220', netmask: '255.255.0.0'
+#    c.vm.network 'public_network'
+
+    c.vm.hostname = 'my-funny-centos.do.sw.ru'
+    c.vm.box = 'parallels/centos-6.6'
+
+    c.vm.provision :shell do |s|
+      s.inline = 'echo Hello, World'
+    end
+
+  end
+
+  config.vm.provider 'parallels' do |v|
+#    v.longer_battery_life = false
+    v.check_guest_tools = true
+#    v.customize ["set", :id, "--device-set", "cdrom0", "--image",
+# "/Users/legal/Downloads/prl-tools-lin-9.0.24172.951362.iso", "--connect"]
+  end
+
+
+  #config.vm.provision :chef_solo do |chef|
+  #  chef.data_bags_path = "data_bags"
+  #  chef.encrypted_data_bag_secret_key_path = "./data_bag_secret_file.sec"
+  #
+  #  chef.log_level = "debug"
+  #
+  #  chef.run_list = [
+  #      "recipe[win_pdfm::default]"
+  #  ]
+  #end
+
+end

data/lib/vagrant-parallels/cap/nic_mac_addresses.rb

@@ -4,9 +4,12 @@ module VagrantPlugins
       module NicMacAddresses
         # Reads the network interface card MAC addresses and returns them.
         #
-        # @return [Hash<String, String>] Adapter => MAC address
+        # @return [Hash<Integer, String>] Adapter => MAC address
         def self.nic_mac_addresses(machine)
-          machine.provider.driver.read_mac_addresses
+          nic_macs = machine.provider.driver.read_mac_addresses
+
+          # Make numeration starting from 1, as it is expected in Vagrant.
+          Hash[nic_macs.map{ |index, mac| [index+1, mac] }]
         end
       end
     end

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

@@ -148,7 +148,7 @@ module VagrantPlugins
 
         # Returns the network interface card MAC addresses
         #
-        # @return [Hash<String, String>] Adapter => MAC address
+        # @return [Hash<Integer, String>] Adapter => MAC address
         def read_mac_addresses
         end
 

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.3.8'
+    VERSION = '1.3.9'
   end
 end

data/tasks/acceptance.rake

@@ -0,0 +1,26 @@
+namespace :acceptance do
+  desc "shows components that can be tested separately"
+  task :components do
+    exec("bundle exec vagrant-spec components")
+  end
+
+  desc "runs acceptance tests using vagrant-spec"
+  task :run do
+    components = %w(
+      basic
+      network/forwarded_port
+      network/private_network
+      synced_folder
+      synced_folder/nfs
+      synced_folder/rsync
+      provisioner/shell
+      provisioner/chef-solo
+      package
+    ).map{ |s| "provider/parallels/#{s}" }
+
+    command = "bundle exec vagrant-spec test --components=#{components.join(" ")}"
+    puts command
+    puts
+    exec(command)
+  end
+end

data/test/acceptance/base.rb

@@ -0,0 +1,2 @@
+require "vagrant-spec/acceptance"
+require_relative "shared/context_parallels"

data/test/acceptance/provider/synced_folder_spec.rb

@@ -0,0 +1,26 @@
+# This tests that synced folders work with a given provider.
+shared_examples "provider/synced_folder" do |provider, options|
+  if !options[:box]
+    raise ArgumentError,
+      "box option must be specified for provider: #{provider}"
+  end
+
+  include_context "acceptance"
+
+  before do
+    environment.skeleton("synced_folder")
+    assert_execute("vagrant", "box", "add", "basic", options[:box])
+    assert_execute("vagrant", "up", "--provider=#{provider}")
+  end
+
+  after do
+    assert_execute("vagrant", "destroy", "--force")
+  end
+
+  it "properly configures synced folder types" do
+    status("Test: mounts the default /vagrant synced folder")
+    result = execute("vagrant", "ssh", "-c", "cat /vagrant/foo")
+    expect(result.exit_code).to eql(0)
+    expect(result.stdout).to match(/hello$/)
+  end
+end

data/test/acceptance/shared/context_parallels.rb

@@ -0,0 +1,2 @@
+shared_context "provider-context/parallels" do
+end

data/test/acceptance/skeletons/synced_folder/Vagrantfile

@@ -0,0 +1,3 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "basic"
+end

data/test/acceptance/skeletons/synced_folder/foo

@@ -0,0 +1 @@
+hello

data/vagrant-spec.config.example.rb

@@ -0,0 +1,11 @@
+require_relative 'test/acceptance/base'
+
+Vagrant::Spec::Acceptance.configure do |c|
+  c.component_paths << File.expand_path('../test/acceptance', __FILE__)
+  c.skeleton_paths << File.expand_path('../test/acceptance/skeletons', __FILE__)
+
+  c.provider 'parallels',
+             box:      'ENTER BOX URL',
+             contexts: ['provider-context/parallels'],
+             features: ['!network/forwarded_port', '!cli/plugin']
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,8 +156,14 @@ files:
 - locales/en.yml
 - Rakefile
 - README.md
+- tasks/acceptance.rake
 - tasks/bundler.rake
 - tasks/test.rake
+- test/acceptance/base.rb
+- test/acceptance/provider/synced_folder_spec.rb
+- test/acceptance/shared/context_parallels.rb
+- test/acceptance/skeletons/synced_folder/foo
+- test/acceptance/skeletons/synced_folder/Vagrantfile
 - test/unit/base.rb
 - test/unit/config_test.rb
 - test/unit/driver/pd_10_test.rb
@@ -168,6 +174,8 @@ files:
 - test/unit/support/shared/pd_driver_examples.rb
 - test/unit/synced_folder_test.rb
 - vagrant-parallels.gemspec
+- vagrant-spec.config.example.rb
+- Vagrantfile
 - .gitignore
 - .travis.yml
 homepage: http://github.com/Parallels/vagrant-parallels