diff --git a/.travis.yml b/.travis.yml index 1b14b5a..7ada8e3 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ rvm: - 2.1.5 - 2.2.0 - 2.3.0 -before_install: gem install bundler -v 1.11.2 +before_install: gem install bundler -v 1.14.1 script: - bundle install && bundle exec rake test:unit deploy: diff --git a/ChangeLog.md b/ChangeLog.md index 46459c6..4d77d91 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +# 2017.08.18 - azure-core gem @version 0.1.11 +* Changed 'nokogiri' to runtime dependency with version >= 1.6, and added documentation to resolve dependency issue to Readme for users with Ruby version lower than 2.2.0. + # 2017.08.10 - azure-core gem @version 0.1.10 * Changed 'nokogiri' to dev dependency and added post-logic for Gem installation. [#41](https://github.com/Azure/azure-ruby-asm-core/pull/41) diff --git a/README.md b/README.md index cc83aca..989bffa 100755 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ Or install it yourself as: $ gem install azure-core +### Notice +For ruby version >= 1.9.3 && < 2.2.0, please install compatible Nokogiri(version >= 1.6.8), otherwise the installation using old version of bundler or all version of rubygems will report failure. + ## Usage ```ruby require 'azure/core' diff --git a/azure-core.gemspec b/azure-core.gemspec index 2ed0baa..60d4c53 100755 --- a/azure-core.gemspec +++ b/azure-core.gemspec @@ -26,12 +26,12 @@ Gem::Specification.new do |s| s.homepage = 'http://github.com/Azure/azure-ruby-asm-core' s.license = 'Apache License, Version 2.0' s.files = `git ls-files`.split("\n").reject { |f| f.start_with?("test/unit") } - s.extensions = 'ext/mkrf_conf.rb' s.required_ruby_version = '>= 1.9.3' s.add_runtime_dependency('faraday', '~> 0.9') s.add_runtime_dependency('faraday_middleware', '~> 0.10') + s.add_runtime_dependency('nokogiri', '~> 1.6') s.add_development_dependency('dotenv', '~> 2.0') s.add_development_dependency('minitest', '~> 5') @@ -40,11 +40,5 @@ Gem::Specification.new do |s| s.add_development_dependency('rake', '~> 10.0') s.add_development_dependency('timecop', '~> 0.7') s.add_development_dependency('bundler', '~> 1.11') - if RUBY_VERSION < "2.1.0" - s.add_development_dependency('nokogiri', '~> 1.6.0') - elsif RUBY_VERSION < "2.2.0" - s.add_development_dependency('nokogiri', '~> 1.7.0') - else - s.add_development_dependency('nokogiri', '~> 1.8') - end + end diff --git a/ext/mkrf_conf.rb b/ext/mkrf_conf.rb deleted file mode 100644 index 91c4a41..0000000 --- a/ext/mkrf_conf.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'rubygems/dependency_installer' - -dependency_installer = Gem::DependencyInstaller.new - -begin - if RUBY_VERSION < '2.1.0' - puts "Installing nokogiri ~> 1.6.0 with Ruby version:#{RUBY_VERSION}" - dependency_installer.install 'nokogiri', '~> 1.6.0' - elsif RUBY_VERSION < '2.2.0' - puts "Installing nokogiri ~> 1.7.0 with Ruby version:#{RUBY_VERSION}" - dependency_installer.install 'nokogiri', '~> 1.7.0' - else - puts "Installing nokogiri ~> 1.8 with Ruby version:#{RUBY_VERSION}" - dependency_installer.install 'nokogiri', '~> 1.8' - end -rescue => e - warn "#{$0}: #{e}" - exit! -end \ No newline at end of file diff --git a/lib/azure/core/version.rb b/lib/azure/core/version.rb index 4ec00eb..e9a9ee1 100755 --- a/lib/azure/core/version.rb +++ b/lib/azure/core/version.rb @@ -18,7 +18,7 @@ module Core class Version MAJOR = 0 unless defined? MAJOR MINOR = 1 unless defined? MINOR - UPDATE = 10 unless defined? UPDATE + UPDATE = 11 unless defined? UPDATE PRE = nil unless defined? PRE class << self