Merge pull request #292 from nsidc/nokogiri

Nokogiri
nsidc · Jan 6, 2021 · 02dff78 · 02dff78
2 parents 8706cf0 + f217850
commit 02dff78
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.13.4
+current_version = 1.13.5
 tag = true
 commit = true
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.13.5 (2021-01-05)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.5)
+  - Pin nokogiri to 1.10.10. This fixes an issue where vagrant-vsphere failed to install due to 
+    nokogiri requiring Ruby >=2.5.  This is a workaround until the vagrant-nsidc plugin is updated
+    to work with newer versions of vagrant that are bundled with newer versions of Ruby
+
 ## [1.13.4 (2020-03-31)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.4)
 
   - Allow newer versions of i18n.

diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ 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', github: 'mitchellh/vagrant'
+  gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v2.2.6'
 end
 
 group :plugins do

diff --git a/README.md b/README.md
@@ -19,9 +19,9 @@ This provider is built on top of the
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 1.13.4**
+**version: 1.13.5**
 
-vagrant-vsphere (**version: 1.13.4**) is available from
+vagrant-vsphere (**version: 1.13.5**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation

diff --git a/lib/vSphere/version.rb b/lib/vSphere/version.rb
@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.13.4'
+    VERSION = '1.13.5'
   end
 end
diff --git a/vSphere.gemspec b/vSphere.gemspec
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.summary = 'VMWare vSphere provider'
   s.description = 'Enables Vagrant to manage machines with VMWare vSphere.'
 
-  # force the use of Nokogiri 1.5.x to prevent conflicts with older versions of zlib
-  s.add_dependency 'nokogiri', '~>1.5'
+  # pin nokogiri to 1.10.10 to get around 1.11.0 requiring ruby >=2.5
+  s.add_dependency 'nokogiri', '1.10.10'
 
   s.add_dependency 'rbvmomi', '>=1.11.5', '<2.0.0'