Install nokogiri and pin mixlib-cli

See chef-boneyard/chef-dk#937 and chef#5116
mikedodge04 · Jul 15, 2016 · 6fd9869 · 6fd9869
1 parent 8643590
commit 6fd9869
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -20,6 +20,7 @@ gem "cheffish"
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
+  gem "nokogiri"
 end
 
 group(:omnibus_package, :pry) do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,7 +28,7 @@ PATH
       iniparse (~> 1.4)
       mixlib-archive (>= 0.2.0)
       mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.4)
+      mixlib-cli (~> 1.4, < 1.7)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
@@ -57,7 +57,7 @@ PATH
       iniparse (~> 1.4)
       mixlib-archive (>= 0.2.0)
       mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.4)
+      mixlib-cli (~> 1.4, < 1.7)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
@@ -422,6 +422,7 @@ DEPENDENCIES
   halite
   knife-windows
   netrc
+  nokogiri
   octokit
   poise
   pry

diff --git a/chef.gemspec b/chef.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
 
-  s.add_dependency "mixlib-cli", "~> 1.4"
+  s.add_dependency "mixlib-cli", "~> 1.4", "< 1.7"
   s.add_dependency "mixlib-log", "~> 1.3"
   s.add_dependency "mixlib-authentication", "~> 1.4"
   s.add_dependency "mixlib-shellout", "~> 2.0"