fog-core 1.27.1 → 1.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dc951352a5dc9909d42e4786a1c9bc261cc42ce
-  data.tar.gz: 374a09fae5eae27aebfda7e2b3531d79386a9559
+  metadata.gz: cb0c85564583ea60af61b0763f78fee6089c8230
+  data.tar.gz: 8f4cf853cd883f2906163109271902bf9f658544
 SHA512:
-  metadata.gz: 3163c4fd1d61ec875bcb5141f4d84655fe400c31c1790bcada2356c7235f8add1f29b59317a3541de53b2e57bbe40f0df8b3411161bbef572a390103c9381a6f
-  data.tar.gz: 26e293890e46ba611f83b863f1f99f0606a521bfff9111acf8c3d1661bc988b892b76035c0487db7aa4dd46ebc9a7a6cbc6d9b5de90fb101a35b6d87385e036d
+  metadata.gz: 4517193ec6b81e6962b98f1c1c0f5882f4f7611ebf131941c6efbe3f6792bb69cd69d4595bfcf26765d9b67360d3efc59063bc3b8e6a7f0c695e13028dbc89d0
+  data.tar.gz: c13706aa2a55be66ded1df68e013621757a06d02ef0cb9ee0b11100478274c266a7e376b55c2f1b8066cf319dbd7a7857f09ef917dd2e409f4214b0cfe98ea31

data/changelog.md

@@ -1,3 +1,8 @@
+1.27.2 18/12/2014
+==========================================================
+
+fix several requires in service abstraction code
+
 1.27.1 12/12/2014
 ==========================================================
 

data/lib/fog/account.rb

@@ -9,7 +9,7 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
-        require "fog/storm_on_demand/account"
+        require "fog/account/storm_on_demand"
         Fog::Account::StormOnDemand.new(attributes)
       else
         raise ArgumentError, "#{provider} has no account service"
@@ -17,7 +17,7 @@ module Fog
     end
 
     def self.providers
-      Fog.services[:account]
+      Fog.services[:account] || []
     end
   end
 end

data/lib/fog/billing.rb

@@ -8,7 +8,7 @@ module Fog
       attributes = attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if provider == :stormondemand
-        require "fog/storm_on_demand/billing"
+        require "fog/billing/storm_on_demand"
         Fog::Billing::StormOnDemand.new(attributes)
       else
         raise ArgumentError, "#{provider} has no billing service"

data/lib/fog/compute.rb

@@ -42,7 +42,7 @@ module Fog
           Fog::Compute::RackspaceV2.new(attributes)
         end
       when :stormondemand
-        require "fog/storm_on_demand/compute"
+        require "fog/compute/storm_on_demand"
         Fog::Compute::StormOnDemand.new(attributes)
       when :vcloud
         require "fog/vcloud/compute"
@@ -52,7 +52,11 @@ module Fog
         Fog::Compute::VcloudDirector.new(attributes)
       else
         if providers.include?(provider)
-          require "fog/#{provider}/compute"
+          begin
+            require "fog/#{provider}/compute"
+          rescue LoadError
+            require "fog/compute/#{provider}"
+          end
           begin
             Fog::Compute.const_get(Fog.providers[provider])
           rescue

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.27.1"
+    VERSION = "1.27.2"
   end
 end

data/lib/fog/dns.rb

@@ -8,7 +8,7 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider).to_s.downcase.to_sym
       when :stormondemand
-        require "fog/storm_on_demand/dns"
+        require "fog/dns/storm_on_demand"
         Fog::DNS::StormOnDemand.new(attributes)
       else
         if providers.include?(provider)

data/lib/fog/monitoring.rb

@@ -8,7 +8,7 @@ module Fog
       attributes = attributes.dup
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if provider == :stormondemand
-        require "fog/storm_on_demand/billing"
+        require "fog/monitoring/storm_on_demand"
         Fog::Monitoring::StormOnDemand.new(attributes)
       else
         raise ArgumentError, "#{provider} has no monitoring service"

data/lib/fog/network.rb

@@ -9,7 +9,7 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
-        require "fog/storm_on_demand/network"
+        require "fog/network/storm_on_demand"
         return Fog::Network::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
         require "fog/#{provider}/network"

data/lib/fog/orchestration.rb

@@ -9,7 +9,7 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if providers.include?(provider)
-        require "fog/#{provider}/network"
+        require "fog/#{provider}/orchestration"
         return Fog::Orchestration.const_get(Fog.providers[provider]).new(attributes)
       end
 

data/lib/fog/storage.rb

@@ -13,7 +13,7 @@ module Fog
         require "fog/internet_archive/storage"
         Fog::Storage::InternetArchive.new(attributes)
       when :stormondemand
-        require "fog/storm_on_demand/storage"
+        require "fog/storage/storm_on_demand"
         Fog::Storage::StormOnDemand.new(attributes)
       else
         if providers.include?(provider)

data/lib/fog/support.rb

@@ -9,7 +9,7 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
-        require "fog/storm_on_demand/support"
+        require "fog/support/storm_on_demand"
         Fog::Support::StormOnDemand.new(attributes)
       else
         raise ArgumentError, "#{provider} has no support service"

data/lib/fog/vpn.rb

@@ -9,7 +9,7 @@ module Fog
       provider = attributes.delete(:provider).to_s.downcase.to_sym
 
       if provider == :stormondemand
-        require "fog/storm_on_demand/vpn"
+        require "fog/vpn/storm_on_demand"
         Fog::VPN::StormOnDemand.new(attributes)
       else
         raise ArgumentError, "#{provider} has no vpn service"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.27.1
+  version: 1.27.2
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder