Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Changed 'nokogiri' back to runtime dependency with version >= 1.6. #43

Merged
vishrutshah merged 1 commit into from
Aug 22, 2017
Merged

Changed 'nokogiri' back to runtime dependency with version >= 1.6. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 2 additions & 8 deletions azure-core.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ Gem::Specification.new do |s|
s.homepage = 'https://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'

@vishrutshah vishrutshah Aug 18, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we delete the ext/mkrf_conf.rb file as well?

@katmsft katmsft Aug 22, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are absolutely right. Now that we rely on our guidance in Readme.md for user to install correct version of Nokogiri via Rubygems, and resolved Bundler version issue, we can remove that. I have updated the PR for the purpose.


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')
Expand All @@ -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"

@vishrutshah vishrutshah Aug 18, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand correctly this was working before in correctly installing the nokogiri version. Wasn't it? or Is it still being picked up from ext/mkrf_conf.rb file?

@katmsft katmsft Aug 22, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it is no longer picked up from the file. We now updated the Readme.md so that user can resolve the issue manually. This is a limitation caused by Nokogiri and we are not able to provide any solution or workaround for the issue as long as Nokogiri is one of our dependency. It is a common case for projects that depends on it.

@vishrutshah vishrutshah Aug 22, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good!

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
19 changes: 0 additions & 19 deletions ext/mkrf_conf.rb
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/azure/core/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down