fog-core 1.31.0 → 1.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3eb8ac3e692bc65def64e107150dfe6c28ab7ac
-  data.tar.gz: 7c1ea69cfa269891d17cdb35a477ea9d89e695c0
+  metadata.gz: 6225f60258e8f99e143c4f5e7328c08880ef8c0f
+  data.tar.gz: 0baaf114b5b90e7be5a7f6fcad41208f52d09cd5
 SHA512:
-  metadata.gz: 9bc9c9b3dd033caa97876a983e0071a7367f310109e5bbadd024d9a59fd6d5422f408203a2dc4d80a0974e1e1b2cb4cc5db7e7ec7e5491d15f3d163588a0ba44
-  data.tar.gz: 6807600030a3dfa1cd4324d3307237f1ce7867acc982af713d19fc4d1900307d1cfc221186e5a97dd2d14a420bb55d576baa0e69edc3c6ad5fe942c630a49efe
+  metadata.gz: 91ac73c15d8a602aadaca938bcf9d68245e1b0164bf9f7fe1cb39d4c4696aa35f3954510ade65d05b4bb095a686721175b6730547bc1a6f535d60134a2ecda4a
+  data.tar.gz: b71ed95b9f7b69f933d35aaec4dc86a62766aa7b464d833210e8cfec54e4d2435a69d0be3b7a3705b6bf6e44ef965a64f32f91c9317d127f9cabdf7538b5e25a

data/CONTRIBUTORS.md

@@ -1,21 +1,35 @@
+* Aaron Patterson <aaron.patterson@gmail.com>
+* Akira Matsuda <ronnie@dio.jp>
 * Anatol <anatol.pomozov@gmail.com>
 * Bryan Paxton <starbelly@pobox.com>
 * Chris Johnson <wchrisjohnson@gmail.com>
 * Chris Sinjakli <chris@sinjakli.co.uk>
 * Dominic Cleal <dcleal@redhat.com>
 * Evan Light <evan@tripledogdare.net>
+* Frederick Cheung <frederick.cheung@gmail.com>
+* Isaac Hollander McCreery <ihmccreery@google.com>
 * Jake Bell <jake@theunraveler.com>
 * Josh Kalderimis <josh.kalderimis@gmail.com>
+* Josh Lane <me@joshualane.com>
+* Kensuke Nagae <kyanny@gmail.com>
 * Kevin Menard <kevin@nirvdrum.com>
+* Ladislav Smola <lsmola@redhat.com>
+* Matheus Mina <mfbmina@gmail.com>
 * Matt Bostock <matt@mattbostock.com>
 * Matt Darby <darby@mittdarko.com>
 * Matt Darby <matt.darby@rackspace.com>
+* Matt Eldridge <matt.eldridge@us.ibm.com>
 * Mike Hagedorn <mike@silverchairsolutions.com>
 * Naoto TAKAHASHI <tnaoto@gmail.com>
 * Paul Thornthwaite <paul@brightbox.co.uk>
 * Paul Thornthwaite <tokengeek@gmail.com>
 * Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
+* Peter Drake <peter.drake@acquia.com>
 * Wesley Beary <geemus+github@gmail.com>
 * Wesley Beary <geemus@gmail.com>
+* cristhiano <cristhiano_figueira@yahoo.com.br>
 * geemus <geemus@gmail.com>
-* mountkin <moutkin@gmail.com>
+* mountkin <moutkin@gmail.com>
+* ozroc <ozrocpablo@gmail.com>
+* schneems <richard.schneeman@gmail.com>
+* starbelly <starbelly@pobox.com>

data/changelog.md

@@ -1,3 +1,8 @@
+1.31.1 06/17/2015
+==========================================================
+
+fixes around unknown providers/services
+
 1.31.0 06/17/2015
 ==========================================================
 

data/lib/fog/account.rb

@@ -12,14 +12,18 @@ module Fog
         require "fog/account/storm_on_demand"
         Fog::Account::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
-        require "fog/#{provider}/account"
         begin
-          Fog::Account.const_get(Fog.providers[provider])
+          require "fog/#{provider}/account"
+          begin
+            Fog::Account.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Account
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Account
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no account service"
+        end
       else
-        raise ArgumentError, "#{provider} has no account service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/baremetal.rb

@@ -8,14 +8,18 @@ module Fog
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
-        require "fog/#{provider}/baremetal"
         begin
-          Fog::Baremetal.const_get(Fog.providers[provider])
+          require "fog/#{provider}/baremetal"
+          begin
+            Fog::Baremetal.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Baremetal
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Baremetal
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no baremetal service"
+        end
       else
-        raise ArgumentError, "#{provider} has no baremetal service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/billing.rb

@@ -11,14 +11,18 @@ module Fog
         require "fog/billing/storm_on_demand"
         Fog::Billing::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
-        require "fog/#{provider}/billing"
         begin
-          Fog::Account.const_get(Fog.providers[provider])
+          require "fog/#{provider}/billing"
+          begin
+            Fog::Account.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Account
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Account
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no billing service"
+        end
       else
-        raise ArgumentError, "#{provider} has no billing service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/cdn.rb

@@ -8,14 +8,18 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
-        require "fog/#{provider}/cdn"
         begin
-          Fog::CDN.const_get(Fog.providers[provider])
+          require "fog/#{provider}/cdn"
+          begin
+            Fog::CDN.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::CDN
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::CDN
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no cdn service"
+        end
       else
-        raise ArgumentError, "#{provider} has no cdn service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.31.0"
+    VERSION = "1.31.1"
   end
 end

data/lib/fog/image.rb

@@ -8,14 +8,18 @@ module Fog
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
-        require "fog/#{provider}/image"
         begin
-          Fog::Image.const_get(Fog.providers[provider])
+          require "fog/#{provider}/image"
+          begin
+            Fog::Image.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Image
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Image
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no image service"
+        end
       else
-        raise ArgumentError, "#{provider} has no image service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/metering.rb

@@ -8,14 +8,18 @@ module Fog
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
-        require "fog/#{provider}/metering"
         begin
-          Fog::Metering.const_get(Fog.providers[provider])
+          require "fog/#{provider}/metering"
+          begin
+            Fog::Metering.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Metering
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Metering
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no metering service"
+        end
       else
-        raise ArgumentError, "#{provider} has no metering service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/monitoring.rb

@@ -11,14 +11,18 @@ module Fog
         require "fog/monitoring/storm_on_demand"
         Fog::Monitoring::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
-        require "fog/#{provider}/monitoring"
         begin
-          Fog::Monitoring.const_get(Fog.providers[provider])
+          require "fog/#{provider}/monitoring"
+          begin
+            Fog::Monitoring.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Monitoring
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Monitoring
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no monitoring service"
+        end
       else
-        raise ArgumentError, "#{provider} has no monitoring service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/network.rb

@@ -12,14 +12,18 @@ module Fog
         require "fog/network/storm_on_demand"
         return Fog::Network::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
-        require "fog/#{provider}/network"
         begin
-          Fog::Network.const_get(Fog.providers[provider])
+          require "fog/#{provider}/network"
+          begin
+            Fog::Network.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Network
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Network
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no network service"
+        end
       else
-        raise ArgumentError, "#{provider} has no network service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/orchestration.rb

@@ -8,14 +8,18 @@ module Fog
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
-        require "fog/#{provider}/orchestration"
         begin
-          Fog::Orchestration.const_get(Fog.providers[provider])
+          require "fog/#{provider}/orchestration"
+          begin
+            Fog::Orchestration.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Orchestration
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Orchestration
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no orchestration service"
+        end
       else
-        raise ArgumentError, "#{provider} has no orchestration service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/support.rb

@@ -12,14 +12,18 @@ module Fog
         require "fog/support/storm_on_demand"
         Fog::Support::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
-        require "fog/#{provider}/support"
         begin
-          Fog::Support.const_get(Fog.providers[provider])
+          require "fog/#{provider}/support"
+          begin
+            Fog::Support.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Support
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Support
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no support service"
+        end
       else
-        raise ArgumentError, "#{provider} has no support service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/volume.rb

@@ -8,14 +8,18 @@ module Fog
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
-        require "fog/#{provider}/volume"
         begin
-          Fog::Volume.const_get(Fog.providers[provider])
+          require "fog/#{provider}/volume"
+          begin
+            Fog::Volume.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::Volume
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::Volume
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no volume service"
+        end
       else
-        raise ArgumentError, "#{provider} has no volume service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

data/lib/fog/vpn.rb

@@ -12,14 +12,18 @@ module Fog
         require "fog/vpn/storm_on_demand"
         Fog::VPN::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
-        require "fog/#{provider}/vpn"
         begin
-          Fog::VPN.const_get(Fog.providers[provider])
+          require "fog/#{provider}/vpn"
+          begin
+            Fog::VPN.const_get(Fog.providers[provider])
+          rescue
+            Fog.const_get(Fog.providers[provider])::VPN
+          end.new(attributes)
         rescue
-          Fog.const_get(Fog.providers[provider])::VPN
-        end.new(attributes)
+          raise ArgumentError, "#{provider} has no vpn service"
+        end
       else
-        raise ArgumentError, "#{provider} has no vpn service"
+        raise ArgumentError, "#{provider} is not a recognized provider"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.31.1
 platform: ruby
 authors:
 - Evan Light