diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-07-15 16:45:23 -0400 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-07-15 16:46:39 -0400 |
| commit | 6fd98696863b83449354a93a79918f5c399c7cce (patch) | |
| tree | af4498ca06b3488fc78a2eef41df26e4ca1069ea | |
| parent | 8643590c12b730fb6102f80ce6586447b212a27a (diff) | |
| download | chef-ksubrama/nokogiri.tar.gz | |
Install nokogiri and pin mixlib-cliksubrama/nokogiri
See https://github.com/chef/chef-dk/pull/937
and https://github.com/chef/chef/issues/5116
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -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 index 0b75857517..f4797d84d9 100644 --- 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 index b65332bb91..ce42b4af63 100644 --- 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" |