fog-core 1.31.1 → 1.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6225f60258e8f99e143c4f5e7328c08880ef8c0f
-  data.tar.gz: 0baaf114b5b90e7be5a7f6fcad41208f52d09cd5
+  metadata.gz: cce0c130a1aade8f7c0b37686d8c4373108cdb96
+  data.tar.gz: d139b954306ca369a9ec3a27ef6a1b3534049f14
 SHA512:
-  metadata.gz: 91ac73c15d8a602aadaca938bcf9d68245e1b0164bf9f7fe1cb39d4c4696aa35f3954510ade65d05b4bb095a686721175b6730547bc1a6f535d60134a2ecda4a
-  data.tar.gz: b71ed95b9f7b69f933d35aaec4dc86a62766aa7b464d833210e8cfec54e4d2435a69d0be3b7a3705b6bf6e44ef965a64f32f91c9317d127f9cabdf7538b5e25a
+  metadata.gz: b42044e5b7f6ec5cb1c8d10b5f26d0cd18fbb311b406e1d710d25b32f7644b0780626a872b0bc91d5cef08035a1032f194a3d77aeb02e48bf37560b3d0030d80
+  data.tar.gz: 4ef2091abaac8996facfeceebaabadcc8f6ef661b75b4ee6dbeee145ddd5c04289be2aa0bfe38e3cf6dcb7cfbc6057cc272b182d7f0449ac94b1ff30544f8259

data/changelog.md

@@ -1,3 +1,8 @@
+1.32.0 07/02/2015
+==========================================================
+
+fix/refactor service initializers
+
 1.31.1 06/17/2015
 ==========================================================
 

data/lib/fog/account.rb

@@ -1,29 +1,16 @@
 module Fog
   module Account
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
         require "fog/account/storm_on_demand"
         Fog::Account::StormOnDemand.new(attributes)
-      elsif providers.include?(provider)
-        begin
-          require "fog/#{provider}/account"
-          begin
-            Fog::Account.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::Account
-          end.new(attributes)
-        rescue
-          raise ArgumentError, "#{provider} has no account service"
-        end
       else
-        raise ArgumentError, "#{provider} is not a recognized provider"
+        super(orig_attributes)
       end
     end
 

data/lib/fog/baremetal.rb

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

data/lib/fog/billing.rb

@@ -1,33 +1,16 @@
 module Fog
   module Billing
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if provider == :stormondemand
         require "fog/billing/storm_on_demand"
         Fog::Billing::StormOnDemand.new(attributes)
-      elsif providers.include?(provider)
-        begin
-          require "fog/#{provider}/billing"
-          begin
-            Fog::Account.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::Account
-          end.new(attributes)
-        rescue
-          raise ArgumentError, "#{provider} has no billing service"
-        end
       else
-        raise ArgumentError, "#{provider} is not a recognized provider"
+        super(orig_attributes)
       end
     end
-
-    def self.providers
-      Fog.services[:billing]
-    end
   end
 end

data/lib/fog/cdn.rb

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

data/lib/fog/compute.rb

@@ -1,11 +1,9 @@
 module Fog
   module Compute
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup # prevent delete from having side effects
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup # prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       case provider
@@ -61,27 +59,10 @@ module Fog
         require "fog/vcloud_director/compute"
         Fog::Compute::VcloudDirector.new(attributes)
       else
-        if providers.include?(provider)
-          begin
-            require "fog/#{provider}/compute"
-          rescue LoadError
-            require "fog/compute/#{provider}"
-          end
-          begin
-            Fog::Compute.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::Compute
-          end.new(attributes)
-        else
-          raise ArgumentError, "#{provider} is not a recognized compute provider"
-        end
+        super(orig_attributes)
       end
     end
 
-    def self.providers
-      Fog.services[:compute]
-    end
-
     def self.servers
       servers = []
       providers.each do |provider|

data/lib/fog/core.rb

@@ -13,6 +13,9 @@ require "ipaddr"
 # internal core dependencies
 require File.expand_path('../core/version', __FILE__)
 
+# Mixins
+require File.expand_path('../core/services_mixin', __FILE__)
+
 require File.expand_path('../core/attributes', __FILE__)
 require File.expand_path('../core/attributes/default', __FILE__)
 require File.expand_path('../core/attributes/array', __FILE__)

data/lib/fog/core/services_mixin.rb

@@ -0,0 +1,43 @@
+module Fog
+  module ServicesMixin
+    def [](provider)
+      new(:provider => provider)
+    end
+
+    def new(attributes)
+      attributes    = attributes.dup # Prevent delete from having side effects
+      provider      = attributes.delete(:provider).to_s.downcase.to_sym
+      provider_name = Fog.providers[provider]
+
+      raise ArgumentError, "#{provider} is not a recognized provider" unless providers.include?(provider)
+
+      require_service_provider_library(service_name.downcase, provider)
+      spc = service_provider_constant(service_name, provider_name)
+      spc.new(attributes)
+    rescue LoadError, NameError  # Only rescue errors in finding the libraries, allow connection errors through to the caller
+      raise ArgumentError, "#{provider} has no #{service_name.downcase} service"
+    end
+
+    def providers
+      Fog.services[service_name.downcase.to_sym] || []
+    end
+
+    private
+
+    def require_service_provider_library(service, provider)
+      require "fog/#{provider}/#{service}"
+    rescue LoadError  # Try to require the service provider in an alternate location
+      require "fog/#{service}/#{provider}"
+    end
+
+    def service_provider_constant(service_name, provider_name)
+      Fog.const_get(service_name).const_get(provider_name)
+    rescue NameError  # Try to find the constant from in an alternate location
+      Fog.const_get(provider_name).const_get(service_name)
+    end
+
+    def service_name
+      name.split("Fog::").last
+    end
+  end
+end

data/lib/fog/core/version.rb

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

data/lib/fog/dns.rb

@@ -1,33 +1,18 @@
 module Fog
   module DNS
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup # prevent delete from having side effects
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider).to_s.downcase.to_sym
       when :stormondemand
         require "fog/dns/storm_on_demand"
         Fog::DNS::StormOnDemand.new(attributes)
       else
-        if providers.include?(provider)
-          require "fog/#{provider}/dns"
-          begin
-            Fog::DNS.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::DNS
-          end.new(attributes)
-        else
-          raise ArgumentError, "#{provider} is not a recognized dns provider"
-        end
+        super(orig_attributes)
       end
     end
 
-    def self.providers
-      Fog.services[:dns]
-    end
-
     def self.zones
       zones = []
       providers.each do |provider|

data/lib/fog/identity.rb

@@ -1,27 +1,5 @@
 module Fog
   module Identity
-    def self.[](provider)
-      new(:provider => provider)
-    end
-
-    def self.new(attributes)
-      attributes = attributes.dup # Prevent delete from having side effects
-      provider = attributes.delete(:provider).to_s.downcase.to_sym
-
-      unless providers.include?(provider)
-        raise ArgumentError, "#{provider} has no identity service"
-      end
-
-      require "fog/#{provider}/identity"
-      begin
-        Fog::Identity.const_get(Fog.providers[provider])
-      rescue
-        Fog.const_get(Fog.providers[provider])::Identity
-      end.new(attributes)
-    end
-
-    def self.providers
-      Fog.services[:identity]
-    end
+    extend Fog::ServicesMixin
   end
 end

data/lib/fog/image.rb

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

data/lib/fog/metering.rb

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

data/lib/fog/monitoring.rb

@@ -1,33 +1,16 @@
 module Fog
   module Monitoring
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if provider == :stormondemand
         require "fog/monitoring/storm_on_demand"
         Fog::Monitoring::StormOnDemand.new(attributes)
-      elsif providers.include?(provider)
-        begin
-          require "fog/#{provider}/monitoring"
-          begin
-            Fog::Monitoring.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::Monitoring
-          end.new(attributes)
-        rescue
-          raise ArgumentError, "#{provider} has no monitoring service"
-        end
       else
-        raise ArgumentError, "#{provider} is not a recognized provider"
+        super(orig_attributes)
       end
     end
-
-    def self.providers
-      Fog.services[:monitoring]
-    end
   end
 end

data/lib/fog/network.rb

@@ -1,34 +1,17 @@
 module Fog
   module Network
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup # Prevent delete from having side effects
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
         require "fog/network/storm_on_demand"
         return Fog::Network::StormOnDemand.new(attributes)
-      elsif providers.include?(provider)
-        begin
-          require "fog/#{provider}/network"
-          begin
-            Fog::Network.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::Network
-          end.new(attributes)
-        rescue
-          raise ArgumentError, "#{provider} has no network service"
-        end
       else
-        raise ArgumentError, "#{provider} is not a recognized provider"
+        super(orig_attributes)
       end
     end
-
-    def self.providers
-      Fog.services[:network]
-    end
   end
 end

data/lib/fog/orchestration.rb

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

data/lib/fog/storage.rb

@@ -7,12 +7,10 @@ end
 
 module Fog
   module Storage
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup # prevent delete from having side effects
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider).to_s.downcase.to_sym
       when :internetarchive
         require "fog/internet_archive/storage"
@@ -21,16 +19,7 @@ module Fog
         require "fog/storage/storm_on_demand"
         Fog::Storage::StormOnDemand.new(attributes)
       else
-        if providers.include?(provider)
-          require "fog/#{provider}/storage"
-          begin
-            Fog::Storage.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::Storage
-          end.new(attributes)
-        else
-          raise ArgumentError, "#{provider} is not a recognized storage provider"
-        end
+        super(orig_attributes)
       end
     end
 
@@ -87,9 +76,5 @@ module Fog
         }
       }
     end
-
-    def self.providers
-      Fog.services[:storage]
-    end
   end
 end

data/lib/fog/support.rb

@@ -1,34 +1,17 @@
 module Fog
   module Support
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
         require "fog/support/storm_on_demand"
         Fog::Support::StormOnDemand.new(attributes)
-      elsif providers.include?(provider)
-        begin
-          require "fog/#{provider}/support"
-          begin
-            Fog::Support.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::Support
-          end.new(attributes)
-        rescue
-          raise ArgumentError, "#{provider} has no support service"
-        end
       else
-        raise ArgumentError, "#{provider} is not a recognized provider"
+        super(orig_attributes)
       end
     end
-
-    def self.providers
-      Fog.services[:support]
-    end
   end
 end

data/lib/fog/volume.rb

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

data/lib/fog/vpn.rb

@@ -1,34 +1,17 @@
 module Fog
   module VPN
-    def self.[](provider)
-      new(:provider => provider)
-    end
+    extend Fog::ServicesMixin
 
-    def self.new(attributes)
-      attributes = attributes.dup
+    def self.new(orig_attributes)
+      attributes = orig_attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
         require "fog/vpn/storm_on_demand"
         Fog::VPN::StormOnDemand.new(attributes)
-      elsif providers.include?(provider)
-        begin
-          require "fog/#{provider}/vpn"
-          begin
-            Fog::VPN.const_get(Fog.providers[provider])
-          rescue
-            Fog.const_get(Fog.providers[provider])::VPN
-          end.new(attributes)
-        rescue
-          raise ArgumentError, "#{provider} has no vpn service"
-        end
       else
-        raise ArgumentError, "#{provider} is not a recognized provider"
+        super(orig_attributes)
       end
     end
-
-    def self.providers
-      Fog.services[:vpn]
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.31.1
+  version: 1.32.0
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -263,6 +263,7 @@ files:
 - lib/fog/core/provider.rb
 - lib/fog/core/scp.rb
 - lib/fog/core/service.rb
+- lib/fog/core/services_mixin.rb
 - lib/fog/core/ssh.rb
 - lib/fog/core/stringify_keys.rb
 - lib/fog/core/time.rb