Merge pull request #93 from OpenVoxProject/default_gem_fix

Don't update default or bundled gems unless we really have to

Author: nmburgan

configs/components/_base-rubygem.rb

@@ -35,15 +35,16 @@
 # If a gem needs more command line options to install set the :gem_install_options
 # in its component file rubygem-<compoment>, before the instance_eval of this file.
 gem_install_options = settings["#{pkg.get_name}_gem_install_options".to_sym]
-remove_older_versions = settings["#{pkg.get_name}_remove_older_versions".to_sym]
 # Set a default gem_uninstall
 gem_uninstall = settings[:gem_uninstall] || "#{settings[:host_gem]} uninstall --all --ignore-dependencies"
 pkg.install do
   steps = []
-  steps << "#{gem_uninstall} #{name}" if remove_older_versions
-  steps << if gem_install_options.nil?
-             "#{settings[:gem_install]} #{name}-#{version}.gem"
-           else
-             "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options}"
-           end
+  # Attempting to uninstall a default gem this way will fail, so ignore failures
+  steps << "#{gem_uninstall} --force --silent #{name} || true"
+  steps << "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options || ''}"
+  # If we are installing a newer version of a default gem, we need to remove the existing
+  # specification file so that we don't get warnings. The corresponding gem directory is
+  # usually empty and only there for compatibility reasons, so we remove that too to avoid confusion.
+  steps << "rm -f #{settings[:gem_home]}/specifications/default/#{name}-*.gemspec"
+  steps << "rm -rf #{settings[:gem_home]}/gems/#{name}-*[!#{version}]"
 end

configs/components/rubygem-CFPropertyList.rb

@@ -11,7 +11,6 @@
   pkg.version '4.0.0'
   pkg.sha256sum '385e7bbd7c27e176b23415275ca936ca0ece1727e5b890b08e36632076b00aff'
   pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-nkf'
   pkg.build_requires 'rubygem-rexml'
   ### End automated maintenance section ###
 

configs/components/rubygem-aws-partitions.rb

@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-partitions' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.1190.0'
-  pkg.sha256sum '3e21ce1c99329a96fb71419a5d92d0cece5b276a9f47bc91d6a1290450fb3669'
+  pkg.version '1.1194.0'
+  pkg.sha256sum 'dcc6c65735f4266b9cb14feee67afd2d345e01e5b87697f91ddc06e7603b0811'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')

configs/components/rubygem-aws-sdk-core.rb

@@ -11,9 +11,7 @@
   pkg.build_requires 'rubygem-aws-partitions'
   pkg.build_requires 'rubygem-aws-sigv4'
   pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-bigdecimal'
   pkg.build_requires 'rubygem-jmespath'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')

configs/components/rubygem-aws-sdk-ec2.rb

@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-sdk-ec2' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.583.0'
-  pkg.sha256sum 'd35d4f58811b7619b27f2919f6b88ad87ef764974dfdf05b506d8bc7a2693e15'
+  pkg.version '1.585.0'
+  pkg.sha256sum '72656489064ef23d676beec39a8f0940bbb20d019605ae0b6c39aa11d38bb963'
   pkg.build_requires 'rubygem-aws-sdk-core'
   pkg.build_requires 'rubygem-aws-sigv4'
   ### End automated maintenance section ###

configs/components/rubygem-benchmark.rb

@@ -5,8 +5,8 @@
 #####
 component 'rubygem-concurrent-ruby' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.3.5'
-  pkg.sha256sum '813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6'
+  pkg.version '1.3.6'
+  pkg.sha256sum '6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')

configs/components/rubygem-bigdecimal.rb

@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '1.3.2'
   pkg.sha256sum 'a089babe98638e58042a7d542b2bbd183304527e33d612b6dde22fa491a544a5'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')