diff --git a/CHANGELOG.md b/CHANGELOG.md index fc5a388a..9cd49419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.7.3 (February 28, 2017) +BUG FIXES: + - Fix exceptions related to `nokogiri` gem. + [[GH-291](https://github.com/Parallels/vagrant-parallels/issues/291)], + [[GH-292](https://github.com/Parallels/vagrant-parallels/issues/292)] + ## 1.7.2 (December 16, 2016) BUG FIXES: - Fix Parallels Tools update in Linux guests. Call `ptiagent-cmd` with `--install`, diff --git a/Gemfile b/Gemfile index 42c8de98..42101cbd 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,6 @@ group :development do # We depend on Vagrant for development, but we don't add it as a # 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' - gem 'vagrant-spec', git: 'git://github.com/mitchellh/vagrant-spec.git' + gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git' + gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git' end diff --git a/LICENSE.txt b/LICENSE.txt index a2a8e992..47fa18c1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Copyright (c) 2013 Youssef Shahin -Copyright (c) 2013-2016 Parallels IP Holdings GmbH. +Copyright (c) 2013-2017 Parallels International GmbH. MIT License diff --git a/README.md b/README.md index 103bb636..1bae583e 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,6 @@ please report it on the [Issue Tracker](https://github.com/Parallels/vagrant-par * Author: Youssef Shahin * Author: Mikhail Zholobov -* Copyright 2013-2016, Parallels IP Holdings GmbH. +* Copyright 2013-2017, Parallels International GmbH. Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT). \ No newline at end of file diff --git a/lib/vagrant-parallels/action/box_register.rb b/lib/vagrant-parallels/action/box_register.rb index c16a1c9a..f2e71ed5 100644 --- a/lib/vagrant-parallels/action/box_register.rb +++ b/lib/vagrant-parallels/action/box_register.rb @@ -1,5 +1,6 @@ require 'fileutils' require 'log4r' +require 'nokogiri' module VagrantPlugins module Parallels diff --git a/lib/vagrant-parallels/action/export.rb b/lib/vagrant-parallels/action/export.rb index 878ac41e..822cccd2 100644 --- a/lib/vagrant-parallels/action/export.rb +++ b/lib/vagrant-parallels/action/export.rb @@ -1,3 +1,5 @@ +require 'nokogiri' + module VagrantPlugins module Parallels module Action diff --git a/lib/vagrant-parallels/driver/base.rb b/lib/vagrant-parallels/driver/base.rb index 87614b10..32235e9e 100644 --- a/lib/vagrant-parallels/driver/base.rb +++ b/lib/vagrant-parallels/driver/base.rb @@ -1,4 +1,5 @@ require 'log4r' +require 'nokogiri' require 'vagrant/util/busy' require 'vagrant/util/network_ip' diff --git a/lib/vagrant-parallels/version.rb b/lib/vagrant-parallels/version.rb index e159afb3..baed1e1f 100644 --- a/lib/vagrant-parallels/version.rb +++ b/lib/vagrant-parallels/version.rb @@ -1,5 +1,5 @@ module VagrantPlugins module Parallels - VERSION = '1.7.2' + VERSION = '1.7.3' end end diff --git a/website/docs/README.md b/website/docs/README.md index d939de29..d76d3f92 100644 --- a/website/docs/README.md +++ b/website/docs/README.md @@ -14,13 +14,48 @@ requests like any normal GitHub project, and we'll merge it in. ## Running the Site Locally -Running the site locally is simple. Clone this repo and run the following -commands: +Running the site locally is simple. Clone this repo, switch to `website/docs/` +and run the following commands: ``` $ bundle $ bundle exec middleman server ``` -Then open up `localhost:4567`. Note that some URLs you may need to append -".html" to make them work (in the navigation and such). \ No newline at end of file +Your local copy of the site should be available by this URL: http://localhost:4567 + + +## Deploy the Site to GitHub Pages + +This example describes the deployment process of our official documentation +site, +http://parallels.github.io/vagrant-parallels/docs/. You will need +write permissions for the GitHub repo which you want to deploy to. + +Make sure your current working directory is `website/docs/`. Then clone +"gh-pages" branch from the target repo to `./build` directory. +``` +$ git clone -b gh-pages https://github.com/Parallels/vagrant-parallels ./build +``` + +If you want to deploy to your fork, put the URL of your fork repo instead: +``` +$ git clone -b gh-pages https://github.com//vagrant-parallels ./build +``` + +Then run this command to build static pages with Middleman and deploy them to +the repo you've cloned before: + +``` +$ bundle +$ bundle exec middleman deploy --build +``` + +The site should be available on GitHub: http://parallels.github.io/vagrant-parallels/docs/ +(or `http://.github.io/vagrant-parallels/docs/`) + + +## Additional Links + +- Middleman Deploy: https://github.com/middleman-contrib/middleman-deploy +- GitHub Pages: https://pages.github.com/ \ No newline at end of file diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb index a13e49a5..908d914d 100644 --- a/website/docs/source/layouts/layout.erb +++ b/website/docs/source/layouts/layout.erb @@ -129,7 +129,7 @@