diff --git a/operating_system.rb b/operating_system.rb index 29f223e..ed653fd 100644 --- a/operating_system.rb +++ b/operating_system.rb @@ -46,8 +46,10 @@ module Gem RbConfig::CONFIG['libdir'] end - @default_dirs ||= Hash.new do |hash, key| - hash[key] = if path = default_locations[key] + @default_dirs ||= default_locations.inject(Hash.new) do |hash, location| + destination, path = location + + hash[destination] = if path { :bin_dir => File.join(path, RbConfig::CONFIG['bindir'].split(File::SEPARATOR).last), :gem_dir => File.join(path, RbConfig::CONFIG['datadir'].split(File::SEPARATOR).last, 'gems'), @@ -60,6 +62,8 @@ module Gem :ext_dir => '' } end + + hash end end diff --git a/ruby.spec b/ruby.spec index 726c45e..cbe32ba 100644 --- a/ruby.spec +++ b/ruby.spec @@ -21,7 +21,7 @@ %endif -%global release 5 +%global release 6 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %global rubygems_version 2.4.5 @@ -891,6 +891,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Wed Feb 04 2015 Vít Ondruch - 2.2.0-6 +- Initialize all load paths in operating_system.rb. + * Tue Feb 03 2015 Vít Ondruch - 2.2.0-5 - Make operating_system.rb more robust. - Add RubyGems stub headers for bundled gems.