From 513b5b911d68af44bc96c4ac706f029a81a7a1d1 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Mon, 22 Jun 2020 15:18:57 +0200 Subject: [PATCH] B #4929: Preserve site_ruby in paths, use realpath (#33) (cherry picked from commit 7872274c9b7ab40d3fd3a1fd5622387e7031dd2c) --- share/hooks/alias_ip/alias_ip.rb | 5 +++-- share/hooks/ft/host_error.rb | 5 +++-- share/hooks/vcenter/create_vcenter_net.rb | 5 +++-- share/hooks/vcenter/delete_vcenter_net.rb | 5 +++-- src/authm_mad/one_auth_mad.rb | 5 +++-- src/authm_mad/remotes/dummy/authenticate | 5 +++-- src/authm_mad/remotes/ldap/authenticate | 5 +++-- src/authm_mad/remotes/plain/authenticate | 5 +++-- src/authm_mad/remotes/server_cipher/authenticate | 5 +++-- src/authm_mad/remotes/server_x509/authenticate | 5 +++-- src/authm_mad/remotes/ssh/authenticate | 5 +++-- src/authm_mad/remotes/x509/authenticate | 5 +++-- src/cli/oneacct | 5 +++-- src/cli/oneacl | 5 +++-- src/cli/onecluster | 5 +++-- src/cli/onedatastore | 5 +++-- src/cli/oneflow | 5 +++-- src/cli/oneflow-template | 5 +++-- src/cli/onegroup | 5 +++-- src/cli/onehook | 5 +++-- src/cli/onehost | 5 +++-- src/cli/oneimage | 5 +++-- src/cli/onemarket | 5 +++-- src/cli/onemarketapp | 5 +++-- src/cli/oneprovision | 5 +++-- src/cli/onesecgroup | 5 +++-- src/cli/oneshowback | 5 +++-- src/cli/onetemplate | 5 +++-- src/cli/oneuser | 5 +++-- src/cli/onevcenter | 5 +++-- src/cli/onevdc | 5 +++-- src/cli/onevm | 5 +++-- src/cli/onevmgroup | 5 +++-- src/cli/onevnet | 5 +++-- src/cli/onevntemplate | 5 +++-- src/cli/onevrouter | 5 +++-- src/cli/onezone | 5 +++-- src/cloud/ec2/bin/econe-allocate-address | 5 +++-- src/cloud/ec2/bin/econe-associate-address | 5 +++-- src/cloud/ec2/bin/econe-attach-volume | 5 +++-- src/cloud/ec2/bin/econe-create-keypair | 5 +++-- src/cloud/ec2/bin/econe-create-volume | 5 +++-- src/cloud/ec2/bin/econe-delete-keypair | 5 +++-- src/cloud/ec2/bin/econe-delete-volume | 5 +++-- src/cloud/ec2/bin/econe-describe-addresses | 5 +++-- src/cloud/ec2/bin/econe-describe-images | 5 +++-- src/cloud/ec2/bin/econe-describe-instances | 5 +++-- src/cloud/ec2/bin/econe-describe-keypairs | 5 +++-- src/cloud/ec2/bin/econe-describe-volumes | 5 +++-- src/cloud/ec2/bin/econe-detach-volume | 5 +++-- src/cloud/ec2/bin/econe-disassociate-address | 5 +++-- src/cloud/ec2/bin/econe-reboot-instances | 5 +++-- src/cloud/ec2/bin/econe-register | 5 +++-- src/cloud/ec2/bin/econe-release-address | 5 +++-- src/cloud/ec2/bin/econe-run-instances | 5 +++-- src/cloud/ec2/bin/econe-start-instances | 5 +++-- src/cloud/ec2/bin/econe-stop-instances | 5 +++-- src/cloud/ec2/bin/econe-terminate-instances | 5 +++-- src/cloud/ec2/bin/econe-upload | 5 +++-- src/cloud/ec2/lib/econe-server.rb | 5 +++-- src/datastore_mad/one_datastore.rb | 5 +++-- src/datastore_mad/remotes/vcenter/clone | 5 +++-- src/datastore_mad/remotes/vcenter/cp | 5 +++-- src/datastore_mad/remotes/vcenter/export | 5 +++-- src/datastore_mad/remotes/vcenter/mkfs | 5 +++-- src/datastore_mad/remotes/vcenter/monitor | 5 +++-- src/datastore_mad/remotes/vcenter/rm | 5 +++-- src/datastore_mad/remotes/vcenter/stat | 5 +++-- src/datastore_mad/remotes/vcenter_downloader.rb | 5 +++-- src/datastore_mad/remotes/vcenter_uploader.rb | 5 +++-- src/flow/oneflow-server.rb | 5 +++-- src/hem/onehem-server.rb | 5 +++-- src/hm_mad/one_hm.rb | 5 +++-- src/im_mad/im_exec/one_im_exec.rb | 5 +++-- .../remotes/az-probes.d/host/monitor/probe_host_monitor.rb | 5 +++-- .../remotes/az-probes.d/host/system/probe_host_system.rb | 5 +++-- .../remotes/az-probes.d/vm/monitor/probe_vm_monitor.rb | 5 +++-- .../remotes/az-probes.d/vm/status/probe_vm_status.rb | 5 +++-- src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb | 5 +++-- .../ec2-probes.d/host/monitor/probe_host_monitor.rb | 5 +++-- .../remotes/ec2-probes.d/host/system/probe_host_system.rb | 5 +++-- .../remotes/ec2-probes.d/vm/monitor/probe_vm_monitor.rb | 5 +++-- .../remotes/ec2-probes.d/vm/status/probe_vm_status.rb | 5 +++-- src/im_mad/remotes/lib/probe_db.rb | 5 +++-- src/im_mad/remotes/lib/vcenter_monitor.rb | 5 +++-- .../one-probes.d/host/monitor/probe_host_monitor.rb | 5 +++-- .../remotes/one-probes.d/host/system/probe_host_system.rb | 5 +++-- .../remotes/one-probes.d/vm/monitor/probe_vm_monitor.rb | 5 +++-- .../remotes/one-probes.d/vm/status/probe_vm_status.rb | 5 +++-- .../packet-probes.d/host/monitor/probe_host_monitor.rb | 5 +++-- .../packet-probes.d/host/system/probe_host_system.rb | 5 +++-- .../remotes/packet-probes.d/vm/monitor/probe_vm_monitor.rb | 5 +++-- .../remotes/packet-probes.d/vm/status/probe_vm_status.rb | 5 +++-- src/ipamm_mad/one_ipam.rb | 5 +++-- src/ipamm_mad/remotes/packet/allocate_address | 5 +++-- src/ipamm_mad/remotes/packet/free_address | 5 +++-- src/ipamm_mad/remotes/packet/get_address | 5 +++-- src/ipamm_mad/remotes/packet/register_address_range | 5 +++-- src/ipamm_mad/remotes/packet/unregister_address_range | 5 +++-- src/market_mad/one_market.rb | 5 +++-- src/market_mad/remotes/s3/delete | 5 +++-- src/market_mad/remotes/s3/import | 5 +++-- src/market_mad/remotes/s3/monitor | 5 +++-- src/market_mad/remotes/turnkeylinux/monitor | 5 +++-- src/onedb/onedb | 5 +++-- src/onedb/vcenter_one54_pre.rb | 5 +++-- src/onegate/onegate-server.rb | 5 +++-- src/pm_mad/remotes/dummy/deploy | 5 +++-- src/pm_mad/remotes/ec2/cancel | 5 +++-- src/pm_mad/remotes/ec2/deploy | 5 +++-- src/pm_mad/remotes/ec2/poll | 5 +++-- src/pm_mad/remotes/ec2/reboot | 5 +++-- src/pm_mad/remotes/ec2/reset | 5 +++-- src/pm_mad/remotes/ec2/shutdown | 5 +++-- src/pm_mad/remotes/packet/cancel | 5 +++-- src/pm_mad/remotes/packet/deploy | 5 +++-- src/pm_mad/remotes/packet/poll | 5 +++-- src/pm_mad/remotes/packet/reboot | 5 +++-- src/pm_mad/remotes/packet/reset | 5 +++-- src/pm_mad/remotes/packet/shutdown | 5 +++-- src/sunstone/bin/novnc-server | 5 +++-- src/sunstone/routes/nsx.rb | 5 +++-- src/sunstone/sunstone-server.rb | 7 +++---- src/tm_mad/one_tm.rb | 5 +++-- src/tm_mad/vcenter/clone | 5 +++-- src/tm_mad/vcenter/cpds | 5 +++-- src/tm_mad/vcenter/delete | 5 +++-- src/tm_mad/vcenter/mkimage | 5 +++-- src/tm_mad/vcenter/mv | 5 +++-- src/tm_mad/vcenter/mvds | 5 +++-- src/tm_mad/vcenter/resize | 5 +++-- src/vmm_mad/dummy/one_vmm_dummy.rb | 5 +++-- src/vmm_mad/exec/one_vmm_exec.rb | 5 +++-- src/vmm_mad/remotes/az/az_driver.rb | 5 +++-- src/vmm_mad/remotes/az/cancel | 5 +++-- src/vmm_mad/remotes/az/deploy | 5 +++-- src/vmm_mad/remotes/az/poll | 5 +++-- src/vmm_mad/remotes/az/reboot | 5 +++-- src/vmm_mad/remotes/az/restore | 5 +++-- src/vmm_mad/remotes/az/shutdown | 5 +++-- src/vmm_mad/remotes/ec2/cancel | 5 +++-- src/vmm_mad/remotes/ec2/deploy | 5 +++-- src/vmm_mad/remotes/ec2/ec2_driver.rb | 5 +++-- src/vmm_mad/remotes/ec2/poll | 5 +++-- src/vmm_mad/remotes/ec2/reboot | 5 +++-- src/vmm_mad/remotes/ec2/restore | 5 +++-- src/vmm_mad/remotes/ec2/shutdown | 5 +++-- src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb | 4 +++- src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb | 5 +++-- src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb | 5 +++-- src/vmm_mad/remotes/lib/nsx_driver/nsx_rule.rb | 4 +++- src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb | 5 +++-- src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb | 5 +++-- src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb | 5 +++-- src/vmm_mad/remotes/nsx/nsx_driver.rb | 5 +++-- src/vmm_mad/remotes/one/cancel | 5 +++-- src/vmm_mad/remotes/one/deploy | 5 +++-- src/vmm_mad/remotes/one/opennebula_driver.rb | 5 +++-- src/vmm_mad/remotes/one/poll | 5 +++-- src/vmm_mad/remotes/one/reboot | 5 +++-- src/vmm_mad/remotes/one/reset | 5 +++-- src/vmm_mad/remotes/one/restore | 5 +++-- src/vmm_mad/remotes/one/save | 5 +++-- src/vmm_mad/remotes/one/shutdown | 5 +++-- src/vmm_mad/remotes/packet/cancel | 5 +++-- src/vmm_mad/remotes/packet/deploy | 5 +++-- src/vmm_mad/remotes/packet/packet_driver.rb | 5 +++-- src/vmm_mad/remotes/packet/poll | 5 +++-- src/vmm_mad/remotes/packet/reboot | 5 +++-- src/vmm_mad/remotes/packet/reset | 5 +++-- src/vmm_mad/remotes/packet/shutdown | 5 +++-- src/vmm_mad/remotes/vcenter/attach_disk | 5 +++-- src/vmm_mad/remotes/vcenter/attach_nic | 5 +++-- src/vmm_mad/remotes/vcenter/cancel | 5 +++-- src/vmm_mad/remotes/vcenter/deploy | 5 +++-- src/vmm_mad/remotes/vcenter/detach_nic | 5 +++-- src/vmm_mad/remotes/vcenter/migrate | 5 +++-- src/vmm_mad/remotes/vcenter/poll | 5 +++-- src/vmm_mad/remotes/vcenter/reboot | 5 +++-- src/vmm_mad/remotes/vcenter/reconfigure | 5 +++-- src/vmm_mad/remotes/vcenter/reset | 5 +++-- src/vmm_mad/remotes/vcenter/restore | 5 +++-- src/vmm_mad/remotes/vcenter/save | 5 +++-- src/vmm_mad/remotes/vcenter/shutdown | 5 +++-- src/vmm_mad/remotes/vcenter/snapshot_create | 5 +++-- src/vmm_mad/remotes/vcenter/snapshot_delete | 5 +++-- src/vmm_mad/remotes/vcenter/snapshot_revert | 5 +++-- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 5 +++-- src/vnm_mad/remotes/vcenter/clean | 4 +++- src/vnm_mad/remotes/vcenter/post | 4 +++- src/vnm_mad/remotes/vcenter/update_sg | 4 +++- 191 files changed, 573 insertions(+), 379 deletions(-) diff --git a/share/hooks/alias_ip/alias_ip.rb b/share/hooks/alias_ip/alias_ip.rb index 90d44f61e2..0460d54685 100755 --- a/share/hooks/alias_ip/alias_ip.rb +++ b/share/hooks/alias_ip/alias_ip.rb @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/share/hooks/ft/host_error.rb b/share/hooks/ft/host_error.rb index 45214701fa..a41ce520c8 100755 --- a/share/hooks/ft/host_error.rb +++ b/share/hooks/ft/host_error.rb @@ -50,8 +50,9 @@ end FENCE_HOST = File.dirname(__FILE__) + '/fence_host.sh' if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/share/hooks/vcenter/create_vcenter_net.rb b/share/hooks/vcenter/create_vcenter_net.rb index 365471ce14..4e0b42d555 100755 --- a/share/hooks/vcenter/create_vcenter_net.rb +++ b/share/hooks/vcenter/create_vcenter_net.rb @@ -32,8 +32,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/share/hooks/vcenter/delete_vcenter_net.rb b/share/hooks/vcenter/delete_vcenter_net.rb index 7c300b4b9a..91c9f3db7f 100755 --- a/share/hooks/vcenter/delete_vcenter_net.rb +++ b/share/hooks/vcenter/delete_vcenter_net.rb @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/one_auth_mad.rb b/src/authm_mad/one_auth_mad.rb index 290aef98b8..32417da849 100755 --- a/src/authm_mad/one_auth_mad.rb +++ b/src/authm_mad/one_auth_mad.rb @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/remotes/dummy/authenticate b/src/authm_mad/remotes/dummy/authenticate index f3bfade29c..c18af6afba 100755 --- a/src/authm_mad/remotes/dummy/authenticate +++ b/src/authm_mad/remotes/dummy/authenticate @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/remotes/ldap/authenticate b/src/authm_mad/remotes/ldap/authenticate index afaca5b11e..95ffc96998 100755 --- a/src/authm_mad/remotes/ldap/authenticate +++ b/src/authm_mad/remotes/ldap/authenticate @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/remotes/plain/authenticate b/src/authm_mad/remotes/plain/authenticate index 08f2ec5600..d6e20ff89d 100755 --- a/src/authm_mad/remotes/plain/authenticate +++ b/src/authm_mad/remotes/plain/authenticate @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/remotes/server_cipher/authenticate b/src/authm_mad/remotes/server_cipher/authenticate index 1c00b60142..c259a3f61e 100755 --- a/src/authm_mad/remotes/server_cipher/authenticate +++ b/src/authm_mad/remotes/server_cipher/authenticate @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/remotes/server_x509/authenticate b/src/authm_mad/remotes/server_x509/authenticate index 239efe5c3f..c0d21038b9 100755 --- a/src/authm_mad/remotes/server_x509/authenticate +++ b/src/authm_mad/remotes/server_x509/authenticate @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/remotes/ssh/authenticate b/src/authm_mad/remotes/ssh/authenticate index 36526190b6..ee784992c5 100755 --- a/src/authm_mad/remotes/ssh/authenticate +++ b/src/authm_mad/remotes/ssh/authenticate @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/authm_mad/remotes/x509/authenticate b/src/authm_mad/remotes/x509/authenticate index 6317cc7cf6..7c84298fc2 100755 --- a/src/authm_mad/remotes/x509/authenticate +++ b/src/authm_mad/remotes/x509/authenticate @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneacct b/src/cli/oneacct index eb7472c8c0..0a98c5e161 100755 --- a/src/cli/oneacct +++ b/src/cli/oneacct @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneacl b/src/cli/oneacl index 6d27a3fa4e..ce78f110db 100755 --- a/src/cli/oneacl +++ b/src/cli/oneacl @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onecluster b/src/cli/onecluster index 2be146fe60..c0f3e6f6ac 100755 --- a/src/cli/onecluster +++ b/src/cli/onecluster @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onedatastore b/src/cli/onedatastore index 76a1af00bf..52f65b37f4 100755 --- a/src/cli/onedatastore +++ b/src/cli/onedatastore @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneflow b/src/cli/oneflow index ec7cfd001c..d8c5b9ab9e 100755 --- a/src/cli/oneflow +++ b/src/cli/oneflow @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneflow-template b/src/cli/oneflow-template index edac0726e1..94b985b2f7 100755 --- a/src/cli/oneflow-template +++ b/src/cli/oneflow-template @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onegroup b/src/cli/onegroup index 79f790ed7b..76d6dc227c 100755 --- a/src/cli/onegroup +++ b/src/cli/onegroup @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onehook b/src/cli/onehook index 02425b99ad..5c5b760a1e 100755 --- a/src/cli/onehook +++ b/src/cli/onehook @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onehost b/src/cli/onehost index 333397118d..557fecae84 100755 --- a/src/cli/onehost +++ b/src/cli/onehost @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneimage b/src/cli/oneimage index 2fa0cff723..a8ad5fedf0 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onemarket b/src/cli/onemarket index 297cb4ddde..e2016333b4 100755 --- a/src/cli/onemarket +++ b/src/cli/onemarket @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onemarketapp b/src/cli/onemarketapp index 5bc31b36cb..f01a2adb7c 100755 --- a/src/cli/onemarketapp +++ b/src/cli/onemarketapp @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneprovision b/src/cli/oneprovision index 7801b9b1ea..d43f920a1f 100755 --- a/src/cli/oneprovision +++ b/src/cli/oneprovision @@ -33,8 +33,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onesecgroup b/src/cli/onesecgroup index 41ba6ebd4d..c76b20b5b5 100755 --- a/src/cli/onesecgroup +++ b/src/cli/onesecgroup @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneshowback b/src/cli/oneshowback index 2185161059..3931a437b6 100755 --- a/src/cli/oneshowback +++ b/src/cli/oneshowback @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onetemplate b/src/cli/onetemplate index 019f34d3b7..922858b59c 100755 --- a/src/cli/onetemplate +++ b/src/cli/onetemplate @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/oneuser b/src/cli/oneuser index 15be3c04f9..d498412bf6 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onevcenter b/src/cli/onevcenter index f84a7ef5bc..ef9c381019 100755 --- a/src/cli/onevcenter +++ b/src/cli/onevcenter @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onevdc b/src/cli/onevdc index cd3614df7f..07e93e9e23 100755 --- a/src/cli/onevdc +++ b/src/cli/onevdc @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onevm b/src/cli/onevm index a13a6ce492..617c5e21de 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onevmgroup b/src/cli/onevmgroup index 71097abb81..b1324cae2a 100755 --- a/src/cli/onevmgroup +++ b/src/cli/onevmgroup @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onevnet b/src/cli/onevnet index 267711942c..2f69c3c465 100755 --- a/src/cli/onevnet +++ b/src/cli/onevnet @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onevntemplate b/src/cli/onevntemplate index 61939584e3..0772d9e259 100755 --- a/src/cli/onevntemplate +++ b/src/cli/onevntemplate @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onevrouter b/src/cli/onevrouter index fdd4424a90..92a2276c54 100755 --- a/src/cli/onevrouter +++ b/src/cli/onevrouter @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cli/onezone b/src/cli/onezone index bad78d148c..60458228e1 100755 --- a/src/cli/onezone +++ b/src/cli/onezone @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-allocate-address b/src/cloud/ec2/bin/econe-allocate-address index 20b5e46941..9bc305fbda 100755 --- a/src/cloud/ec2/bin/econe-allocate-address +++ b/src/cloud/ec2/bin/econe-allocate-address @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-associate-address b/src/cloud/ec2/bin/econe-associate-address index 7f56be4568..c11ecc7af6 100755 --- a/src/cloud/ec2/bin/econe-associate-address +++ b/src/cloud/ec2/bin/econe-associate-address @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-attach-volume b/src/cloud/ec2/bin/econe-attach-volume index 95786c5902..faad9e6a2d 100755 --- a/src/cloud/ec2/bin/econe-attach-volume +++ b/src/cloud/ec2/bin/econe-attach-volume @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-create-keypair b/src/cloud/ec2/bin/econe-create-keypair index 3ecb7fbb6d..7175eb2961 100755 --- a/src/cloud/ec2/bin/econe-create-keypair +++ b/src/cloud/ec2/bin/econe-create-keypair @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-create-volume b/src/cloud/ec2/bin/econe-create-volume index 3d5d1f44ba..5cfb0ea210 100755 --- a/src/cloud/ec2/bin/econe-create-volume +++ b/src/cloud/ec2/bin/econe-create-volume @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-delete-keypair b/src/cloud/ec2/bin/econe-delete-keypair index 675b08f559..782cb32f01 100755 --- a/src/cloud/ec2/bin/econe-delete-keypair +++ b/src/cloud/ec2/bin/econe-delete-keypair @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-delete-volume b/src/cloud/ec2/bin/econe-delete-volume index 7565bfc021..96419e5a89 100755 --- a/src/cloud/ec2/bin/econe-delete-volume +++ b/src/cloud/ec2/bin/econe-delete-volume @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-describe-addresses b/src/cloud/ec2/bin/econe-describe-addresses index 785aa1de67..61441c7d01 100755 --- a/src/cloud/ec2/bin/econe-describe-addresses +++ b/src/cloud/ec2/bin/econe-describe-addresses @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-describe-images b/src/cloud/ec2/bin/econe-describe-images index 0e0f67b5fc..5c060a44e6 100755 --- a/src/cloud/ec2/bin/econe-describe-images +++ b/src/cloud/ec2/bin/econe-describe-images @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-describe-instances b/src/cloud/ec2/bin/econe-describe-instances index 24b86075e5..f1a357214f 100755 --- a/src/cloud/ec2/bin/econe-describe-instances +++ b/src/cloud/ec2/bin/econe-describe-instances @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-describe-keypairs b/src/cloud/ec2/bin/econe-describe-keypairs index 0a077747ee..acd7e92b4e 100755 --- a/src/cloud/ec2/bin/econe-describe-keypairs +++ b/src/cloud/ec2/bin/econe-describe-keypairs @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-describe-volumes b/src/cloud/ec2/bin/econe-describe-volumes index 7b6456eaeb..6c11dd5aca 100755 --- a/src/cloud/ec2/bin/econe-describe-volumes +++ b/src/cloud/ec2/bin/econe-describe-volumes @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-detach-volume b/src/cloud/ec2/bin/econe-detach-volume index a684c88c77..927bb71e02 100755 --- a/src/cloud/ec2/bin/econe-detach-volume +++ b/src/cloud/ec2/bin/econe-detach-volume @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-disassociate-address b/src/cloud/ec2/bin/econe-disassociate-address index 8199c8dfe5..4e327ac006 100755 --- a/src/cloud/ec2/bin/econe-disassociate-address +++ b/src/cloud/ec2/bin/econe-disassociate-address @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-reboot-instances b/src/cloud/ec2/bin/econe-reboot-instances index a73ff7f915..7fa1ff719c 100755 --- a/src/cloud/ec2/bin/econe-reboot-instances +++ b/src/cloud/ec2/bin/econe-reboot-instances @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-register b/src/cloud/ec2/bin/econe-register index 6a61a9c8f2..e9b3ad19c1 100755 --- a/src/cloud/ec2/bin/econe-register +++ b/src/cloud/ec2/bin/econe-register @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-release-address b/src/cloud/ec2/bin/econe-release-address index 472865c19e..86fc807062 100755 --- a/src/cloud/ec2/bin/econe-release-address +++ b/src/cloud/ec2/bin/econe-release-address @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-run-instances b/src/cloud/ec2/bin/econe-run-instances index 3075247147..5ed96eb249 100755 --- a/src/cloud/ec2/bin/econe-run-instances +++ b/src/cloud/ec2/bin/econe-run-instances @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-start-instances b/src/cloud/ec2/bin/econe-start-instances index c4b93188f6..bedccc85b3 100755 --- a/src/cloud/ec2/bin/econe-start-instances +++ b/src/cloud/ec2/bin/econe-start-instances @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-stop-instances b/src/cloud/ec2/bin/econe-stop-instances index 397bc7400d..58bdbe740d 100755 --- a/src/cloud/ec2/bin/econe-stop-instances +++ b/src/cloud/ec2/bin/econe-stop-instances @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-terminate-instances b/src/cloud/ec2/bin/econe-terminate-instances index 1375d6c9c5..09dd9cbd1e 100755 --- a/src/cloud/ec2/bin/econe-terminate-instances +++ b/src/cloud/ec2/bin/econe-terminate-instances @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/bin/econe-upload b/src/cloud/ec2/bin/econe-upload index 0c71d66c31..c1402cb1e8 100755 --- a/src/cloud/ec2/bin/econe-upload +++ b/src/cloud/ec2/bin/econe-upload @@ -26,8 +26,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb index efeb542fe0..09efa46b85 100644 --- a/src/cloud/ec2/lib/econe-server.rb +++ b/src/cloud/ec2/lib/econe-server.rb @@ -41,8 +41,9 @@ TEMPLATE_LOCATION = ETC_LOCATION + '/ec2query_templates' VIEWS_LOCATION = RUBY_LIB_LOCATION + '/cloud/econe/views' if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/one_datastore.rb b/src/datastore_mad/one_datastore.rb index 5c333a4ee9..6559b6d09a 100755 --- a/src/datastore_mad/one_datastore.rb +++ b/src/datastore_mad/one_datastore.rb @@ -32,8 +32,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter/clone b/src/datastore_mad/remotes/vcenter/clone index 65b7374c12..dfc916913d 100755 --- a/src/datastore_mad/remotes/vcenter/clone +++ b/src/datastore_mad/remotes/vcenter/clone @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter/cp b/src/datastore_mad/remotes/vcenter/cp index 9ac7c7d6bf..8138d48990 100755 --- a/src/datastore_mad/remotes/vcenter/cp +++ b/src/datastore_mad/remotes/vcenter/cp @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter/export b/src/datastore_mad/remotes/vcenter/export index 9f7f321579..cfd0d8ea5e 100755 --- a/src/datastore_mad/remotes/vcenter/export +++ b/src/datastore_mad/remotes/vcenter/export @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter/mkfs b/src/datastore_mad/remotes/vcenter/mkfs index 1c5ba09b6b..1d2d2b9b63 100755 --- a/src/datastore_mad/remotes/vcenter/mkfs +++ b/src/datastore_mad/remotes/vcenter/mkfs @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter/monitor b/src/datastore_mad/remotes/vcenter/monitor index b9e49e0a17..98072baf95 100755 --- a/src/datastore_mad/remotes/vcenter/monitor +++ b/src/datastore_mad/remotes/vcenter/monitor @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter/rm b/src/datastore_mad/remotes/vcenter/rm index 8cd8c4bacf..b3bc9a5c40 100755 --- a/src/datastore_mad/remotes/vcenter/rm +++ b/src/datastore_mad/remotes/vcenter/rm @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter/stat b/src/datastore_mad/remotes/vcenter/stat index 54a384db35..9246527fc7 100755 --- a/src/datastore_mad/remotes/vcenter/stat +++ b/src/datastore_mad/remotes/vcenter/stat @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter_downloader.rb b/src/datastore_mad/remotes/vcenter_downloader.rb index fc63ab085a..f558764384 100755 --- a/src/datastore_mad/remotes/vcenter_downloader.rb +++ b/src/datastore_mad/remotes/vcenter_downloader.rb @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/datastore_mad/remotes/vcenter_uploader.rb b/src/datastore_mad/remotes/vcenter_uploader.rb index 6be4101625..9fb2508fea 100755 --- a/src/datastore_mad/remotes/vcenter_uploader.rb +++ b/src/datastore_mad/remotes/vcenter_uploader.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/flow/oneflow-server.rb b/src/flow/oneflow-server.rb index 02c75d3f00..7e62aafdb4 100644 --- a/src/flow/oneflow-server.rb +++ b/src/flow/oneflow-server.rb @@ -38,8 +38,9 @@ ONEFLOW_LOG = LOG_LOCATION + '/oneflow.log' CONFIGURATION_FILE = ETC_LOCATION + '/oneflow-server.conf' if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/hem/onehem-server.rb b/src/hem/onehem-server.rb index 8f745426b6..fe46271799 100755 --- a/src/hem/onehem-server.rb +++ b/src/hem/onehem-server.rb @@ -39,8 +39,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/hm_mad/one_hm.rb b/src/hm_mad/one_hm.rb index cf39195b70..1a6cf2fd1b 100755 --- a/src/hm_mad/one_hm.rb +++ b/src/hm_mad/one_hm.rb @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/im_exec/one_im_exec.rb b/src/im_mad/im_exec/one_im_exec.rb index 8375bdad49..b508eb84bf 100755 --- a/src/im_mad/im_exec/one_im_exec.rb +++ b/src/im_mad/im_exec/one_im_exec.rb @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/az-probes.d/host/monitor/probe_host_monitor.rb b/src/im_mad/remotes/az-probes.d/host/monitor/probe_host_monitor.rb index 6b19946d58..452c411e80 100755 --- a/src/im_mad/remotes/az-probes.d/host/monitor/probe_host_monitor.rb +++ b/src/im_mad/remotes/az-probes.d/host/monitor/probe_host_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/az-probes.d/host/system/probe_host_system.rb b/src/im_mad/remotes/az-probes.d/host/system/probe_host_system.rb index df01995fc6..eb57033add 100755 --- a/src/im_mad/remotes/az-probes.d/host/system/probe_host_system.rb +++ b/src/im_mad/remotes/az-probes.d/host/system/probe_host_system.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/az-probes.d/vm/monitor/probe_vm_monitor.rb b/src/im_mad/remotes/az-probes.d/vm/monitor/probe_vm_monitor.rb index bd0c0ef219..024a781785 100755 --- a/src/im_mad/remotes/az-probes.d/vm/monitor/probe_vm_monitor.rb +++ b/src/im_mad/remotes/az-probes.d/vm/monitor/probe_vm_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/az-probes.d/vm/status/probe_vm_status.rb b/src/im_mad/remotes/az-probes.d/vm/status/probe_vm_status.rb index 9aa02fe396..fdb78c7a12 100755 --- a/src/im_mad/remotes/az-probes.d/vm/status/probe_vm_status.rb +++ b/src/im_mad/remotes/az-probes.d/vm/status/probe_vm_status.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb b/src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb index 43b9789570..b187cebcf7 100755 --- a/src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb +++ b/src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb @@ -28,8 +28,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/ec2-probes.d/host/monitor/probe_host_monitor.rb b/src/im_mad/remotes/ec2-probes.d/host/monitor/probe_host_monitor.rb index 758596a3fb..35cc50a1e4 100755 --- a/src/im_mad/remotes/ec2-probes.d/host/monitor/probe_host_monitor.rb +++ b/src/im_mad/remotes/ec2-probes.d/host/monitor/probe_host_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/ec2-probes.d/host/system/probe_host_system.rb b/src/im_mad/remotes/ec2-probes.d/host/system/probe_host_system.rb index 82357369a7..32f124e4f9 100755 --- a/src/im_mad/remotes/ec2-probes.d/host/system/probe_host_system.rb +++ b/src/im_mad/remotes/ec2-probes.d/host/system/probe_host_system.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/ec2-probes.d/vm/monitor/probe_vm_monitor.rb b/src/im_mad/remotes/ec2-probes.d/vm/monitor/probe_vm_monitor.rb index 8c84e4fe66..af6fe2f98c 100755 --- a/src/im_mad/remotes/ec2-probes.d/vm/monitor/probe_vm_monitor.rb +++ b/src/im_mad/remotes/ec2-probes.d/vm/monitor/probe_vm_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/ec2-probes.d/vm/status/probe_vm_status.rb b/src/im_mad/remotes/ec2-probes.d/vm/status/probe_vm_status.rb index 0ab533b3a9..4953bb3441 100755 --- a/src/im_mad/remotes/ec2-probes.d/vm/status/probe_vm_status.rb +++ b/src/im_mad/remotes/ec2-probes.d/vm/status/probe_vm_status.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/lib/probe_db.rb b/src/im_mad/remotes/lib/probe_db.rb index 1974ade2f4..2a6ffd2ce9 100644 --- a/src/im_mad/remotes/lib/probe_db.rb +++ b/src/im_mad/remotes/lib/probe_db.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/lib/vcenter_monitor.rb b/src/im_mad/remotes/lib/vcenter_monitor.rb index 0a6a0e6c20..9f7c8abee5 100644 --- a/src/im_mad/remotes/lib/vcenter_monitor.rb +++ b/src/im_mad/remotes/lib/vcenter_monitor.rb @@ -31,8 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/one-probes.d/host/monitor/probe_host_monitor.rb b/src/im_mad/remotes/one-probes.d/host/monitor/probe_host_monitor.rb index 79e938b85f..2890b14c99 100755 --- a/src/im_mad/remotes/one-probes.d/host/monitor/probe_host_monitor.rb +++ b/src/im_mad/remotes/one-probes.d/host/monitor/probe_host_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/one-probes.d/host/system/probe_host_system.rb b/src/im_mad/remotes/one-probes.d/host/system/probe_host_system.rb index 7266fcb5ca..bb4ba25bdf 100755 --- a/src/im_mad/remotes/one-probes.d/host/system/probe_host_system.rb +++ b/src/im_mad/remotes/one-probes.d/host/system/probe_host_system.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/one-probes.d/vm/monitor/probe_vm_monitor.rb b/src/im_mad/remotes/one-probes.d/vm/monitor/probe_vm_monitor.rb index 90a26c598d..58770ba4e1 100755 --- a/src/im_mad/remotes/one-probes.d/vm/monitor/probe_vm_monitor.rb +++ b/src/im_mad/remotes/one-probes.d/vm/monitor/probe_vm_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/one-probes.d/vm/status/probe_vm_status.rb b/src/im_mad/remotes/one-probes.d/vm/status/probe_vm_status.rb index 43207be8ae..6d08d3994f 100755 --- a/src/im_mad/remotes/one-probes.d/vm/status/probe_vm_status.rb +++ b/src/im_mad/remotes/one-probes.d/vm/status/probe_vm_status.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/packet-probes.d/host/monitor/probe_host_monitor.rb b/src/im_mad/remotes/packet-probes.d/host/monitor/probe_host_monitor.rb index f12044694a..da57cb55e4 100755 --- a/src/im_mad/remotes/packet-probes.d/host/monitor/probe_host_monitor.rb +++ b/src/im_mad/remotes/packet-probes.d/host/monitor/probe_host_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/packet-probes.d/host/system/probe_host_system.rb b/src/im_mad/remotes/packet-probes.d/host/system/probe_host_system.rb index 883e374b7c..e1a84e1a3e 100755 --- a/src/im_mad/remotes/packet-probes.d/host/system/probe_host_system.rb +++ b/src/im_mad/remotes/packet-probes.d/host/system/probe_host_system.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/packet-probes.d/vm/monitor/probe_vm_monitor.rb b/src/im_mad/remotes/packet-probes.d/vm/monitor/probe_vm_monitor.rb index d8bb6b30f2..f634d71e0f 100755 --- a/src/im_mad/remotes/packet-probes.d/vm/monitor/probe_vm_monitor.rb +++ b/src/im_mad/remotes/packet-probes.d/vm/monitor/probe_vm_monitor.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/im_mad/remotes/packet-probes.d/vm/status/probe_vm_status.rb b/src/im_mad/remotes/packet-probes.d/vm/status/probe_vm_status.rb index 0cd9224283..e8519100dc 100755 --- a/src/im_mad/remotes/packet-probes.d/vm/status/probe_vm_status.rb +++ b/src/im_mad/remotes/packet-probes.d/vm/status/probe_vm_status.rb @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/ipamm_mad/one_ipam.rb b/src/ipamm_mad/one_ipam.rb index 4a57d7a78f..141b974c5f 100755 --- a/src/ipamm_mad/one_ipam.rb +++ b/src/ipamm_mad/one_ipam.rb @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/ipamm_mad/remotes/packet/allocate_address b/src/ipamm_mad/remotes/packet/allocate_address index 880e0f0ade..20b7b4c866 100755 --- a/src/ipamm_mad/remotes/packet/allocate_address +++ b/src/ipamm_mad/remotes/packet/allocate_address @@ -53,8 +53,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << PACKET_LOCATION diff --git a/src/ipamm_mad/remotes/packet/free_address b/src/ipamm_mad/remotes/packet/free_address index 22e8e0d552..2b8f444335 100755 --- a/src/ipamm_mad/remotes/packet/free_address +++ b/src/ipamm_mad/remotes/packet/free_address @@ -47,8 +47,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << PACKET_LOCATION diff --git a/src/ipamm_mad/remotes/packet/get_address b/src/ipamm_mad/remotes/packet/get_address index a808997d8f..fb937b9df7 100755 --- a/src/ipamm_mad/remotes/packet/get_address +++ b/src/ipamm_mad/remotes/packet/get_address @@ -60,8 +60,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << PACKET_LOCATION diff --git a/src/ipamm_mad/remotes/packet/register_address_range b/src/ipamm_mad/remotes/packet/register_address_range index 4f02af84d2..1b52314c6f 100755 --- a/src/ipamm_mad/remotes/packet/register_address_range +++ b/src/ipamm_mad/remotes/packet/register_address_range @@ -81,8 +81,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << PACKET_LOCATION diff --git a/src/ipamm_mad/remotes/packet/unregister_address_range b/src/ipamm_mad/remotes/packet/unregister_address_range index 6c5e57eb30..83b4fc882b 100755 --- a/src/ipamm_mad/remotes/packet/unregister_address_range +++ b/src/ipamm_mad/remotes/packet/unregister_address_range @@ -45,8 +45,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << PACKET_LOCATION diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb index 16df41593d..030c6f2339 100755 --- a/src/market_mad/one_market.rb +++ b/src/market_mad/one_market.rb @@ -32,8 +32,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/market_mad/remotes/s3/delete b/src/market_mad/remotes/s3/delete index 7cb2ef5d97..49cd72a0aa 100755 --- a/src/market_mad/remotes/s3/delete +++ b/src/market_mad/remotes/s3/delete @@ -35,8 +35,9 @@ end UTILS_PATH = File.join(File.dirname(__FILE__), '../../datastore') if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/market_mad/remotes/s3/import b/src/market_mad/remotes/s3/import index b6bcb887bb..a79f3aed56 100755 --- a/src/market_mad/remotes/s3/import +++ b/src/market_mad/remotes/s3/import @@ -35,8 +35,9 @@ end UTILS_PATH = File.join(File.dirname(__FILE__), '../../datastore') if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/market_mad/remotes/s3/monitor b/src/market_mad/remotes/s3/monitor index 5af9fbc2e9..e3583f0954 100755 --- a/src/market_mad/remotes/s3/monitor +++ b/src/market_mad/remotes/s3/monitor @@ -35,8 +35,9 @@ end UTILS_PATH = File.join(File.dirname(__FILE__), '../../datastore') if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/market_mad/remotes/turnkeylinux/monitor b/src/market_mad/remotes/turnkeylinux/monitor index 5d226a0cf6..624d7e0852 100755 --- a/src/market_mad/remotes/turnkeylinux/monitor +++ b/src/market_mad/remotes/turnkeylinux/monitor @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/onedb/onedb b/src/onedb/onedb index 35827b72bf..ca824a0aae 100755 --- a/src/onedb/onedb +++ b/src/onedb/onedb @@ -47,8 +47,9 @@ end ONED_CONF = "#{ETC_LOCATION}/oned.conf" if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/onedb/vcenter_one54_pre.rb b/src/onedb/vcenter_one54_pre.rb index 56df46b055..990e971092 100644 --- a/src/onedb/vcenter_one54_pre.rb +++ b/src/onedb/vcenter_one54_pre.rb @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/onegate/onegate-server.rb b/src/onegate/onegate-server.rb index d598df4c04..a167f5bdda 100644 --- a/src/onegate/onegate-server.rb +++ b/src/onegate/onegate-server.rb @@ -38,8 +38,9 @@ ONEGATE_LOG = LOG_LOCATION + "/onegate.log" CONFIGURATION_FILE = ETC_LOCATION + "/onegate-server.conf" if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/pm_mad/remotes/dummy/deploy b/src/pm_mad/remotes/dummy/deploy index 4e1617adaf..508fb6dc8b 100755 --- a/src/pm_mad/remotes/dummy/deploy +++ b/src/pm_mad/remotes/dummy/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/ec2/cancel b/src/pm_mad/remotes/ec2/cancel index d904236836..372a59c3f2 100755 --- a/src/pm_mad/remotes/ec2/cancel +++ b/src/pm_mad/remotes/ec2/cancel @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/ec2/deploy b/src/pm_mad/remotes/ec2/deploy index 1042dacce8..49b5f0f8ef 100755 --- a/src/pm_mad/remotes/ec2/deploy +++ b/src/pm_mad/remotes/ec2/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/ec2/poll b/src/pm_mad/remotes/ec2/poll index d2333e5782..5033d07aff 100755 --- a/src/pm_mad/remotes/ec2/poll +++ b/src/pm_mad/remotes/ec2/poll @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/ec2/reboot b/src/pm_mad/remotes/ec2/reboot index 7f0935b12d..263ba7cd12 100755 --- a/src/pm_mad/remotes/ec2/reboot +++ b/src/pm_mad/remotes/ec2/reboot @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/ec2/reset b/src/pm_mad/remotes/ec2/reset index a29b71ec6d..02664aa797 100755 --- a/src/pm_mad/remotes/ec2/reset +++ b/src/pm_mad/remotes/ec2/reset @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/ec2/shutdown b/src/pm_mad/remotes/ec2/shutdown index 0a61bc3aa3..73365d1541 100755 --- a/src/pm_mad/remotes/ec2/shutdown +++ b/src/pm_mad/remotes/ec2/shutdown @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/packet/cancel b/src/pm_mad/remotes/packet/cancel index 6e1675ace3..3d922cd871 100755 --- a/src/pm_mad/remotes/packet/cancel +++ b/src/pm_mad/remotes/packet/cancel @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/packet/deploy b/src/pm_mad/remotes/packet/deploy index 46481c737b..7f86df62e1 100755 --- a/src/pm_mad/remotes/packet/deploy +++ b/src/pm_mad/remotes/packet/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/packet/poll b/src/pm_mad/remotes/packet/poll index d39126bcde..28334462ac 100755 --- a/src/pm_mad/remotes/packet/poll +++ b/src/pm_mad/remotes/packet/poll @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/packet/reboot b/src/pm_mad/remotes/packet/reboot index cc4c8a4ec4..97bbbd4c04 100755 --- a/src/pm_mad/remotes/packet/reboot +++ b/src/pm_mad/remotes/packet/reboot @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/packet/reset b/src/pm_mad/remotes/packet/reset index 88b1950311..89d43e7c19 100755 --- a/src/pm_mad/remotes/packet/reset +++ b/src/pm_mad/remotes/packet/reset @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/pm_mad/remotes/packet/shutdown b/src/pm_mad/remotes/packet/shutdown index c962ac2f14..e8b1912775 100755 --- a/src/pm_mad/remotes/packet/shutdown +++ b/src/pm_mad/remotes/packet/shutdown @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/sunstone/bin/novnc-server b/src/sunstone/bin/novnc-server index 3fafaf1265..afafd2fd31 100755 --- a/src/sunstone/bin/novnc-server +++ b/src/sunstone/bin/novnc-server @@ -41,8 +41,9 @@ PLUGIN_CONFIGURATION_FILE = ETC_LOCATION + "/sunstone-plugins.yaml" SUNSTONE_ROOT_DIR = File.dirname(__FILE__) if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/sunstone/routes/nsx.rb b/src/sunstone/routes/nsx.rb index 6793a08074..c800fbe7a4 100644 --- a/src/sunstone/routes/nsx.rb +++ b/src/sunstone/routes/nsx.rb @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index f3ea892421..19ff37e83c 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -46,13 +46,12 @@ LOGOS_CONFIGURATION_FILE = ETC_LOCATION + '/sunstone-logos.yaml' SUNSTONE_ROOT_DIR = File.dirname(__FILE__) if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) # for some platforms, we redistribute newer base Ruby gems which # should be loaded instead of default ones in the distributions - require 'rubygems' - %w[openssl json].each do |name| begin gem name diff --git a/src/tm_mad/one_tm.rb b/src/tm_mad/one_tm.rb index 0cb8578dfd..04f70b0a04 100755 --- a/src/tm_mad/one_tm.rb +++ b/src/tm_mad/one_tm.rb @@ -31,8 +31,9 @@ if !defined? ONE_LOCATION end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/tm_mad/vcenter/clone b/src/tm_mad/vcenter/clone index 34a2b40e12..c37c0e1c2a 100755 --- a/src/tm_mad/vcenter/clone +++ b/src/tm_mad/vcenter/clone @@ -35,8 +35,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/tm_mad/vcenter/cpds b/src/tm_mad/vcenter/cpds index 9eee94066f..6943380844 100755 --- a/src/tm_mad/vcenter/cpds +++ b/src/tm_mad/vcenter/cpds @@ -34,8 +34,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete index 702a1e898e..7b6aaec8e0 100755 --- a/src/tm_mad/vcenter/delete +++ b/src/tm_mad/vcenter/delete @@ -34,8 +34,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/tm_mad/vcenter/mkimage b/src/tm_mad/vcenter/mkimage index ff76b5d498..5218bdc776 100755 --- a/src/tm_mad/vcenter/mkimage +++ b/src/tm_mad/vcenter/mkimage @@ -35,8 +35,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/tm_mad/vcenter/mv b/src/tm_mad/vcenter/mv index 49b176ad6a..64f7294f5d 100755 --- a/src/tm_mad/vcenter/mv +++ b/src/tm_mad/vcenter/mv @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/tm_mad/vcenter/mvds b/src/tm_mad/vcenter/mvds index 088a941eba..d01d756961 100755 --- a/src/tm_mad/vcenter/mvds +++ b/src/tm_mad/vcenter/mvds @@ -35,8 +35,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/tm_mad/vcenter/resize b/src/tm_mad/vcenter/resize index bd8ba0cbf5..56d30fd320 100755 --- a/src/tm_mad/vcenter/resize +++ b/src/tm_mad/vcenter/resize @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/dummy/one_vmm_dummy.rb b/src/vmm_mad/dummy/one_vmm_dummy.rb index e1c5b6bb50..6b5bd70a42 100755 --- a/src/vmm_mad/dummy/one_vmm_dummy.rb +++ b/src/vmm_mad/dummy/one_vmm_dummy.rb @@ -29,8 +29,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb index 00b0a8e5b1..3de233bb4c 100755 --- a/src/vmm_mad/exec/one_vmm_exec.rb +++ b/src/vmm_mad/exec/one_vmm_exec.rb @@ -33,8 +33,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/az/az_driver.rb b/src/vmm_mad/remotes/az/az_driver.rb index 05d766e3b7..875a19cfb8 100755 --- a/src/vmm_mad/remotes/az/az_driver.rb +++ b/src/vmm_mad/remotes/az/az_driver.rb @@ -34,8 +34,9 @@ AZ_DRIVER_DEFAULT = "#{ETC_LOCATION}/az_driver.default" AZ_DATABASE_PATH = "#{VAR_LOCATION}/remotes/im/az.d/az-cache.db" if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/az/cancel b/src/vmm_mad/remotes/az/cancel index 9f081a084f..dfebbdd645 100755 --- a/src/vmm_mad/remotes/az/cancel +++ b/src/vmm_mad/remotes/az/cancel @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/az/deploy b/src/vmm_mad/remotes/az/deploy index ea3a7f6e24..8c6b3c27fd 100755 --- a/src/vmm_mad/remotes/az/deploy +++ b/src/vmm_mad/remotes/az/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/az/poll b/src/vmm_mad/remotes/az/poll index 0ba23d3d4d..f7858869e4 100755 --- a/src/vmm_mad/remotes/az/poll +++ b/src/vmm_mad/remotes/az/poll @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/az/reboot b/src/vmm_mad/remotes/az/reboot index edad8f5ebd..ab1a0f63a1 100755 --- a/src/vmm_mad/remotes/az/reboot +++ b/src/vmm_mad/remotes/az/reboot @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/az/restore b/src/vmm_mad/remotes/az/restore index f614ff795a..544f2b4e59 100755 --- a/src/vmm_mad/remotes/az/restore +++ b/src/vmm_mad/remotes/az/restore @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/az/shutdown b/src/vmm_mad/remotes/az/shutdown index 9e45242d41..ca2280c9b4 100755 --- a/src/vmm_mad/remotes/az/shutdown +++ b/src/vmm_mad/remotes/az/shutdown @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/ec2/cancel b/src/vmm_mad/remotes/ec2/cancel index 8c2b20287d..a40e7eb91a 100755 --- a/src/vmm_mad/remotes/ec2/cancel +++ b/src/vmm_mad/remotes/ec2/cancel @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/ec2/deploy b/src/vmm_mad/remotes/ec2/deploy index ade75b9d34..858caa22a9 100755 --- a/src/vmm_mad/remotes/ec2/deploy +++ b/src/vmm_mad/remotes/ec2/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb index 37921ed166..f7ed5f8088 100755 --- a/src/vmm_mad/remotes/ec2/ec2_driver.rb +++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb @@ -34,8 +34,9 @@ EC2_DRIVER_DEFAULT = "#{ETC_LOCATION}/ec2_driver.default" EC2_DATABASE_PATH = "#{VAR_LOCATION}/remotes/im/ec2.d/ec2-cache.db" if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/ec2/poll b/src/vmm_mad/remotes/ec2/poll index dce2e97bdf..f38b02edfc 100755 --- a/src/vmm_mad/remotes/ec2/poll +++ b/src/vmm_mad/remotes/ec2/poll @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/ec2/reboot b/src/vmm_mad/remotes/ec2/reboot index 1c89666dcc..a71e1081bd 100755 --- a/src/vmm_mad/remotes/ec2/reboot +++ b/src/vmm_mad/remotes/ec2/reboot @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/ec2/restore b/src/vmm_mad/remotes/ec2/restore index c2149de1af..09063675cd 100755 --- a/src/vmm_mad/remotes/ec2/restore +++ b/src/vmm_mad/remotes/ec2/restore @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/ec2/shutdown b/src/vmm_mad/remotes/ec2/shutdown index 41725bd5ae..abfc91c68e 100755 --- a/src/vmm_mad/remotes/ec2/shutdown +++ b/src/vmm_mad/remotes/ec2/shutdown @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb b/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb index 0cd34535c6..90f4591eb0 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb @@ -30,7 +30,9 @@ module NSXDriver end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb index 5fad1f6f6c..eedf80593a 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb @@ -30,8 +30,9 @@ module NSXDriver end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb index 795206fefa..167c5ca082 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb @@ -30,8 +30,9 @@ module NSXDriver end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsx_rule.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsx_rule.rb index 9a81006830..ae9126b2e5 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsx_rule.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsx_rule.rb @@ -34,7 +34,9 @@ module NSXDriver end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb index 9a90954a26..7e84fd7201 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb @@ -30,8 +30,9 @@ module NSXDriver end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb index c003150bd6..85fe65d1fb 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb @@ -30,8 +30,9 @@ module NSXDriver end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb index e0664dfe0c..3a795daed5 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -34,8 +34,9 @@ module VCenterDriver end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/nsx/nsx_driver.rb b/src/vmm_mad/remotes/nsx/nsx_driver.rb index ea3d7937b0..ef270a6d9a 100644 --- a/src/vmm_mad/remotes/nsx/nsx_driver.rb +++ b/src/vmm_mad/remotes/nsx/nsx_driver.rb @@ -37,8 +37,9 @@ end ENV['LANG'] = 'C' if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << LIB_LOCATION + '/ruby' diff --git a/src/vmm_mad/remotes/one/cancel b/src/vmm_mad/remotes/one/cancel index 6300af86f4..ab3e50d83e 100755 --- a/src/vmm_mad/remotes/one/cancel +++ b/src/vmm_mad/remotes/one/cancel @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/deploy b/src/vmm_mad/remotes/one/deploy index 6d7be67529..8c0cd82cc4 100755 --- a/src/vmm_mad/remotes/one/deploy +++ b/src/vmm_mad/remotes/one/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/opennebula_driver.rb b/src/vmm_mad/remotes/one/opennebula_driver.rb index 97824460b8..55d77ecc20 100755 --- a/src/vmm_mad/remotes/one/opennebula_driver.rb +++ b/src/vmm_mad/remotes/one/opennebula_driver.rb @@ -32,8 +32,9 @@ end require 'yaml' if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/poll b/src/vmm_mad/remotes/one/poll index 91f935843e..9bc2abab50 100755 --- a/src/vmm_mad/remotes/one/poll +++ b/src/vmm_mad/remotes/one/poll @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/reboot b/src/vmm_mad/remotes/one/reboot index 890f34fc64..d8acd746a3 100755 --- a/src/vmm_mad/remotes/one/reboot +++ b/src/vmm_mad/remotes/one/reboot @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/reset b/src/vmm_mad/remotes/one/reset index 5ed17a00fb..c6e93d1c51 100755 --- a/src/vmm_mad/remotes/one/reset +++ b/src/vmm_mad/remotes/one/reset @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/restore b/src/vmm_mad/remotes/one/restore index c3d3f7fd26..0a506bf7c6 100755 --- a/src/vmm_mad/remotes/one/restore +++ b/src/vmm_mad/remotes/one/restore @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/save b/src/vmm_mad/remotes/one/save index 782d92789f..24ff613838 100755 --- a/src/vmm_mad/remotes/one/save +++ b/src/vmm_mad/remotes/one/save @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/one/shutdown b/src/vmm_mad/remotes/one/shutdown index 56b0d9ae36..744d13f393 100755 --- a/src/vmm_mad/remotes/one/shutdown +++ b/src/vmm_mad/remotes/one/shutdown @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/packet/cancel b/src/vmm_mad/remotes/packet/cancel index c4e7a24ff3..b39ab63296 100755 --- a/src/vmm_mad/remotes/packet/cancel +++ b/src/vmm_mad/remotes/packet/cancel @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/vmm_mad/remotes/packet/deploy b/src/vmm_mad/remotes/packet/deploy index 1d25805e94..38a1c876d6 100755 --- a/src/vmm_mad/remotes/packet/deploy +++ b/src/vmm_mad/remotes/packet/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/vmm_mad/remotes/packet/packet_driver.rb b/src/vmm_mad/remotes/packet/packet_driver.rb index 474296e422..9ad88e3795 100644 --- a/src/vmm_mad/remotes/packet/packet_driver.rb +++ b/src/vmm_mad/remotes/packet/packet_driver.rb @@ -31,8 +31,9 @@ end PACKET_DATABASE_PATH = "#{VAR_LOCATION}/remotes/im/packet.d/packet-cache.db" if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << PACKET_LOCATION diff --git a/src/vmm_mad/remotes/packet/poll b/src/vmm_mad/remotes/packet/poll index daca80a2c3..6b1e2a8934 100755 --- a/src/vmm_mad/remotes/packet/poll +++ b/src/vmm_mad/remotes/packet/poll @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/packet/reboot b/src/vmm_mad/remotes/packet/reboot index e4bdc3413a..c4bc017910 100755 --- a/src/vmm_mad/remotes/packet/reboot +++ b/src/vmm_mad/remotes/packet/reboot @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/vmm_mad/remotes/packet/reset b/src/vmm_mad/remotes/packet/reset index a5222d06df..9a05589255 100755 --- a/src/vmm_mad/remotes/packet/reset +++ b/src/vmm_mad/remotes/packet/reset @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << File.dirname(__FILE__) diff --git a/src/vmm_mad/remotes/packet/shutdown b/src/vmm_mad/remotes/packet/shutdown index 55f7a7506d..c79278f194 100755 --- a/src/vmm_mad/remotes/packet/shutdown +++ b/src/vmm_mad/remotes/packet/shutdown @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/attach_disk b/src/vmm_mad/remotes/vcenter/attach_disk index 22aa94cc07..f60eea0fe7 100755 --- a/src/vmm_mad/remotes/vcenter/attach_disk +++ b/src/vmm_mad/remotes/vcenter/attach_disk @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/attach_nic b/src/vmm_mad/remotes/vcenter/attach_nic index 4fecf07087..63d7a1f4e3 100755 --- a/src/vmm_mad/remotes/vcenter/attach_nic +++ b/src/vmm_mad/remotes/vcenter/attach_nic @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/cancel b/src/vmm_mad/remotes/vcenter/cancel index 72307a1827..2e1866e35b 100755 --- a/src/vmm_mad/remotes/vcenter/cancel +++ b/src/vmm_mad/remotes/vcenter/cancel @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/deploy b/src/vmm_mad/remotes/vcenter/deploy index d79eec3cba..875ea66bff 100755 --- a/src/vmm_mad/remotes/vcenter/deploy +++ b/src/vmm_mad/remotes/vcenter/deploy @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/detach_nic b/src/vmm_mad/remotes/vcenter/detach_nic index 2c22599aa9..e73a5605db 100755 --- a/src/vmm_mad/remotes/vcenter/detach_nic +++ b/src/vmm_mad/remotes/vcenter/detach_nic @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/migrate b/src/vmm_mad/remotes/vcenter/migrate index be4182f1d8..a2dee8d513 100755 --- a/src/vmm_mad/remotes/vcenter/migrate +++ b/src/vmm_mad/remotes/vcenter/migrate @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/poll b/src/vmm_mad/remotes/vcenter/poll index a6484e4d2e..03ec192bc2 100755 --- a/src/vmm_mad/remotes/vcenter/poll +++ b/src/vmm_mad/remotes/vcenter/poll @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/reboot b/src/vmm_mad/remotes/vcenter/reboot index 21b3b2acdc..3988c34c21 100755 --- a/src/vmm_mad/remotes/vcenter/reboot +++ b/src/vmm_mad/remotes/vcenter/reboot @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/reconfigure b/src/vmm_mad/remotes/vcenter/reconfigure index c427f59a07..8683ec117d 100755 --- a/src/vmm_mad/remotes/vcenter/reconfigure +++ b/src/vmm_mad/remotes/vcenter/reconfigure @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/reset b/src/vmm_mad/remotes/vcenter/reset index b246eca77b..66da733dd2 100755 --- a/src/vmm_mad/remotes/vcenter/reset +++ b/src/vmm_mad/remotes/vcenter/reset @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/restore b/src/vmm_mad/remotes/vcenter/restore index a52028953f..5d8233e833 100755 --- a/src/vmm_mad/remotes/vcenter/restore +++ b/src/vmm_mad/remotes/vcenter/restore @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/save b/src/vmm_mad/remotes/vcenter/save index 880f2c24ab..ef05d65474 100755 --- a/src/vmm_mad/remotes/vcenter/save +++ b/src/vmm_mad/remotes/vcenter/save @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/shutdown b/src/vmm_mad/remotes/vcenter/shutdown index 27c7414a06..c22b9b1424 100755 --- a/src/vmm_mad/remotes/vcenter/shutdown +++ b/src/vmm_mad/remotes/vcenter/shutdown @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/snapshot_create b/src/vmm_mad/remotes/vcenter/snapshot_create index 6a3507e2db..b07a0e2a85 100755 --- a/src/vmm_mad/remotes/vcenter/snapshot_create +++ b/src/vmm_mad/remotes/vcenter/snapshot_create @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/snapshot_delete b/src/vmm_mad/remotes/vcenter/snapshot_delete index 44ace942f6..818b7cc284 100755 --- a/src/vmm_mad/remotes/vcenter/snapshot_delete +++ b/src/vmm_mad/remotes/vcenter/snapshot_delete @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/snapshot_revert b/src/vmm_mad/remotes/vcenter/snapshot_revert index c9a16c4da3..8162037095 100755 --- a/src/vmm_mad/remotes/vcenter/snapshot_revert +++ b/src/vmm_mad/remotes/vcenter/snapshot_revert @@ -27,8 +27,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 0319c90364..d8248f6afb 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -37,8 +37,9 @@ end ENV['LANG'] = 'C' if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) - $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ } + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib' diff --git a/src/vnm_mad/remotes/vcenter/clean b/src/vnm_mad/remotes/vcenter/clean index fc3afa1712..41831543da 100755 --- a/src/vnm_mad/remotes/vcenter/clean +++ b/src/vnm_mad/remotes/vcenter/clean @@ -31,7 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vnm_mad/remotes/vcenter/post b/src/vnm_mad/remotes/vcenter/post index 4c26ef6e20..144c322d97 100755 --- a/src/vnm_mad/remotes/vcenter/post +++ b/src/vnm_mad/remotes/vcenter/post @@ -31,7 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION diff --git a/src/vnm_mad/remotes/vcenter/update_sg b/src/vnm_mad/remotes/vcenter/update_sg index 2c30db5d53..96038bc42a 100755 --- a/src/vnm_mad/remotes/vcenter/update_sg +++ b/src/vnm_mad/remotes/vcenter/update_sg @@ -31,7 +31,9 @@ else end if File.directory?(GEMS_LOCATION) - Gem.use_paths(GEMS_LOCATION) + $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ } + require 'rubygems' + Gem.use_paths(File.realpath(GEMS_LOCATION)) end $LOAD_PATH << RUBY_LIB_LOCATION