diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-02-14 00:26:37 +0100 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-03-17 21:27:30 +0100 |
| commit | a3fc8191a7efc1540eec2649654a43f7e775f332 (patch) | |
| tree | e83f14ef32c0cce4b664755427a15e0d2c537f1c | |
| parent | 08c7decd5690e87b1a1b37bbd41d391b574b62ef (diff) | |
| download | psych-a3fc8191a7efc1540eec2649654a43f7e775f332.zip | |
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.
| -rw-r--r-- | lib/psych/versions.rb | 2 | ||||
| -rw-r--r-- | psych.gemspec | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/psych/versions.rb b/lib/psych/versions.rb index 731ba95..dfa1917 100644 --- a/lib/psych/versions.rb +++ b/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/psych.gemspec b/psych.gemspec index 0990098..f55cd2a 100644 --- a/psych.gemspec +++ b/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" |