rescue/retry when loading gems (possibly without rubygems)

closes fog#901
rubiojr · Dec 28, 2012 · 62e1c09 · 62e1c09
1 parent 5e8c950
commit 62e1c09
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/lib/fog/libvirt/compute.rb b/lib/fog/libvirt/compute.rb
@@ -82,7 +82,12 @@ def initialize(options={})
           @ip_command = options[:libvirt_ip_command]
 
           # libvirt is part of the gem => ruby-libvirt
-          require 'libvirt'
+          begin
+            require 'libvirt'
+          rescue LoadError => e
+            retry if require('rubygems')
+            raise e.message
+          end
 
           begin
             if options[:libvirt_username] and options[:libvirt_password]

diff --git a/lib/fog/virtual_box/compute.rb b/lib/fog/virtual_box/compute.rb
@@ -30,7 +30,13 @@ def initialize(options={})
       class Real
 
         def initialize(options={})
-          require 'virtualbox'
+          begin
+            require 'virtualbox'
+          rescue LoadError => e
+            retry if require('rubygems')
+            raise e.message
+          end
+
           @connection = ::VirtualBox::Global.global.lib.virtualbox
         end
 

diff --git a/lib/fog/vmfusion/compute.rb b/lib/fog/vmfusion/compute.rb
@@ -20,7 +20,12 @@ def initialize(options={})
       class Real
 
         def initialize(options={})
-          require 'fission'
+          begin
+            require 'fission'
+          rescue LoadError => e
+            retry if require('rubygems')
+            raise e.message
+          end
         end
 
       end