Skip to content

Commit

Permalink
Release v1.7.7
Browse files Browse the repository at this point in the history
  • Loading branch information
legal90 committed Oct 15, 2017
2 parents 096ceba + 509b0c7 commit 46a6bcb
Show file tree
Hide file tree
Showing 15 changed files with 231 additions and 199 deletions.
35 changes: 24 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
## 1.7.7 (October 15, 2017)
BUG FIXES:
- Fixed synced folder mounting on guests with Upstart (Ubuntu 14.*)
[[GH-307](https://github.com/Parallels/vagrant-parallels/issues/307)]


## 1.7.6 (July 31, 2017)
BUG FIXES:
- Fixed `vagrant up` failure if the box image was automatically renamed due
to the name conflict.
[[GH-303](https://github.com/Parallels/vagrant-parallels/issues/303)]


## 1.7.5 (May 27, 2017)
BUG FIXES:
- Fixed compatibility with Vagrant v1.9.5+. `nokogiri` gem is defined as
a plugin runtime dependency.
[[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297)],
[[GH-298](https://github.com/Parallels/vagrant-parallels/pull/298)]

**NB!** To use the plugin with Vagrant v1.9.5 you should (re)install it with
`NOKOGIRI_USE_SYSTEM_LIBRARIES` enabled:
```bash
$ vagrant plugin uninstall vagrant-parallels
$ NOKOGIRI_USE_SYSTEM_LIBRARIES=true vagrant plugin install vagrant-parallels
```
- Fixed compatibility with Vagrant v1.9.5+. `nokogiri` gem is defined as
a plugin runtime dependency.
[[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297)],
[[GH-298](https://github.com/Parallels/vagrant-parallels/pull/298)]
**NB!** To use the plugin with Vagrant v1.9.5 you should (re)install it with
`NOKOGIRI_USE_SYSTEM_LIBRARIES` enabled:
```bash
$ vagrant plugin uninstall vagrant-parallels
$ NOKOGIRI_USE_SYSTEM_LIBRARIES=true vagrant plugin install vagrant-parallels
```


## 1.7.4 (April 20, 2017)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@ def self.mount_parallels_shared_folder(machine, name, guestpath, options)
end

# Emit an upstart event if we can
if machine.communicate.test('test -x /sbin/initctl')
machine.communicate.sudo(
"/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}")
end
machine.communicate.sudo <<-EOH.gsub(/^ {10}/, "")
if command -v /sbin/init && /sbin/init 2>/dev/null --version | grep upstart; then
/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}
fi
EOH
end

def self.unmount_parallels_shared_folder(machine, guestpath, options)
Expand Down
2 changes: 1 addition & 1 deletion lib/vagrant-parallels/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module VagrantPlugins
module Parallels
VERSION = '1.7.6'
VERSION = '1.7.7'
end
end
2 changes: 1 addition & 1 deletion test/unit/action/network_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

let(:machine) do
iso_env.machine(iso_env.machine_names[0], :parallels).tap do |m|
m.provider.stub(driver: driver)
allow(m.provider).to receive_messages(driver: driver)
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/unit/base.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'rubygems'
require 'rspec/autorun'
require 'rspec/its'

# Require Vagrant itself so we can reference the proper
# classes to test.
Expand Down
4 changes: 2 additions & 2 deletions test/unit/cap_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

let(:machine) do
iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
m.provider.stub(driver: driver)
m.stub(state: state)
allow(m.provider).to receive_messages(driver: driver)
allow(m).to receive_messages(state: state)
end
end

Expand Down
6 changes: 3 additions & 3 deletions test/unit/config_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ def assert_valid

before do
vm_config = double('vm_config')
vm_config.stub(networks: [])
allow(vm_config).to receive_messages(networks: [])
config = double('config')
config.stub(vm: vm_config)
machine.stub(config: config)
allow(config).to receive_messages(vm: vm_config)
allow(machine).to receive_messages(config: config)
end

its 'valid by default' do
Expand Down
4 changes: 2 additions & 2 deletions test/unit/driver/pd_10_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

describe 'set_power_consumption_mode' do
it "turns 'longer-battery-life' on" do
subprocess.should_receive(:execute).
expect(subprocess).to receive(:execute).
with('prlctl', 'set', uuid, '--longer-battery-life', 'on',
an_instance_of(Hash)).
and_return(subprocess_result(exit_code: 0))
Expand All @@ -19,7 +19,7 @@
end

it "turns 'longer-battery-life' off" do
subprocess.should_receive(:execute).
expect(subprocess).to receive(:execute).
with('prlctl', 'set', uuid, '--longer-battery-life', 'off',
an_instance_of(Hash)).
and_return(subprocess_result(exit_code: 0))
Expand Down
18 changes: 9 additions & 9 deletions test/unit/support/shared/parallels_context.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,24 @@ def subprocess_result(options={})

# drivers will blow up on instantiation if they cannot determine the
# Parallels Desktop version, so wire this stub in automatically
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlctl', '--version', an_instance_of(Hash)).
and_return(subprocess_result(stdout: "prlctl version #{parallels_version}.0.0 (12345)"))

# drivers will sould chek the Parallels Desktop edition, so wire this stub in automatically
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlsrvctl', 'info', '--license', '--json', an_instance_of(Hash)).
and_return(subprocess_result(stdout: '{"edition": "pro"}'))

# drivers also call vm_exists? during init;
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlctl', 'list', uuid, kind_of(Hash)).
and_return(subprocess_result(exit_code: 0))

# Returns detailed info about specified VM or all registered VMs
# `prlctl list <vm_uuid> --info --no-header --json`
# `prlctl list --all --info --no-header --json`
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlctl', 'list', kind_of(String), '--info', '--no-header', '--json',
kind_of(Hash)) do
out = <<-eos
Expand Down Expand Up @@ -123,7 +123,7 @@ def subprocess_result(options={})
# Returns detailed info about specified template or all registered templates
# `prlctl list <tpl_uuid> --info --json --no-header --template`
# `prlctl list --all --info --no-header --json --template`
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlctl', 'list', kind_of(String), '--info', '--no-header', '--json',
'--template', kind_of(Hash)) do
out = <<-eos
Expand Down Expand Up @@ -172,7 +172,7 @@ def subprocess_result(options={})

# Returns detailed info about virtual network interface
# `prlsrvctl net info <net_name>, '--json'`
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlsrvctl', 'net', 'info', kind_of(String), '--json',
kind_of(Hash)) do
out = <<-eos
Expand All @@ -196,7 +196,7 @@ def subprocess_result(options={})

# Returns values of 'name' and 'uuid' options for all registered VMs
# `prlctl list --all --no-header --json -o name,uuid`
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlctl', 'list', '--all', '--no-header', '--json', '-o', 'name,uuid',
kind_of(Hash)) do
out = <<-eos
Expand All @@ -212,7 +212,7 @@ def subprocess_result(options={})

# Returns values of 'name' and 'uuid' options for all registered templates
# `prlctl list --all --no-header --json -o name,uuid --template`
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlctl', 'list', '--all', '--no-header', '--json', '-o', 'name,uuid',
'--template', kind_of(Hash)) do
out = <<-eos
Expand All @@ -228,7 +228,7 @@ def subprocess_result(options={})

# Returns value of 'mac' options for the specified VM
# `prlctl list --all --no-header -o mac`
subprocess.stub(:execute).
allow(subprocess).to receive(:execute).
with('prlctl', 'list', kind_of(String), '--no-header', '-o', 'mac',
kind_of(Hash)) do
subprocess_result(stdout: "00:1C:42:B4:B0:74 00:1C:42:B4:B0:90\n")
Expand Down
Loading

0 comments on commit 46a6bcb

Please sign in to comment.