Merge pull request #1905 from sferik/update_nokogiri_dependency

Create separate Gemfile for Ruby 1.8.7

.travis.yml

@@ -1,5 +1,9 @@
 language: ruby
 
+gemfile:
+  - Gemfile
+  - Gemfile.1.8.7
+
 rvm:
   - 1.8.7
   - 1.9.2
@@ -8,6 +12,17 @@ rvm:
 
 script: bundle exec rake travis
 
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: Gemfile
+    - rvm: 1.9.2
+      gemfile: Gemfile.1.8.7
+    - rvm: 1.9.3
+      gemfile: Gemfile.1.8.7
+    - rvm: 2.0.0
+      gemfile: Gemfile.1.8.7
+
 notifications:
   email: false
   irc:

Gemfile.1.8.7

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'nokogiri', '~>1.5.0'
+
+gemspec

README.md

@@ -27,6 +27,27 @@ Here is an example of wading through server creation for Amazon Elastic Compute
     >> server.destroy # cleanup after yourself or regret it, trust me
     true
 
+## Ruby 1.8.7
+
+The maintainers of this project, in concert with the maintainers of Ruby,
+**strongly** recommend using the latest patchlevel of Ruby 1.9.2 or later.
+[As of July 1, 2013, Ruby 1.8.7 is no longer officially maintained.][retired]
+This means fixes will no longer be provided, even for known security
+vulnerabilities.
+
+[retired]: http://www.ruby-lang.org/en/news/2013/06/30/we-retire-1-8-7/
+
+With this caveat, if you wish to bundle `fog` into your application on Ruby
+1.8.7, you must add the following line to your `Gemfile`.
+
+    gem 'nokogiri', '~>1.5.0'
+
+Also, ensure that you are using LibXML version 2.8.0, since there is an
+[issue with LibXML version 2.9.0][issue829] ([and 2.9.1][issue904]).
+
+[issue829]: https://github.com/sparklemotion/nokogiri/issues/829
+[issue904]: https://github.com/sparklemotion/nokogiri/issues/904
+
 ## Collections
 
 A high level interface to each cloud is provided through collections, such as `images` and `servers`.

fog.gemspec

@@ -48,12 +48,9 @@ Gem::Specification.new do |s|
   s.add_dependency('mime-types')
   s.add_dependency('net-scp', '~>1.1')
   s.add_dependency('net-ssh', '>=2.1.3')
+  s.add_dependency('nokogiri', '~>1.5')
   s.add_dependency('ruby-hmac')
 
-  # Nokogiri >= 1.6 drops support for Ruby 1.8.7 so should not be used
-  # See https://github.com/fog/fog/issues/1878 for more details
-  s.add_dependency('nokogiri', '~>1.5.0')
-
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency('jekyll')