Skip to content

Commit

Permalink
Release v1.7.3
Browse files Browse the repository at this point in the history
* master:
  Bump version to 1.7.3
  Update changelog
  Gemfile: switch git source protocol to "https"
  Require "nokogiri" gem when it's needed
  Update Readme for the website
  Update Copyright
  Added "require 'nokogiri'"
  • Loading branch information
legal90 committed Feb 28, 2017
2 parents 18c5951 + ef62538 commit 94a5cc5
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`,
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ please report it on the [Issue Tracker](https://github.com/Parallels/vagrant-par

* Author: Youssef Shahin <[email protected]>
* Author: Mikhail Zholobov <[email protected]>
* 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).
1 change: 1 addition & 0 deletions lib/vagrant-parallels/action/box_register.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'fileutils'
require 'log4r'
require 'nokogiri'

module VagrantPlugins
module Parallels
Expand Down
2 changes: 2 additions & 0 deletions lib/vagrant-parallels/action/export.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'nokogiri'

module VagrantPlugins
module Parallels
module Action
Expand Down
1 change: 1 addition & 0 deletions lib/vagrant-parallels/driver/base.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'log4r'
require 'nokogiri'

require 'vagrant/util/busy'
require 'vagrant/util/network_ip'
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.2'
VERSION = '1.7.3'
end
end
43 changes: 39 additions & 4 deletions website/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
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/<YOUR_USER>/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://<YOUR_USER>.github.io/vagrant-parallels/docs/`)


## Additional Links

- Middleman Deploy: https://github.com/middleman-contrib/middleman-deploy
- GitHub Pages: https://pages.github.com/
2 changes: 1 addition & 1 deletion website/docs/source/layouts/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@

<div class="row">
<h6 class="legal">
&copy; <%= Time.now.year %> Parallels IP Holdings GmbH.
&copy; <%= Time.now.year %> Parallels International GmbH.
</h6>
</div> <!-- row -->
</div> <!-- container -->
Expand Down

0 comments on commit 94a5cc5

Please sign in to comment.