Merge pull request #1409 from opscode/lcg/remove-rest-client

remove rest-client gem

5 files changed, 7 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c61fc18369..387ef8912a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * [**Vasiliy Tolstov**](https://github.com/vtolstov):
   Reload systemd service only if it's running, otherwise start.
 
+* remove dependency on rest-client gem
 * Add method shell_out_with_systems_locale to ShellOut.
 * Fix knife cookbook site share on windows (CHEF-4994)
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d35cce0dd8..f05b99e09e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,11 @@
 # Chef Client Release Notes:
 
+## Removed Rest-Client dependency
+
+- cookbooks that previously were able to use rest-client directly will now need to install it via `chef_gem "rest-client"`.
+- cookbooks that were broken because of the version of rest-client that chef used will now be able to track and install whatever
+  version that they depend on.
+
 ## Chef local mode port ranges
 
 - to avoid crashes, by default, Chef will now scan a port range and take the first available port from 8889-9999.
diff --git a/chef.gemspec b/chef.gemspec
index b5e4a5fc70..c171bda880 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -19,16 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-shellout", "~> 1.4"
   s.add_dependency "ohai", "= 7.2.0.rc.1"
 
-  # Lock down rest-client to avoid pulling in rdoc and breaking Omnibus builds
-  # on Solaris. See the original issue for more details:
-  # https://github.com/opscode/chef/issues/1211
-  s.add_dependency "rest-client", ">= 1.0.4", "<= 1.6.7"
-  # rest-client has an unbounded dependency on mime-types.
-  # mime-types 2.0 removes support for ruby 1.8.7 (gemspec requires ruby
-  # 1.9.2+), so we have to add an additional pin. 1.16 is chosen just becuase
-  # it's the version I had when I tested.
-  s.add_dependency "mime-types", "~> 1.16"
-
   s.add_dependency "ffi-yajl", "~> 1.0"
   s.add_dependency "net-ssh", "~> 2.6"
   s.add_dependency "net-ssh-multi", "~> 1.1"
diff --git a/lib/chef/cookbook_uploader.rb b/lib/chef/cookbook_uploader.rb
index 968673d87a..adad55b4ca 100644
--- a/lib/chef/cookbook_uploader.rb
+++ b/lib/chef/cookbook_uploader.rb
@@ -1,6 +1,5 @@
 
 require 'set'
-require 'rest_client'
 require 'chef/exceptions'
 require 'chef/knife/cookbook_metadata'
 require 'chef/digester'
diff --git a/lib/chef/provider/remote_file/content.rb b/lib/chef/provider/remote_file/content.rb
index 3a8514e077..ef55dd77cd 100644
--- a/lib/chef/provider/remote_file/content.rb
+++ b/lib/chef/provider/remote_file/content.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-require 'rest_client'
 require 'uri'
 require 'tempfile'
 require 'chef/file_content_management/content_base'