fog 0.8.2 → 0.9.0

data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb

@@ -19,7 +19,7 @@ module Fog
         #     * 'DisableAvailabilityZonesForLoadBalancerResult'<~Hash>:
         #       * 'AvailabilityZones'<~Array> - array of strings describing instances currently enabled
         def disable_availability_zones_for_load_balancer(availability_zones, lb_name)
-          params = AWS.indexed_param('AvailabilityZones.member', [*availability_zones])
+          params = Fog::AWS.indexed_param('AvailabilityZones.member', [*availability_zones])
           request({
             'Action'           => 'DisableAvailabilityZonesForLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb

@@ -19,7 +19,7 @@ module Fog
         #     * 'EnableAvailabilityZonesForLoadBalancerResult'<~Hash>:
         #       * 'AvailabilityZones'<~Array> - array of strings describing instances currently enabled
         def enable_availability_zones_for_load_balancer(availability_zones, lb_name)
-          params = AWS.indexed_param('AvailabilityZones.member', [*availability_zones])
+          params = Fog::AWS.indexed_param('AvailabilityZones.member', [*availability_zones])
           request({
             'Action'           => 'EnableAvailabilityZonesForLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb

@@ -20,7 +20,7 @@ module Fog
         #       * 'Instances'<~Array> - array of hashes describing instances currently enabled
         #         * 'InstanceId'<~String>
         def register_instances_with_load_balancer(instance_ids, lb_name)
-          params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids])
+          params = Fog::AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids])
           request({
             'Action'           => 'RegisterInstancesWithLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/set_load_balancer_policies_of_listener.rb

@@ -25,7 +25,7 @@ module Fog
         def set_load_balancer_policies_of_listener(lb_name, load_balancer_port, policy_names)
           params = {'LoadBalancerPort' => load_balancer_port}
           if policy_names.any?
-            params.merge!(AWS.indexed_param('PolicyNames.member', policy_names))
+            params.merge!(Fog::AWS.indexed_param('PolicyNames.member', policy_names))
           else
             params['PolicyNames'] = ''
           end

data/lib/fog/aws/requests/rds/create_db_instance.rb

@@ -32,7 +32,7 @@ module Fog
         def create_db_instance(db_name, options={})
           
           if security_groups = options.delete('DBSecurityGroups')
-            options.merge!(AWS.indexed_param('DBSecurityGroups.member.%d', [*security_groups]))
+            options.merge!(Fog::AWS.indexed_param('DBSecurityGroups.member.%d', [*security_groups]))
           end
     
           request({

data/lib/fog/aws/requests/rds/modify_db_instance.rb

@@ -29,7 +29,7 @@ module Fog
         def modify_db_instance(db_name, apply_immediately, options={})
           
           if security_groups = options.delete('DBSecurityGroups')
-            options.merge!(AWS.indexed_param('DBSecurityGroups.member.%d', [*security_groups]))
+            options.merge!(Fog::AWS.indexed_param('DBSecurityGroups.member.%d', [*security_groups]))
           end
     
           request({

data/lib/fog/aws/requests/rds/modify_db_parameter_group.rb

@@ -29,9 +29,9 @@ module Fog
             parameter_apply_methods.push(parameter['ApplyMethod'])
           end
           params = {}
-          params.merge!(AWS.indexed_param('Parameters.member.%d.ParameterName', parameter_names))
-          params.merge!(AWS.indexed_param('Parameters.member.%d.ParameterValue', parameter_values))
-          params.merge!(AWS.indexed_param('Parameters.member.%d.ApplyMethod', parameter_apply_methods))
+          params.merge!(Fog::AWS.indexed_param('Parameters.member.%d.ParameterName', parameter_names))
+          params.merge!(Fog::AWS.indexed_param('Parameters.member.%d.ParameterValue', parameter_values))
+          params.merge!(Fog::AWS.indexed_param('Parameters.member.%d.ApplyMethod', parameter_apply_methods))
           
           request({
             'Action'  => 'ModifyDBParameterGroup',

data/lib/fog/aws/requests/ses/send_email.rb

@@ -40,7 +40,7 @@ module Fog
           }
 
           for key, values in destination
-            params.merge!(AWS.indexed_param("Destination.#{key}.member", [*values]))
+            params.merge!(Fog::AWS.indexed_param("Destination.#{key}.member", [*values]))
           end
 
           for key, value in message['Subject']
@@ -54,7 +54,7 @@ module Fog
           end
 
           if options.has_key?('ReplyToAddresses')
-            params.merge!(AWS.indexed_param("ReplyToAddresses.member", [*options['ReplyToAddresses']]))
+            params.merge!(Fog::AWS.indexed_param("ReplyToAddresses.member", [*options['ReplyToAddresses']]))
           end
 
           if options.has_key?('ReturnPath')

data/lib/fog/aws/requests/ses/send_raw_email.rb

@@ -22,7 +22,7 @@ module Fog
         def send_raw_email(raw_message, options = {})
           params = {}
           if options.has_key?('Destinations')
-            params.merge!(AWS.indexed_param('Destinations.member', [*options['Destinations']]))
+            params.merge!(Fog::AWS.indexed_param('Destinations.member', [*options['Destinations']]))
           end
           if options.has_key?('Source')
             params['Source'] = options['Source']

data/lib/fog/aws/requests/simpledb/delete_attributes.rb

@@ -38,11 +38,21 @@ module Fog
         def delete_attributes(domain_name, item_name, attributes = nil)
           response = Excon::Response.new
           if self.data[:domains][domain_name]
-            if attributes
-              for key, value in attributes
-                if self.data[:domains][domain_name][key]
-                  self.data[:domains][domain_name][key].delete('value')
+            if self.data[:domains][domain_name][item_name]
+              if attributes
+                for key, value in attributes
+                  if self.data[:domains][domain_name][item_name][key]
+                    if value.nil? || value.empty?
+                      self.data[:domains][domain_name][item_name].delete(key)
+                    else
+                      for v in value
+                        self.data[:domains][domain_name][item_name][key].delete(v)
+                      end
+                    end
+                  end
                 end
+              else
+                self.data[:domains][domain_name][item_name].clear
               end
             end
             response.status = 200

data/lib/fog/aws/simpledb.rb

@@ -3,7 +3,7 @@ module Fog
     class SimpleDB < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :nil_string, :path, :port, :scheme, :persistent
+      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region
 
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes
@@ -121,7 +121,7 @@ module Fog
         end
 
         def encode_attribute_names(attributes)
-          AWS.indexed_param('AttributeName', attributes.map {|attribute| attributes.to_s})
+          Fog::AWS.indexed_param('AttributeName', attributes.map {|attribute| attributes.to_s})
         end
 
         def encode_batch_attributes(items, replace_attributes = Hash.new([]))
@@ -155,7 +155,7 @@ module Fog
           idempotent = params.delete(:idempotent)
           parser = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body = Fog::AWS.signed_params(
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,

data/lib/fog/bin.rb

@@ -57,12 +57,14 @@ require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
 require 'fog/bin/dnsimple'
+require 'fog/bin/dnsmadeeasy'
 require 'fog/bin/ecloud'
 require 'fog/bin/go_grid'
 require 'fog/bin/google'
 require 'fog/bin/linode'
 require 'fog/bin/local'
 require 'fog/bin/new_servers'
+require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
 require 'fog/bin/slicehost'
 require 'fog/bin/stormondemand'

data/lib/fog/bin/aws.rb

@@ -4,13 +4,13 @@ class AWS < Fog::Bin
     def class_for(key)
       case key
       when :cdn
-        Fog::AWS::CDN
+        Fog::CDN::AWS
       when :cloud_formation
         Fog::AWS::CloudFormation
       when :compute
-        Fog::AWS::Compute
+        Fog::Compute::AWS
       when :dns
-        Fog::AWS::DNS
+        Fog::DNS::AWS
       when :elb
         Fog::AWS::ELB
       when :iam
@@ -20,7 +20,7 @@ class AWS < Fog::Bin
       when :ses
         Fog::AWS::SES
       when :eu_storage, :storage
-        Fog::AWS::Storage
+        Fog::Storage::AWS
       when :rds
         Fog::AWS::RDS
       else
@@ -35,12 +35,15 @@ class AWS < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :cdn
+          Formatador.display_line("[yellow][WARN] AWS[:cdn] is deprecated, use CDN[:aws] instead[/]")
           Fog::CDN.new(:provider => 'AWS')
         when :cloud_formation
           Fog::AWS::CloudFormation.new
         when :compute
+          Formatador.display_line("[yellow][WARN] AWS[:compute] is deprecated, use Compute[:aws] instead[/]")
           Fog::Compute.new(:provider => 'AWS')
         when :dns
+          Formatador.display_line("[yellow][WARN] AWS[:dns] is deprecated, use DNS[:aws] instead[/]")
           Fog::DNS.new(:provider => 'AWS')
         when :elb
           Fog::AWS::ELB.new
@@ -55,6 +58,7 @@ class AWS < Fog::Bin
         when :ses
           Fog::AWS::SES.new
         when :storage
+          Formatador.display_line("[yellow][WARN] AWS[:storage] is deprecated, use Storage[:aws] instead[/]")
           Fog::Storage.new(:provider => 'AWS')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/bluebox.rb

@@ -4,9 +4,9 @@ class Bluebox < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Bluebox::Compute
+        Fog::Compute::Bluebox
       when :dns
-        Fog::Bluebox::DNS
+        Fog::DNS::Bluebox
       else
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -16,8 +16,10 @@ class Bluebox < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] Bluebox[:compute] is deprecated, use Compute[:bluebox] instead[/]")
           Fog::Compute.new(:provider => 'Bluebox')
         when :dns
+          Formatador.display_line("[yellow][WARN] Bluebox[:storage] is deprecated, use Storage[:bluebox] instead[/]")
           Fog::DNS.new(:provider => 'Bluebox')
         else
           raise ArgumentError, "Unrecognized service: #{service}"

data/lib/fog/bin/brightbox.rb

@@ -4,7 +4,7 @@ class Brightbox < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Brightbox::Compute
+        Fog::Compute::Brightbox
       else 
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -14,6 +14,7 @@ class Brightbox < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] Brightbox[:compute] is deprecated, use Brightbox[:aws] instead[/]")
           Fog::Compute.new(:provider => 'Brightbox')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/dnsimple.rb

@@ -4,7 +4,7 @@ class DNSimple < Fog::Bin
     def class_for(key)
       case key
       when :dns
-        Fog::DNSimple::DNS
+        Fog::DNS::DNSimple
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -13,11 +13,12 @@ class DNSimple < Fog::Bin
     def [](service)
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
-                    when :dns
-                      Fog::DNS.new(:provider => 'DNSimple')
-                    else
-                      raise ArgumentError, "Unrecognized service: #{key.inspect}"
-                    end
+        when :dns
+          Formatador.display_line("[yellow][WARN] DNSimple[:dns] is deprecated, use Storage[:dnsimple] instead[/]")
+          Fog::DNS.new(:provider => 'DNSimple')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
       end
       @@connections[service]
     end

data/lib/fog/bin/dnsmadeeasy.rb

@@ -0,0 +1,31 @@
+class DNSMadeEasy < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :dns
+        Fog::DNS::DNSMadeEasy
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :dns
+          Formatador.display_line("[yellow][WARN] DNSMadeEasy[:dns] is deprecated, use Storage[:dnsmadeeasy] instead[/]")
+          Fog::DNS.new(:provider => 'DNSMadeEasy')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::DNSMadeEasy.services
+    end
+
+  end
+end

data/lib/fog/bin/ecloud.rb

@@ -4,7 +4,7 @@ class Ecloud < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Ecloud::Compute
+        Fog::Compute::Ecloud
       else 
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -14,6 +14,7 @@ class Ecloud < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] Ecloud[:compute] is deprecated, use Compute[:ecloud] instead[/]")
           Fog::Compute.new(:provider => 'Ecloud')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/go_grid.rb

@@ -4,7 +4,7 @@ class GoGrid < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::GoGrid::Compute
+        Fog::Compute::GoGrid
       else 
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -14,6 +14,7 @@ class GoGrid < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] GoGrid[:compute] is deprecated, use Compute[:gogrid] instead[/]")
           Fog::Compute.new(:provider => 'GoGrid')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/google.rb

@@ -4,7 +4,7 @@ class Google < Fog::Bin
     def class_for(key)
       case key
       when :storage
-        Fog::Google::Storage
+        Fog::Storage::Google
       else 
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -14,6 +14,7 @@ class Google < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :storage
+          Formatador.display_line("[yellow][WARN] Google[:storage] is deprecated, use Storage[:google] instead[/]")
           Fog::Storage.new(:provider => 'Google')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/linode.rb

@@ -4,9 +4,9 @@ class Linode < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Linode::Compute
+        Fog::Compute::Linode
       when :dns
-        Fog::Linode::DNS
+        Fog::DNS::Linode
       else
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -16,8 +16,10 @@ class Linode < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] Linode[:compute] is deprecated, use Compute[:linode] instead[/]")
           Fog::Compute.new(:provider => 'Linode')
         when :dns
+          Formatador.display_line("[yellow][WARN] Linode[:storage] is deprecated, use Storage[:linode] instead[/]")
           Fog::DNS.new(:provider => 'Linode')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/local.rb

@@ -4,7 +4,7 @@ class Local < Fog::Bin
     def class_for(key)
       case key
       when :storage
-        Fog::Local::Storage
+        Fog::Storage::Local
       else 
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -14,6 +14,7 @@ class Local < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :storage
+          Formatador.display_line("[yellow][WARN] Local[:storage] is deprecated, use Storage[:local] instead[/]")
           Fog::Storage.new(:provider => 'Local')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/new_servers.rb

@@ -4,7 +4,7 @@ class NewServers < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::NewServers::Compute
+        Fog::Compute::NewServers
       else 
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -14,6 +14,7 @@ class NewServers < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] NewServers[:compute] is deprecated, use Compute[:newservers] instead[/]")
           Fog::Compute.new(:provider => 'NewServers')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/ninefold.rb

@@ -0,0 +1,31 @@
+class Ninefold < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Ninefold
+      else
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Formatador.display_line("[yellow][WARN] Ninefold[:compute] is deprecated, use Compute[:ninefold] instead[/]")
+          Fog::Compute.new(:provider => 'Ninefold')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Ninefold.services
+    end
+
+  end
+end