diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-02-14 00:26:37 +0100 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-05 11:49:56 +0900 |
| commit | cd3d035e8a0d8555748f564f10ea00458a60355c (patch) | |
| tree | 7dcb9248ef563a092be5c7c16f7abcc4dabed9f3 | |
| parent | f2459763862fa2eef6929557a87763fe5ff5c470 (diff) | |
[ruby/psych] Remove unnecessary version guard from versions.rb
Removing it triggers the following warnings when running `bundle` under
jruby from the root of the `psych` repo prints the following warnings:
```
/path/to/jruby-9.2.9.0/lib/ruby/gems/shared/gems/psych-3.1.0-java/lib/psych/versions.rb:7: warning: already initialized constant VERSION
/path/to//jruby-9.2.9.0/lib/ruby/gems/shared/gems/psych-3.1.0-java/lib/psych/versions.rb:10: warning: already initialized constant DEFAULT_SNAKEYAML_VERSION
```
This is because bundler loads the versions file relatively from the
local gemspec, and then internally loads the psych gem, causing the
redefinition warnings.
Instead, we modify the $LOAD_PATH so that when working locally on the
`psych` repo, the local version of `psych` gets used.
https://github.com/ruby/psych/commit/a3fc8191a7
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3188
| -rw-r--r-- | ext/psych/lib/psych/versions.rb | 2 | ||||
| -rw-r--r-- | ext/psych/psych.gemspec | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb index 731ba9545e..dfa1917a65 100644 --- a/ext/psych/lib/psych/versions.rb +++ b/ext/psych/lib/psych/versions.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true module Psych # The version of Psych you are using - VERSION = '3.1.0' unless defined?(::Psych::VERSION) + VERSION = '3.1.0' if RUBY_ENGINE == 'jruby' DEFAULT_SNAKEYAML_VERSION = '1.23'.freeze diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec index 0990098d3e..f55cd2a85a 100644 --- a/ext/psych/psych.gemspec +++ b/ext/psych/psych.gemspec @@ -1,12 +1,10 @@ # -*- encoding: utf-8 -*- # frozen_string_literal: true -begin - require_relative 'lib/psych/versions' -rescue LoadError - # for Ruby core repository - require_relative 'versions' -end +lib_path = File.expand_path('lib', __dir__) +$LOAD_PATH.unshift lib_path if File.exist?(lib_path) + +require 'psych/versions' Gem::Specification.new do |s| s.name = "psych" |