From 7011d1658f1eea5ad6002eaea6b7dfb063eef888 Mon Sep 17 00:00:00 2001 From: Steve Strong Date: Wed, 21 Dec 2016 11:44:29 +0000 Subject: [PATCH 1/7] Added "require 'nokogiri'" Attempting to run 'vagrant package --output mybox.box' was failing with: .vagrant.d/gems/2.2.5/gems/vagrant-parallels-1.7.2/lib/vagrant-parallels/action/export.rb:89:in `block in convert_to_full': uninitialized constant VagrantPlugins::Parallels::Action::Export::Nokogiri (NameError) from /Users/steve/.vagrant.d/gems/2.2.5/gems/vagrant-parallels-1.7.2/lib/vagrant-parallels/action/export.rb:87:in `each' from /Users/steve/.vagrant.d/gems/2.2.5/gems/vagrant-parallels-1.7.2/lib/vagrant-parallels/action/export.rb:87:in `convert_to_full' from /Users/steve/.vagrant.d/gems/2.2.5/gems/vagrant-parallels-1.7.2/lib/vagrant-parallels/action/export.rb:21:in `call' ... Adding in the 'require' solves the problem --- lib/vagrant-parallels/action/export.rb | 2 ++ 1 file changed, 2 insertions(+) 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 From d6ba9a714f6dfcd754f20971e8f85ecab125c6e4 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 10 Jan 2017 15:20:54 +0200 Subject: [PATCH 2/7] Update Copyright The copyright holder has been changed from "Parallels IP Holdings GmbH." to "Parallels International GmbH." --- LICENSE.txt | 2 +- README.md | 2 +- website/docs/source/layouts/layout.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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 @@
- © <%= Time.now.year %> Parallels IP Holdings GmbH. + © <%= Time.now.year %> Parallels International GmbH.
From 0365c24183877ecad973b917a9ebdeca572f8599 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 10 Jan 2017 16:33:03 +0200 Subject: [PATCH 3/7] Update Readme for the website --- website/docs/README.md | 43 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) 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 From e18714556c512c4740280702105e85d80b0fc351 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 28 Feb 2017 10:49:42 +0100 Subject: [PATCH 4/7] Require "nokogiri" gem when it's needed --- lib/vagrant-parallels/action/box_register.rb | 1 + lib/vagrant-parallels/driver/base.rb | 1 + 2 files changed, 2 insertions(+) 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/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' From a3dfea6f12f51db02bc67ff1d987fb9bbc3343dc Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 28 Feb 2017 10:55:52 +0100 Subject: [PATCH 5/7] Gemfile: switch git source protocol to "https" "git" protocol means that the data will be transmitted without encryption, so "https" is preferable for security reasons. --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 5116560d5a565e3f597fb72699b2198122697d89 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 28 Feb 2017 11:06:40 +0100 Subject: [PATCH 6/7] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) 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`, From ef6253840aee1be04c1e6379aca1d50198be349c Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 28 Feb 2017 11:07:11 +0100 Subject: [PATCH 7/7] Bump version to 1.7.3 --- lib/vagrant-parallels/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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